Mercurial > mm7

comparison mm7_5.cpp @ 1006:e865f349aa41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui cleanup
author Gloval
date Sat, 18 May 2013 22:01:26 +0400
parents eac5af72b614
children 9e823ad5eaa6
comparison
equal deleted inserted replaced
1004:eac5af72b614 1006:e865f349aa41
381 _4B4224_UpdateNPCTopics(uMessageParam); 381 _4B4224_UpdateNPCTopics(uMessageParam);
382 continue; 382 continue;
383 case UIMSG_StartNewGame: 383 case UIMSG_StartNewGame:
384 if ( dword_6BE138 == 124 || uMessageParam ) 384 if ( dword_6BE138 == 124 || uMessageParam )
385 { 385 {
386 pIcons_LOD->_40F9C5(); 386 pIcons_LOD->SyncLoadedFilesCount();
387 pIcons_LOD->_4114F2(); 387 pIcons_LOD->_4114F2();
388 if ( pMessageQueue_50CBD0->uNumMessages ) 388 if ( pMessageQueue_50CBD0->uNumMessages )
389 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 389 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
390 pGUIWindow_CurrentMenu->Release(); 390 pGUIWindow_CurrentMenu->Release();
391 uGameState = GAME_STATE_NEWGAME_OUT_GAMEMENU; 391 uGameState = GAME_STATE_NEWGAME_OUT_GAMEMENU;
399 dword_6BE138 = 124; 399 dword_6BE138 = 124;
400 } 400 }
401 stru_506E40.Release(); 401 stru_506E40.Release();
402 continue; 402 continue;
403 case UIMSG_Game_OpenLoadGameDialog: 403 case UIMSG_Game_OpenLoadGameDialog:
404 pIcons_LOD->_40F9C5(); 404 pIcons_LOD->SyncLoadedFilesCount();
405 pIcons_LOD->_4114F2(); 405 pIcons_LOD->_4114F2();
406 if ( pMessageQueue_50CBD0->uNumMessages ) 406 if ( pMessageQueue_50CBD0->uNumMessages )
407 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 407 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
408 pGUIWindow_CurrentMenu->Release(); 408 pGUIWindow_CurrentMenu->Release();
409 pCurrentScreen = SCREEN_LOADGAME; 409 pCurrentScreen = SCREEN_LOADGAME;
410 GameUI_DrawLoadMenu(1); 410 GameUI_DrawLoadMenu(1);
411 continue; 411 continue;
412 case UIMSG_Quit: 412 case UIMSG_Quit:
413 if ( dword_6BE138 == 132 || uMessageParam ) 413 if ( dword_6BE138 == 132 || uMessageParam )
414 { 414 {
415 pIcons_LOD->_40F9C5(); 415 pIcons_LOD->SyncLoadedFilesCount();
416 pIcons_LOD->_4114F2(); 416 pIcons_LOD->_4114F2();
417 if ( pMessageQueue_50CBD0->uNumMessages ) 417 if ( pMessageQueue_50CBD0->uNumMessages )
418 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 418 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
419 pGUIWindow_CurrentMenu->Release(); 419 pGUIWindow_CurrentMenu->Release();
420 pCurrentScreen = SCREEN_GAME; 420 pCurrentScreen = SCREEN_GAME;
431 } 431 }
432 stru_506E40.Release(); 432 stru_506E40.Release();
433 continue; 433 continue;
434 case UIMSG_80: 434 case UIMSG_80:
435 __debugbreak(); 435 __debugbreak();
436 pIcons_LOD->_40F9C5(); 436 pIcons_LOD->SyncLoadedFilesCount();
437 pIcons_LOD->_4114F2(); 437 pIcons_LOD->_4114F2();
438 pGUIWindow_CurrentMenu->Release(); 438 pGUIWindow_CurrentMenu->Release();
439 pCurrentScreen = SCREEN_OPTIONS; 439 pCurrentScreen = SCREEN_OPTIONS;
440 pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_8, 0, 0); 440 pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_8, 0, 0);
441 continue; 441 continue;
1145 viewparams->bRedrawGameUI = 1; 1145 viewparams->bRedrawGameUI = 1;
1146 pEventTimer->Resume(); 1146 pEventTimer->Resume();
1147 continue; 1147 continue;
1148 case SCREEN_OPTIONS://Close 1148 case SCREEN_OPTIONS://Close
1149 options_menu_skin.Relaease(); 1149 options_menu_skin.Relaease();
1150 pIcons_LOD->_40F9C5(); 1150 pIcons_LOD->SyncLoadedFilesCount();
1151 WriteWindowsRegistryInt("soundflag", (char)uSoundVolumeMultiplier); 1151 WriteWindowsRegistryInt("soundflag", (char)uSoundVolumeMultiplier);
1152 WriteWindowsRegistryInt("musicflag", (char)uMusicVolimeMultiplier); 1152 WriteWindowsRegistryInt("musicflag", (char)uMusicVolimeMultiplier);
1153 WriteWindowsRegistryInt("CharVoices", (char)uVoicesVolumeMultiplier); 1153 WriteWindowsRegistryInt("CharVoices", (char)uVoicesVolumeMultiplier);
1154 WriteWindowsRegistryInt("WalkSound", bWalkSound); 1154 WriteWindowsRegistryInt("WalkSound", bWalkSound);
1155 WriteWindowsRegistryInt("ShowDamage", bShowDamage); 1155 WriteWindowsRegistryInt("ShowDamage", bShowDamage);
1175 } 1175 }
1176 WriteWindowsRegistryInt("TurnDelta", 1); 1176 WriteWindowsRegistryInt("TurnDelta", 1);
1177 stru_506E40.Release(); 1177 stru_506E40.Release();
1178 break; 1178 break;
1179 case SCREEN_MENU: 1179 case SCREEN_MENU:
1180 pIcons_LOD->_40F9C5(); 1180 pIcons_LOD->SyncLoadedFilesCount();
1181 pIcons_LOD->_4114F2(); 1181 pIcons_LOD->_4114F2();
1182 pIcons_LOD->_40F9C5(); 1182 pIcons_LOD->SyncLoadedFilesCount();
1183 pIcons_LOD->_4114F2(); 1183 pIcons_LOD->_4114F2();
1184 stru_506E40.Release(); 1184 stru_506E40.Release();
1185 break; 1185 break;
1186 case SCREEN_VIDEO_OPTIONS: 1186 case SCREEN_VIDEO_OPTIONS:
1187 if ( pRenderer->pRenderD3D ) 1187 if ( pRenderer->pRenderD3D )
1215 pIcons_LOD->pTextures[*(int *)thisb].Release(); 1215 pIcons_LOD->pTextures[*(int *)thisb].Release();
1216 thisb += 4; 1216 thisb += 4;
1217 } 1217 }
1218 while ( thisb < (signed int)&dword_507C08 ); 1218 while ( thisb < (signed int)&dword_507C08 );
1219 memset(&uTextureID_Optkb, 0, 0x14u); 1219 memset(&uTextureID_Optkb, 0, 0x14u);
1220 pIcons_LOD->_40F9C5(); 1220 pIcons_LOD->SyncLoadedFilesCount();
1221 uAction = 0; 1221 uAction = 0;
1222 do 1222 do
1223 { 1223 {
1224 v33 = pKeyActionMap->GetActionVKey((enum InputAction)uAction); 1224 v33 = pKeyActionMap->GetActionVKey((enum InputAction)uAction);
1225 if ( v33 != pPrevVirtualCidesMapping[uAction] ) 1225 if ( v33 != pPrevVirtualCidesMapping[uAction] )
1261 } 1261 }
1262 pTexture_RestUI_CurrentSkyFrame->Release(); 1262 pTexture_RestUI_CurrentSkyFrame->Release();
1263 pTexture_RestUI_CurrentHourglassFrame->Release(); 1263 pTexture_RestUI_CurrentHourglassFrame->Release();
1264 pTexture_RestUI_CurrentHourglassFrame = 0; 1264 pTexture_RestUI_CurrentHourglassFrame = 0;
1265 pTexture_RestUI_CurrentSkyFrame = 0; 1265 pTexture_RestUI_CurrentSkyFrame = 0;
1266 pIcons_LOD->_40F9C5(); 1266 pIcons_LOD->SyncLoadedFilesCount();
1267 pIcons_LOD->_4114F2(); 1267 pIcons_LOD->_4114F2();
1268 _506F18_num_hours_to_sleep = 0; 1268 _506F18_num_hours_to_sleep = 0;
1269 dword_506F14 = 0; 1269 dword_506F14 = 0;
1270 dword_507B94 = 1; 1270 dword_507B94 = 1;
1271 if ( pGUIWindow_Settings ) 1271 if ( pGUIWindow_Settings )
9163 return v5; 9163 return v5;
9164 } 9164 }
9165 9165
9166 9166
9167 //----- (0040D75D) -------------------------------------------------------- 9167 //----- (0040D75D) --------------------------------------------------------
9168 char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY) 9168 void pPrimaryWindow_draws_text( int a1, const char *pText, int *pXY )
9169 { 9169 {
9170 const char *v3; // ST0C_4@1 9170 const char *v3; // ST0C_4@1
9171 __int64 v4; // qax@1 9171 __int64 v4; // qax@1
9172 9172
9173 v3 = pText; 9173 v3 = pText;
9174 v4 = LOBYTE(pFontComic->uFontHeight) - 3; 9174 v4 = LOBYTE(pFontComic->uFontHeight) - 3;
9175 return pPrimaryWindow->DrawText( 9175 pPrimaryWindow->DrawText(
9176 pFontComic, 9176 pFontComic,
9177 *pXY, 9177 *pXY,
9178 pXY[1] - (((signed int)v4 - HIDWORD(v4)) >> 1) + 3, 9178 pXY[1] - (((signed int)v4 - HIDWORD(v4)) >> 1) + 3,
9179 0, 9179 0,
9180 v3, 9180 v3,
11352 } 11352 }
11353 return v2; 11353 return v2;
11354 } 11354 }
11355 11355
11356 //----- (004179BC) -------------------------------------------------------- 11356 //----- (004179BC) --------------------------------------------------------
11357 char __fastcall sub_4179BC_draw_tooltip(const char *a1, const char *a2) 11357 void __fastcall sub_4179BC_draw_tooltip( const char *a1, const char *a2 )
11358 { 11358 {
11359 const char *v2; // ebx@1 11359 const char *v2; // ebx@1
11360 const char *v3; // edi@1 11360 const char *v3; // edi@1
11361 unsigned int v4; // eax@1 11361 unsigned int v4; // eax@1
11362 GUIWindow Dst; // [sp+Ch] [bp-5Ch]@1 11362 GUIWindow Dst; // [sp+Ch] [bp-5Ch]@1
11363 POINT v6; // [sp+60h] [bp-8h]@1 11363 POINT v6; // [sp+60h] [bp-8h]@1
11380 Dst.uFrameZ = Dst.uFrameX + Dst.uFrameWidth - 1; 11380 Dst.uFrameZ = Dst.uFrameX + Dst.uFrameWidth - 1;
11381 Dst.uFrameW = Dst.uFrameY + Dst.uFrameHeight - 1; 11381 Dst.uFrameW = Dst.uFrameY + Dst.uFrameHeight - 1;
11382 v4 = TargetColor(0xFFu, 0xFFu, 0x9Bu); 11382 v4 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
11383 sprintf(pTmpBuf, format_4E2D80, v4, v3); 11383 sprintf(pTmpBuf, format_4E2D80, v4, v3);
11384 Dst.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3u); 11384 Dst.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3u);
11385 return Dst.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, v2, 0, 0, 0); 11385 Dst.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, v2, 0, 0, 0);
11386 } 11386 }
11387 11387
11388 //----- (00417AD4) -------------------------------------------------------- 11388 //----- (00417AD4) --------------------------------------------------------
11389 unsigned int GetSkillColor(unsigned int uPlayerClass, PLAYER_SKILL_TYPE uPlayerSkillType, signed int skill_level) 11389 unsigned int GetSkillColor(unsigned int uPlayerClass, PLAYER_SKILL_TYPE uPlayerSkillType, signed int skill_level)
11390 { 11390 {