merge cleanup

BibliothecaDAO · Oct 3, 2023 · 1df5a66 · 1df5a66
1 parent 391339f
commit 1df5a66
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contracts/game/src/lib.cairo b/contracts/game/src/lib.cairo
@@ -176,9 +176,9 @@ mod Game {
 
             // if player has a golden token
             let golden_token = _golden_token_dispatcher(ref self);
-            if (golden_token.can_play(token_id) && token_id != 0) {
+            if (golden_token.can_play(golden_token_id) && golden_token_id != 0) {
                 // pay with the golden token
-                golden_token.play(token_id);
+                golden_token.play(golden_token_id);
             } else {
                 // otherwise process payment and distribute rewards
                 _process_payment_and_distribute_rewards(ref self, client_reward_address);
@@ -1084,7 +1084,7 @@ mod Game {
             // without this, there would be an incentive to start and die immediately after contract is deployed
             // to capture the rewards from the launch hype
             _lords_dispatcher(ref self)
-                .transferFrom(caller, self._dao.read(), _to_ether(COST_TO_PLAY));
+                .transferFrom(caller, self._dao.read(), _to_ether(COST_TO_PLAY.into()));
 
             __event_RewardDistribution(
                 ref self,