--- a/mm7_5.cpp	Wed May 08 17:36:19 2013 +0600
+++ b/mm7_5.cpp	Wed May 08 17:36:45 2013 +0600
@@ -3305,15 +3305,14 @@
   PLAYER_SKILL_TYPE v6; // edi@37
   GUIWindow *pWindow; // eax@56
   GUIButton *pButton; // eax@59
-  //int v15; // edi@70
-  //char v16; // zf@73
+  int v15; // edi@70
   char v20; // dl@116
   unsigned int v21; // eax@116
   unsigned int v25; // eax@120
   unsigned int v26; // ecx@127
   SoundID pSoundID; // [sp-2Ch] [bp-3Ch]@36
   signed int v41; // [sp-10h] [bp-20h]@29
-  int uNum; // [sp+4h] [bp-Ch]@3
+  int pParam; // [sp+4h] [bp-Ch]@3
   UIMessageType pUIMessageType; // [sp+8h] [bp-8h]@3
   int pSex; // [sp+Ch] [bp-4h]@3
 
@@ -3323,8 +3322,8 @@
     do
     {
       int param2;
-      pMessageQueue_50CBD0->PopMessage(&pUIMessageType, &uNum, &param2);
-      auto player = &pParty->pPlayers[uNum];
+      pMessageQueue_50CBD0->PopMessage(&pUIMessageType, &pParam, &param2);
+      auto player = &pParty->pPlayers[pParam];
 
       switch (pUIMessageType) // For buttons of window MainMenu
       {
@@ -3346,8 +3345,8 @@
           break;
         case UIMSG_PlayerCreation_SelectAttribute:
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem)
-                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum;
-          uPlayerCreationUI_SelectedCharacter = uNum;
+                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
+          uPlayerCreationUI_SelectedCharacter = pParam;
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
           break;
         case UIMSG_PlayerCreation_VoicePrev:
@@ -3359,7 +3358,7 @@
             else --player->uVoiceID;
           }
           while (player->GetSexByVoice() != pSex);
-          pButton = pCreationUI_BtnPressLeft2[uNum];
+          pButton = pCreationUI_BtnPressLeft2[pParam];
           GUIWindow::Create(pButton->uX, pButton->uY, 0, 0, WINDOW_PressedButton, (int)pButton, 1);
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
           player->PlaySound(SPEECH_PickMe, 0);
@@ -3371,13 +3370,13 @@
             player->uVoiceID = (player->uVoiceID + 1) % 20;
           }
           while (player->GetSexByVoice() != pSex);
-          pButton = pCreationUI_BtnPressRight2[uNum];
+          pButton = pCreationUI_BtnPressRight2[pParam];
           GUIWindow::Create(pButton->uX, pButton->uY, 0, 0, WINDOW_PressedButton, (int)pButton, 1);
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
           player->PlaySound(SPEECH_PickMe, 0);
           break;
         case UIMSG_PlayerCreation_FacePrev:
-          pPlayer = &pParty->pPlayers[uNum];
+          pPlayer = &pParty->pPlayers[pParam];
           if (!pPlayer->uFace)
             pPlayer->uFace = 19;
           else
@@ -3386,25 +3385,25 @@
           pPlayer->SetInitialStats();
           pPlayer->SetSexByVoice();
           pPlayer->RandomizeName();
-          v25 = uNum;
+          v25 = pParam;
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem)
-                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum;
+                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
           uPlayerCreationUI_SelectedCharacter = v25;
           GUIWindow::Create(pCreationUI_BtnPressLeft[v25]->uX, pCreationUI_BtnPressLeft[v25]->uY, 0, 0, WINDOW_PressedButton, (int)pCreationUI_BtnPressLeft[v25], 1);
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0.0, 0);
           pPlayer->PlaySound(SPEECH_PickMe, 0);
           break;
         case UIMSG_PlayerCreation_FaceNext:
