Mercurial > mm7

diff Player.cpp @ 2163:9aa0a5d90454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fall_speed
author Ritor1
date Wed, 15 Jan 2014 17:35:41 +0600
parents 67a83bc1a7de
children e1e4a8a20b5f
line wrap: on
line diff
--- a/Player.cpp	Tue Jan 14 17:29:20 2014 +0600
+++ b/Player.cpp	Wed Jan 15 17:35:41 2014 +0600
@@ -4272,10 +4272,10 @@
   char v72; // [sp+20h] [bp-Ch]@68
   signed int v73; // [sp+24h] [bp-8h]@1
   const char*  v74; // [sp+24h] [bp-8h]@23
-  Player *thisb; // [sp+28h] [bp-4h]@1
+  //Player *thisb; // [sp+28h] [bp-4h]@1
   unsigned int thisa; // [sp+28h] [bp-4h]@22
 
-  thisb = this;
+  //thisb = this;
   playerAffected = &pParty->pPlayers[player_num-1];
   v73 = 1;
   if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
@@ -4318,12 +4318,12 @@
       if ( pParty->bTurnBasedModeOn )
       {
         pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100;
-        thisb->SetRecoveryTime(100);
+        this->SetRecoveryTime(100);
         pTurnEngine->ApplyPlayerAction();
       }
       else
       {
-        thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
+        this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
       }
     }
     pMouse->RemoveHoldingItem();
@@ -4614,12 +4614,12 @@
         if ( pParty->bTurnBasedModeOn )
         {
           pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100;
-          thisb->SetRecoveryTime(100);
+          this->SetRecoveryTime(100);
           pTurnEngine->ApplyPlayerAction();
         }
         else
         {
-          thisb->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
+          this->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
         }
       }
       pMouse->RemoveHoldingItem();