Mercurial > mm7

comparison Actor.cpp @ 832:dfd683c4f538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hotkeys fixed Moved GUIButton.h to GUIWindow.h
author Nomad
date Wed, 27 Mar 2013 19:50:37 +0200
parents 0f56abdcce94
children ceef50611567
comparison
equal deleted inserted replaced
831:9c3f28b31b4a 832:dfd683c4f538
286 0xFAu, 286 0xFAu,
287 0x8Cu, 287 0x8Cu,
288 LOBYTE(pFontArrus->uFontHeight) - 3, 288 LOBYTE(pFontArrus->uFontHeight) - 3,
289 1, 289 1,
290 0, 290 0,
291 0x88u, 291 UIMSG_SelectNPCDialogueOption,
292 9u, 292 9u,
293 0, 293 0,
294 "", 294 "",
295 0); 295 0);
296 pDialogueWindow->_41D08F(4, 1, 0, 1); 296 pDialogueWindow->_41D08F(4, 1, 0, 1);
297 } 297 }
298 } 298 }
299 } 299 }
300 } 300 }
301 pDialogueWindow->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 301 pDialogueWindow->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 1u, 0x31u, "", 0);
302 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 302 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 2u, 0x32u, "", 0);
303 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); 303 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 3u, 0x33u, "", 0);
304 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); 304 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 4u, 0x34u, "", 0);
305 if (v17 && uActiveCharacter && !v5->Hired()) 305 if (v17 && uActiveCharacter && !v5->Hired())
306 { 306 {
307 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21) 307 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21)
308 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0); 308 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0);
309 else 309 else