Mercurial > mm7

comparison UI/UiGame.cpp @ 2215:e9625ad08541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fog fix and change 640,480 - window->GetWidth(), window->GetHeight()
author Ritor1
date Fri, 14 Feb 2014 18:08:30 +0600
parents db94443ea4e7
children 3f375342de12
comparison
equal deleted inserted replaced
2214:20995bb8895a 2215:e9625ad08541
304 } 304 }
305 } 305 }
306 } 306 }
307 if (sDialogue_SpeakingActorNPC_ID < 0) 307 if (sDialogue_SpeakingActorNPC_ID < 0)
308 v9 = 4; 308 v9 = 4;
309 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 3, 0);//pNumberContacts = 1, v9 = 0; pNumberContacts = 2, v9 = 3; 309 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Dialogue, 3, 0);//pNumberContacts = 1, v9 = 0; pNumberContacts = 2, v9 = 3;
310 if (pNPCInfo->Hired() && !pNPCInfo->bHasUsedTheAbility) 310 if (pNPCInfo->Hired() && !pNPCInfo->bHasUsedTheAbility)
311 { 311 {
312 if (pNPCInfo->uProfession == 10 || //Healer 312 if (pNPCInfo->uProfession == 10 || //Healer
313 pNPCInfo->uProfession == 11 || //Expert Healer 313 pNPCInfo->uProfession == 11 || //Expert Healer
314 pNPCInfo->uProfession == 12 || //Master Healer 314 pNPCInfo->uProfession == 12 || //Master Healer