Mercurial > mm7

diff Game.cpp @ 2006:30c2b575d25c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
signed fixes DamagePlayerFromMonster -1 indexing
author zipi
date Wed, 06 Nov 2013 13:06:02 +0000
parents 4088cc908c78
children 28cb79ae2f6f
line wrap: on
line diff
--- a/Game.cpp	Wed Nov 06 00:09:47 2013 -0800
+++ b/Game.cpp	Wed Nov 06 13:06:02 2013 +0000
@@ -234,10 +234,10 @@
     {
       int sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
       sprintf(pTmpBuf.data(), "Party Sector ID:        %u/%u\n", sector_id, pIndoor->uNumSectors);
-      pPrimaryWindow->DrawText(pFontArrus, 16, 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, 0xFFFFFFFF);
+      pPrimaryWindow->DrawText(pFontArrus, 16, 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, -1);
     }
     sprintf(pTmpBuf.data(), "Party Position:         % d % d % d", pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
-    pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, 0xFFFFFFFF);
+    pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, -1);
   
     if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
     {
@@ -252,7 +252,7 @@
       int floor_level = ODM_GetFloorLevel(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z, 0, &on_water, &_a6, false);
       sprintf(pTmpBuf.data(), "ODM_GetFloorLevel: %d   on_water: %s    a6 = %d\n", floor_level, on_water ? "true" : "false", _a6);
     }
-    pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16 + 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, 0xFFFFFFFF);
+    pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16 + 16, TargetColor(255, 255, 255), pTmpBuf.data(), 0, 0, -1);
   }
 
   GUI_UpdateWindows();
@@ -299,7 +299,7 @@
   MSG Msg; // [sp+28h] [bp-3Ch]@20
   char Source[64]; // [sp+44h] [bp-20h]@76
 
-  bLoading = uCurrentMenuID == MENU_LoadingProcInMainMenu;
+  bLoading = sCurrentMenuID == MENU_LoadingProcInMainMenu;
   SetCurrentMenuID((MENU_STATE)-1);
   if (bLoading)
   {
@@ -719,7 +719,7 @@
 
 
 //----- (0044EDE4) --------------------------------------------------------
-bool Game::AlterGamma_BLV(BLVFace *pFace, unsigned int *pColor)
+bool Game::AlterGamma_BLV(BLVFace *pFace, signed int *pColor)
 {
   if (uFlags2 & GAME_FLAGS_2_SATURATE_LIGHTMAPS &&
       pFace->uAttributes & FACE_CAN_SATURATE_COLOR)
@@ -732,7 +732,7 @@
 }
 
 //----- (0044EE30) --------------------------------------------------------
-bool Game::AlterGamma_ODM(ODMFace *pFace, unsigned int *pColor)
+bool Game::AlterGamma_ODM(ODMFace *pFace, signed int *pColor)
 {
   if (uFlags2 & GAME_FLAGS_2_SATURATE_LIGHTMAPS &&
       pFace->uAttributes & FACE_CAN_SATURATE_COLOR)