-          pPlayer = &pParty->pPlayers[uNum];
+          pPlayer = &pParty->pPlayers[pParam];
           v20 = (char)((int)pPlayer->uFace + 1) % 20;
           pPlayer->uFace = v20;
           pPlayer->uVoiceID = v20;
           pPlayer->SetInitialStats();
           pPlayer->SetSexByVoice();
           pPlayer->RandomizeName();
-          v21 = uNum;
+          v21 = pParam;
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem)
-                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum;
+                                                    % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
           uPlayerCreationUI_SelectedCharacter = v21;
           GUIWindow::Create(pCreationUI_BtnPressRight[v21]->uX, pCreationUI_BtnPressRight[v21]->uY, 0, 0, WINDOW_PressedButton, (int)pCreationUI_BtnPressRight[v21], 1);
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
@@ -3422,13 +3421,13 @@
           break;
         case UIMSG_PlayerCreationSelectActiveSkill:
           pPlayer = &pPlayer[uPlayerCreationUI_SelectedCharacter];
-          v6 = pPlayer->GetSkillIdxByOrder(uNum + 4);
+          v6 = pPlayer->GetSkillIdxByOrder(pParam + 4);
           if ( pPlayer->GetSkillIdxByOrder(3) == 37 )
             pParty->pPlayers[0].pActiveSkills[v6 + 3486 * uPlayerCreationUI_SelectedCharacter] = 1;
           pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
           break;
         case UIMSG_PlayerCreationSelectClass:
-          pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)uNum);
+          pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)pParam);
           pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
           break;
         case UIMSG_PlayerCreationClickOK:
@@ -3443,19 +3442,19 @@
           pParty->Reset();
           break;
         case UIMSG_PlayerCreationRemoveUpSkill:
-          uPlayerCreationUI_SelectedCharacter = uNum;
+          uPlayerCreationUI_SelectedCharacter = pParam;
           v4 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem;
           //int pSex = pGUIWindow_CurrentMenu->pStartingPosActiveItem;
           v41 = 2;
-          v5 = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum;
+          v5 = v4 % 7 + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = v5;
           pParty->pPlayers[0].pActiveSkills[(&pPlayer[uPlayerCreationUI_SelectedCharacter])->GetSkillIdxByOrder(v41)
                                          + 3486 * uPlayerCreationUI_SelectedCharacter] = 0;
           break;
         case UIMSG_PlayerCreationChangeName:
           pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
-          v3 = (void *)uNum;
-          uPlayerCreationUI_SelectedCharacter = uNum;
+          v3 = (void *)pParam;
+          uPlayerCreationUI_SelectedCharacter = pParam;
           pKeyActionMap->EnterText(0, 15, pGUIWindow_CurrentMenu);
           pGUIWindow_CurrentMenu->ptr_1C = v3;
           break;
@@ -3477,11 +3476,11 @@
             //main menu save/load wnd   clicking on savegame lines
           if (pGUIWindow_CurrentMenu->field_40 == 1)
             pKeyActionMap->_459ED1(0);
-          if ( pCurrentScreen != SCREEN_SAVEGAME || uLoadGameUI_SelectedSlot != uNum + pSaveListPosition )
+          if ( pCurrentScreen != SCREEN_SAVEGAME || uLoadGameUI_SelectedSlot != pParam + pSaveListPosition )
           {
             //load clicked line
-              v26 = uNum + pSaveListPosition;
-              if ( dword_6BE138 == uNum + pSaveListPosition )
+              v26 = pParam + pSaveListPosition;
+              if ( dword_6BE138 == pParam + pSaveListPosition )
               {
                 pMessageQueue_50CBD0->AddMessage(UIMSG_SaveLoadBtn, 0, 0);
                 pMessageQueue_50CBD0->AddMessage(UIMSG_LoadGame, 0, 0);
@@ -3502,8 +3501,8 @@
           break;
         case UIMSG_DownArrow:
           ++pSaveListPosition;
-          if ( pSaveListPosition >= uNum )
-            pSaveListPosition = uNum - 1;
+          if ( pSaveListPosition >= pParam )
+            pSaveListPosition = pParam - 1;
           if ( pSaveListPosition < 1 )
             pSaveListPosition = 0;
           pWindow = pGUIWindow_CurrentMenu;
@@ -3535,6 +3534,7 @@
           }
           if ( !(BYTE1(dword_6BE364_game_settings_1) & 0x40) )
             break;
+          v15 = 1;
           pVideoPlayer->bStopBeforeSchedule = 1;
           viewparams->bRedrawGameUI = 1;
           viewparams->field_48 = 1;
@@ -3547,12 +3547,29 @@
               SetCurrentMenuID(MENU_CREATEPARTY);
               break;
             }
