Mercurial > mm7

comparison Game.cpp @ 949:c0d0656aa662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Awards
author Nomad
date Wed, 01 May 2013 20:04:24 +0200
parents ae747684f644
children 5a12082c803d
comparison
equal deleted inserted replaced
948:5a2dbb00c399 949:c0d0656aa662
197 197
198 198
199 if (render_framerate) 199 if (render_framerate)
200 { 200 {
201 sprintf(pTmpBuf, "FPS: % .4f", framerate); 201 sprintf(pTmpBuf, "FPS: % .4f", framerate);
202 pPrimaryWindow->DrawText(pFontArrus, 494, 0, GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0), pTmpBuf, 0, 0, 0); 202 pPrimaryWindow->DrawText(pFontArrus, 494, 0, TargetColor(0, 0, 0), pTmpBuf, 0, 0, 0);
203 } 203 }
204 204
205 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 205 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
206 { 206 {
207 auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z); 207 auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
208 sprintf(pTmpBuf, "Party Sector ID: %u/%u\n", sector_id, pIndoor->uNumSectors); 208 sprintf(pTmpBuf, "Party Sector ID: %u/%u\n", sector_id, pIndoor->uNumSectors);
209 pPrimaryWindow->DrawText(pFontArrus, 16, 16, GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF); 209 pPrimaryWindow->DrawText(pFontArrus, 16, 16, TargetColor(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF);
210 } 210 }
211 sprintf(pTmpBuf, "Party Position: % d % d % d", pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z); 211 sprintf(pTmpBuf, "Party Position: % d % d % d", pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
212 pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16, GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF); 212 pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16, TargetColor(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF);
213 213
214 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) 214 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
215 { 215 {
216 uint uFaceID; 216 uint uFaceID;
217 auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z); 217 auto sector_id = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
222 { 222 {
223 int on_water, _a6; 223 int on_water, _a6;
224 auto floor_level = ODM_GetFloorLevel(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z, 0, &on_water, &_a6, false); 224 auto floor_level = ODM_GetFloorLevel(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z, 0, &on_water, &_a6, false);
225 sprintf(pTmpBuf, "ODM_GetFloorLevel: %d on_water: %s a6 = %d\n", floor_level, on_water ? "true" : "false", _a6); 225 sprintf(pTmpBuf, "ODM_GetFloorLevel: %d on_water: %s a6 = %d\n", floor_level, on_water ? "true" : "false", _a6);
226 } 226 }
227 pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16 + 16, GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF); 227 pPrimaryWindow->DrawText(pFontArrus, 16, 16 + 16 + 16, TargetColor(255, 255, 255), pTmpBuf, 0, 0, 0xFFFFFFFF);
228 228
229 GUI_UpdateWindows(); 229 GUI_UpdateWindows();
230 pParty->UpdatePlayersAndHirelingsEmotions(); 230 pParty->UpdatePlayersAndHirelingsEmotions();
231 231
232 _unused_5B5924_is_travel_ui_drawn = false; 232 _unused_5B5924_is_travel_ui_drawn = false;