diff mm7_5.cpp @ 959:f8dd764fb7d7

ExitCharacterWindow and other
author Ritor1
date Fri, 03 May 2013 17:38:30 +0600
parents e9292c58644a
children 9a5db2cf999a
line wrap: on
line diff
--- a/mm7_5.cpp	Thu May 02 17:58:32 2013 +0600
+++ b/mm7_5.cpp	Fri May 03 17:38:30 2013 +0600
@@ -438,6 +438,7 @@
           stru_506E40.Release();
           continue;
         case UIMSG_80:
+			__debugbreak;
           pIcons_LOD->_40F9C5();
           pIcons_LOD->_4114F2();
           pGUIWindow_CurrentMenu->Release();
@@ -457,7 +458,7 @@
           GUIWindow::Create(215, 323, 17, 17, WINDOW_5A, (int)pBtnDownArrow, 0);
           continue;
         case UIMSG_Cancel:
-          GUIWindow::Create(350, 302, 106, 42, WINDOW_60, (int)pBtnCancel, 0);
+          GUIWindow::Create(350, 302, 106, 42, WINDOW_ExitRestWindow, (int)pBtnCancel, 0);
           continue;
         case UIMSG_LoadSlot:
           GUIWindow::Create(241, 302, 106, 42, WINDOW_5E, (int)pBtnLoadSlot, 0);
@@ -1283,6 +1284,7 @@
                        pIcons_LOD->_4355F7();
                        continue;
                     case SCREEN_E:
+						__debugbreak;
                       pGUIWindow_CurrentMenu->Release();
                       pCurrentScreen = SCREEN_HOUSE;
                       pIcons_LOD->_4114F2();
@@ -10404,7 +10406,7 @@
   unsigned int v29; // eax@111
   GUIFont *pGUIFont; // ST1C_4@115
   int v31; // eax@115
-  void *v32; // ebp@118
+  GUIButton *pButton; // ebp@118
   int v33; // eax@119
   int v34; // eax@120
   int v35; // eax@121
@@ -10440,6 +10442,7 @@
 			break;
 			}
 		case WINDOW_5E: // window that initiates savegame loading
+			__debugbreak;
 			{
 			if (pWindow->Hint != (char *)1)
 				pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
@@ -10537,6 +10540,7 @@
 			}
 		case WINDOW_17:
 			{
+			__debugbreak;
 			sub_4606FE();
 			break;
 			}
@@ -10569,7 +10573,7 @@
 			pGUIWindow2->Release();
 			break;
 			}
-		case WINDOW_60:
+		case WINDOW_ExitRestWindow:
 			{
 			if ( pWindow->Hint != (char *)1 )
 				pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
@@ -10583,16 +10587,16 @@
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
 			break;
 			}
-		case WINDOW_61:
+		case WINDOW_ExitCharacterWindow:
 			{
-			if ( pWindow->Hint != (char *)1 )//pWindowType == WINDOW_61
+			if ( pWindow->Hint != (char *)1 )
 				pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
-			v32 = pWindow->ptr_1C;
-			pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 16));
+			pButton = (GUIButton *)pWindow->ptr_1C;
+			pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pButton->pTextures[1]);
 			pHint = pWindow->Hint;
 			viewparams->bRedrawGameUI = 1;
 			if ( pHint && pHint != (char *)1 )
-				((GUIButton *)v32)->DrawLabel(pHint, pFontCreate, 0, 0);
+				pButton->DrawLabel(pHint, pFontCreate, 0, 0);
 			pWindow->Release();
 			pNumMessages = pMessageQueue_50CBD0->uNumMessages;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);