+            if (GetCurrentMenuID() == MENU_CREDITSPROC)
+            {
+              SetCurrentMenuID(MENU_CREDITSCLOSE);
+              break;
+            }
             pMessageQueue_50CBD0->AddMessage(UIMSG_ChangeGameState, 0, 0);
             break;
           }
           if ( GetCurrentMenuID() == MENU_CREDITSPROC && !pCurrentScreen )
           {
-            SetCurrentMenuID(MENU_CREDITSCLOSE);
+            if ( pCurrentScreen == SCREEN_VIDEO )
+              pVideoPlayer->FastForwardToFrame(pVideoPlayer->pResetflag);
+            if (GetCurrentMenuID() == MENU_NAMEPANELESC)
+            {
+              SetCurrentMenuID(MENU_CREATEPARTY);
+              break;
+            }
+            if (GetCurrentMenuID() == MENU_CREDITSPROC)
+            {
+              SetCurrentMenuID(MENU_CREDITSCLOSE);
+              break;
+            }
+            pMessageQueue_50CBD0->AddMessage(UIMSG_ChangeGameState, 0, 0);
             break;
           }
           if ( pCurrentScreen == SCREEN_LOADGAME )
@@ -3562,12 +3579,13 @@
             pTexture_PCX.Release();
             pTexture_PCX.Load("title.pcx", 0);
             SetCurrentMenuID(MENU_MAIN);
+            v15 = 1;
             pGUIWindow_CurrentMenu->Release();
             pGUIWindow2->Release();
             pGUIWindow2 = 0;
             pEventTimer->Resume();
             pCurrentScreen = SCREEN_GAME;
-            viewparams->bRedrawGameUI = 1;
+            viewparams->bRedrawGameUI = v15;
             break;
           }
           if ( pCurrentScreen == SCREEN_VIDEO )
@@ -3583,16 +3601,16 @@
               pGUIWindow2 = 0;
               pEventTimer->Resume();
               pCurrentScreen = SCREEN_GAME;
-              viewparams->bRedrawGameUI = 1;
+              viewparams->bRedrawGameUI = v15;
               break;
             }
             //VideoPlayer::dtor();
           }
           break;
         case UIMSG_PlayerCreationRemoveDownSkill:
-          uPlayerCreationUI_SelectedCharacter = uNum;
+          uPlayerCreationUI_SelectedCharacter = pParam;
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7
-             + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * uNum;
+             + pGUIWindow_CurrentMenu->pStartingPosActiveItem + 7 * pParam;
           pParty->pPlayers[0].pActiveSkills[(&pPlayer[uPlayerCreationUI_SelectedCharacter])->GetSkillIdxByOrder(3)
                                              + 3486 * uPlayerCreationUI_SelectedCharacter] = 0;
           break;
@@ -10166,54 +10184,23 @@
 
 
 
-
 //----- (004156F0) --------------------------------------------------------
