Mercurial > might-and-magic-trilogy

diff mm7_6.cpp @ 44:916bec351934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22.10.12(pCurrentScreen)
author Ritor1
date Mon, 22 Oct 2012 17:28:15 +0600
parents e62134245ab0
children 79a30ee1ecdb
line wrap: on
line diff
--- a/mm7_6.cpp	Sun Oct 21 23:26:23 2012 +0600
+++ b/mm7_6.cpp	Mon Oct 22 17:28:15 2012 +0600
@@ -8921,7 +8921,7 @@
         switch ( inputAction )
         {
           case INPUT_MoveForward:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn != _1 )
               goto _do_move_forward;
@@ -8938,7 +8938,7 @@
             }
             break;
           case INPUT_MoveBackwards:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn != _1 )
               goto _do_move_backwards;
@@ -8955,7 +8955,7 @@
             }
             break;
           case INPUT_StrafeLeft:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn != _1 )
               goto _do_strafe_left;
@@ -8966,7 +8966,7 @@
             partyAction = PARTY_StrafeLeft;
             goto _add_action_and_continue_;
           case INPUT_StrafeRight:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn != _1 )
               goto _do_strafe_right;
@@ -8977,7 +8977,7 @@
             partyAction = PARTY_StrafeRight;
             goto _add_action_and_continue_;
           case INPUT_TurnLeft:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( GetAsyncKeyState(VK_CONTROL) ) // strafing
             {
@@ -9004,7 +9004,7 @@
             }
             break;
           case INPUT_TurnRight:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( GetAsyncKeyState(17) )         // strafing
             {
@@ -9032,13 +9032,13 @@
             }
             break;
           case INPUT_Jump:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
+            if ( pCurrentScreen
               || pParty->bTurnBasedModeOn == _1 )
               break;
             partyAction = (PartyAction)12;
             goto _add_action_and_continue_;
           case INPUT_Yell:
-            if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
+            if ( !pCurrentScreen
               && uActiveCharacter )
             {
               pParty->Yell();
@@ -9046,7 +9046,7 @@
             }
             break;
           case INPUT_Pass:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn == _1 && pTurnEngine->field_4 == 3 )
               goto LABEL_118;
@@ -9065,7 +9065,7 @@
             }
             break;
           case INPUT_Combat:
-            if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( !pCurrentScreen )
             {
               if ( pParty->bTurnBasedModeOn == _1 )
               {
@@ -9083,7 +9083,7 @@
             }
             break;
           case INPUT_CastReady:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn == _1 && pTurnEngine->field_4 == 3 )
               goto LABEL_118;
@@ -9121,7 +9121,7 @@
           default:
             break;
           case INPUT_Attack:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( pCurrentScreen )
               break;
             if ( pParty->bTurnBasedModeOn != _1 || pTurnEngine->field_4 != 3 )
               goto LABEL_120;
@@ -9129,14 +9129,14 @@
             pTurnEngine->field_18 |= 8u;
             break;
           case INPUT_EventTrigger:
-            if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+            if ( !pCurrentScreen )
             {
               if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
                 break;
               pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)404;
               goto _send_message;
             }
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 4 )
+            if ( pCurrentScreen == 4 )
             {
               v11 = pMessageQueue_50CBD0->uNumMessages;
               if ( pMessageQueue_50CBD0->uNumMessages )
@@ -9161,7 +9161,7 @@
             }
             break;
           case INPUT_CharCycle:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 8
+            if ( pCurrentScreen == 8
               || dword_50C9E8 >= 40 )
               break;
             dword_50C9EC[3 * dword_50C9E8] = 176;
@@ -9182,19 +9182,19 @@
             partyAction = (PartyAction)8;
             goto _add_action_and_continue_;
           case INPUT_FlyUp:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
+            if ( pCurrentScreen
               || pEventTimer->bPaused )
               break;
             partyAction = (PartyAction)13;
             goto _add_action_and_continue_;
           case INPUT_Land:
-            if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
+            if ( pCurrentScreen
               || pEventTimer->bPaused )
               break;
             partyAction = (PartyAction)15;
             goto _add_action_and_continue_;
           case INPUT_FlyDown:
-            if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
+            if ( !pCurrentScreen
               && !pEventTimer->bPaused )
             {
               partyAction = (PartyAction)14;
@@ -9240,15 +9240,15 @@
       v14 = v13->IsKeyBeingHeld(v22);
     if ( v14 && v12 == 9 )
     {
-      if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
+      if ( !pCurrentScreen )
       {
         if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
           goto LABEL_175;
         pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)404;
         goto LABEL_174;
       }
-      if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 4
-        || uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 19 )
+      if ( pCurrentScreen == 4
+        || pCurrentScreen == 19 )
       {
         v15 = pMessageQueue_50CBD0->uNumMessages;
         if ( pMessageQueue_50CBD0->uNumMessages )