# HG changeset patch
# User Lower
# Date 1350138690 -21600
# Node ID 3f3b61fd1c88e1c5627f13a7f9688075190eee78
# Parent  5a95b9ed31f32b618f7c200c209a3d3562468b1e# Parent  b47e9c80e7419b4667ffa387243709e3812752b0
Слияние

diff -r 5a95b9ed31f3 -r 3f3b61fd1c88 mm7_5.cpp
--- a/mm7_5.cpp	Sat Oct 13 20:25:41 2012 +0600
+++ b/mm7_5.cpp	Sat Oct 13 20:31:30 2012 +0600
@@ -3455,6 +3455,16 @@
           SetCurrentMenuID(MENU_FINISHED);
         }
         continue;
+
+        case UIMSG_LoadGame:
+        {
+          if (!pSavegameUsedSlots[uLoadGameUI_SelectedSlot])
+            continue;
+LABEL_99:
+          v40 = 9;
+          goto LABEL_89;
+        }
+        continue;
       }
 
 
@@ -3623,14 +3633,6 @@
           v8 = pGUIWindow_CurrentMenu->uFrameY + 323;
           goto LABEL_105;
         }
-        if ( v45 == UIMSG_LoadGame )
-        {
-          if ( !pSavegameUsedSlots[uLoadGameUI_SelectedSlot] )
-            continue;
-LABEL_99:
-          v40 = 9;
-          goto LABEL_89;
-        }
         if ( v45 == 107 )
         {
           if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions )
@@ -14925,7 +14927,7 @@
         v21 = v0->str_48;
         viewparams->bRedrawGameUI = 1;
         if ( v21 && v21 != (char *)1 )
-          ((GUIButton *)v20)->DrawLabel(v21, pFontCreate, 0, 0);
+          v20->DrawLabel(v21, pFontCreate, 0, 0);
         v0->Release();
         if (uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 11)
           pMessageQueue_50CBD0->SendMessage(UIMSG_SaveGame, 0, 0);