-void __cdecl GUI_UpdateWindows() // ����� �� ������������� � �����
+void __cdecl GUI_UpdateWindows() 
 {
   GUIWindow *pWindow; // esi@4
   unsigned int pWindowType; // eax@4
-  int v2; // eax@10
-  int v3; // eax@11
-  int v4; // eax@12
-  int v5; // eax@20
-  int v6; // eax@21
-  int v7; // eax@29
-  int v8; // eax@30
-  int v9; // eax@31
-  void *v10; // eax@41
-  int v11; // ecx@42
-  int v12; // eax@48
-  int v13; // eax@49
-  int v14; // eax@57
-  int v15; // eax@58
-  int v16; // eax@59
-  int v17; // eax@60
-  int v18; // eax@61
-  int v19; // eax@62
-  void *v20; // ebp@66
   char *pHint; // edx@66
   GUIButton *pButtonPtr_1C; // ebp@79
   char *pHint1; // edx@80
-  char v24; // zf@81
-  //unsigned int v25; // eax@91
   int v26; // eax@98
   unsigned int v27; // ebp@106
   GUIWindow *pGUIWindow2; // ecx@109
-  unsigned int v29; // eax@111
   GUIFont *pGUIFont; // ST1C_4@115
   int v31; // eax@115
   GUIButton *pButton; // ebp@118
-  int v33; // eax@119
-  int v34; // eax@120
-  int v35; // eax@121
-  int v36; // eax@122
-  int v37; // eax@123
-  int v38; // eax@124
   int v39; // eax@129
-  //char *v40; // edx@138
   unsigned int pNumMessages; // eax@142
   GUIButton *pGUIButton; // ebp@146
-  //char *v43; // edx@146
   unsigned int pX; // [sp-1Ch] [bp-124h]@17
   unsigned int pY; // [sp-18h] [bp-120h]@17
   Texture *pTexture; // [sp-14h] [bp-11Ch]@17
@@ -10227,12 +10214,11 @@
     sub_41CD4F(34);
   for ( i = 1; i <= uNumVisibleWindows; ++i )
   {
-    //v0 = (GUIWindow *)&pWindowList_at_506F50_minus1_indexing[21 * pVisibleWindowsIdxs[i]];
     pWindow = &pWindowList[pVisibleWindowsIdxs[i] - 1];
     pWindowType = pWindow->eWindowType;
     switch (pWindow->eWindowType)
     {
-      case WINDOW_OptionsButtons://3
+      case WINDOW_OptionsButtons:
       {
         pTexture = (Texture *)(uTextureID_Options != -1 ? &pIcons_LOD->pTextures[uTextureID_Options] : 0);
         pY = pViewport->uViewportTL_Y;
@@ -10241,52 +10227,52 @@
         viewparams->bRedrawGameUI = 1;
         continue;
       }
-      case WINDOW_CharacterRecord://4
+      case WINDOW_CharacterRecord:
       {
         CharacterUI_CharacterScreen_Draw(uActiveCharacter);
         continue;
       }
-      case WINDOW_Options://6
+      case WINDOW_Options:
       {
         DrawGameOptions();
         continue;
       }
-      case WINDOW_Book://9
+      case WINDOW_Book:
       {
         DrawCurrentBook((unsigned int)pWindow->ptr_1C);
         continue;
       }
-      case WINDOW_Dialogue://10
+      case WINDOW_Dialogue:
       {
         DrawDialogueUI();
         continue;
       }
-      case WINDOW_QuickReference://12
+      case WINDOW_QuickReference:
       {
         QuickRefDraw();
         continue;
       }
-      case WINDOW_Rest://16
+      case WINDOW_Rest:
       {
         RestUI_Draw();
         continue;
       }
-      case WINDOW_ChangeLocation://17
+      case WINDOW_ChangeLocation:
       {
         TravelUI_Draw();
         continue;
       }
-      case WINDOW_SpellBook://18
+      case WINDOW_SpellBook:
       {
         DrawSpellBookContent();
         continue;
       }
-      case WINDOW_GreetingNPC://19
+      case WINDOW_GreetingNPC:
       {
         DrawBranchlessDialogueUI();
         continue;
       }
-      case WINDOW_Chest://20
+      case WINDOW_Chest:
       {
         if ( pCurrentScreen == SCREEN_CHEST )
         {
@@ -10302,29 +10288,28 @@
         }
         continue;
       }
-      case WINDOW_SaveLoadButtons://23
+      case WINDOW_SaveLoadButtons:
       {
         sub_4606FE();
         continue;
       }
-      case WINDOW_MainMenu_Load://24
+      case WINDOW_MainMenu_Load:
       {
         GameUI_MainMenu_DrawLoad();
         continue;
       }
-      case WINDOW_HouseInterior://25
+      case WINDOW_HouseInterior:
       {
         pWindowList[pVisibleWindowsIdxs[i] - 1].HouseDialogManager();
         if ( !window_SpeakInHouse )
           continue;
-        v10 = window_SpeakInHouse->ptr_1C;
-        if ( (signed int)v10 >= 53 )
-          continue;
-        if ( pParty->field_3C._shop_ban_times[(signed int)v10] <=pParty->uTimePlayed )
+        if ( (signed int)window_SpeakInHouse->ptr_1C >= 53 )
+          continue;
+        if ( pParty->field_3C._shop_ban_times[(signed int)window_SpeakInHouse->ptr_1C] <=pParty->uTimePlayed )
         {
-          if ( (signed int)v10 < 53 )
-          {
-            pParty->field_3C._shop_ban_times[(signed int)v10] = 0;
+          if ( (signed int)window_SpeakInHouse->ptr_1C < 53 )
+          {
+            pParty->field_3C._shop_ban_times[(signed int)window_SpeakInHouse->ptr_1C] = 0;
           }
           continue;
         }
@@ -10332,17 +10317,17 @@
         pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
         continue;
       }
-      case WINDOW_Transition://26
+      case WINDOW_Transition:
       {
         TransitionUI_Draw();
         continue;
       }
-      case WINDOW_Scroll://30
+      case WINDOW_Scroll:
       {
         CreateScrollWindow();
         continue;
       }
-      case WINDOW_CastSpell_InInventory://31
+      case WINDOW_CastSpell_InInventory:
       {
         pRenderer->ClearZBuffer(0, 479);
         draw_leather();
@@ -10352,12 +10337,12 @@
             (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
         continue;
       }
-      case WINDOW_FinalWindow://70
+      case WINDOW_FinalWindow:
       {
         sub_41420D_press_esc();
         continue;
       }
-      case WINDOW_50://80
+      case WINDOW_50:
       {
         v27 = TargetColor(255, 255, 255);
         if ( ptr_507BD0->field_40 == 1 )
@@ -10370,15 +10355,7 @@
         }
         if ( ptr_507BD0->field_40 == 2 )
         {
-          //v29 = pMessageQueue_50CBD0->uNumMessages;
           pWindow->field_40 = 0;
-          /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-          {
-            pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)(int)ptr_507BD0->ptr_1C;
-            pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
-            *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-            ++pMessageQueue_50CBD0->uNumMessages;
-          }*/
           pMessageQueue_50CBD0->AddMessage((UIMessageType)(int)ptr_507BD0->ptr_1C, 0, 0);
           pEventTimer->Resume();
           ptr_507BD0->Release();
@@ -10394,7 +10371,7 @@
           continue;
         }
       }
-      case WINDOW_59://89
+      case WINDOW_59:
       {
         pWindow->DrawMessageBox(0);
         pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
@@ -10430,7 +10407,7 @@
         }
         continue;
       }
-      case WINDOW_PressedButton2://90
+      case WINDOW_PressedButton2:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
@@ -10443,8 +10420,7 @@
             viewparams->bRedrawGameUI = 1;
             if ( pWindow->Hint )
             {
-              v24 = pWindow->Hint == (char *)1;
-              if ( !v24 )
+              if ( pWindow->Hint != (char *)1 )
                 pButton->DrawLabel(pWindow->Hint, pFontCreate, 0, 0);
             }
             pWindow->Release();
@@ -10454,14 +10430,13 @@
         viewparams->bRedrawGameUI = 1;
         if ( pWindow->Hint )
         {
-          v24 = pWindow->Hint == (char *)1;
-          if ( !v24 )
+          if ( pWindow->Hint != (char *)1 )
             pButton->DrawLabel(pWindow->Hint, pFontCreate, 0, 0);
         }
         pWindow->Release();
         continue;
       }
-      case WINDOW_CharactersPressedButton://91
+      case WINDOW_CharactersPressedButton:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
@@ -10470,14 +10445,13 @@
         viewparams->bRedrawGameUI = 1;
         if ( pWindow->Hint )
         {
-          v24 = pWindow->Hint == (char *)1;
-          if ( !v24 )
+          if ( pWindow->Hint != (char *)1 )
             pButton->DrawLabel(pWindow->Hint, pFontCreate, 0, 0);
         }
         pWindow->Release();
         continue;
       }
-      case WINDOW_PressedButton://92
+      case WINDOW_PressedButton:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
@@ -10486,14 +10460,13 @@
         viewparams->bRedrawGameUI = 1;
         if ( pWindow->Hint )
         {
-          v24 = pWindow->Hint == (char *)1;
-          if ( !v24 )
+          if ( pWindow->Hint != (char *)1 )
             pButton->DrawLabel(pWindow->Hint, pFontCreate, 0, 0);
         }
         pWindow->Release();
         continue;
       }
-      case WINDOW_5D://93
+      case WINDOW_5D:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
@@ -10503,7 +10476,7 @@
         pWindow->Release();
         continue;
       }
-      case WINDOW_SaveLoadBtn://94
+      case WINDOW_SaveLoadBtn:
       {
         if (pWindow->Hint != (char *)1)
           pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
@@ -10520,7 +10493,7 @@
           pMessageQueue_50CBD0->AddMessage(UIMSG_LoadGame, 0, 0);
         continue;
       }
-      case WINDOW_LoadGame_CancelBtn://95
+      case WINDOW_LoadGame_CancelBtn:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
@@ -10530,18 +10503,10 @@
         if ( pWindow->Hint && pWindow->Hint != (char *)1 )
           pButton->DrawLabel(pWindow->Hint, pFontCreate, 0, 0);
         pWindow->Release();
-        /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-        {
-          pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
-          pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
-          *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-          ++pMessageQueue_50CBD0->uNumMessages;
-          continue;
-        }*/
         pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
         continue;
       }
-      case WINDOW_CloseRestWindowBtn://96
+      case WINDOW_CloseRestWindowBtn:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
@@ -10555,7 +10520,7 @@
         pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
         continue;
       }
-      case WINDOW_ExitCharacterWindow://97
+      case WINDOW_ExitCharacterWindow:
       {
         if ( pWindow->Hint != (char *)1 )
           pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
@@ -10570,7 +10535,7 @@
         pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
         continue;
       }
-      case WINDOW_RestWindow://98
+      case WINDOW_RestWindow:
       {
         memset(&GUIButton2, 0, 0xBCu);
         GUIButton2.uZ = 197;
@@ -10589,7 +10554,7 @@
         pGUIWindow2->Release();
         continue;
       }
-      case WINDOW_BooksWindow://99
+      case WINDOW_BooksWindow:
       {
         pButton = (GUIButton *)pWindow->ptr_1C;
         pY = pWindow->uFrameY;
@@ -10598,7 +10563,7 @@
         viewparams->bRedrawGameUI = 1;
         continue;
       }
-      case WINDOW_CharacterWindow_Inventory://103
+      case WINDOW_CharacterWindow_Inventory:
       {
         pWindow->DrawMessageBox(0);
         pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
@@ -10619,12 +10584,12 @@
         }
         continue;
       }
-      case WINDOW_KeyMappingOptions://105
+      case WINDOW_KeyMappingOptions:
       {
         GameMenuUI_DrawKeyBindings();
         continue;
       }
-      case WINDOW_VideoOptions://106
+      case WINDOW_VideoOptions:
       {
         GameMenuUI_DrawVideoOptions();
         continue;