Mercurial > mm7
comparison Actor.cpp @ 188:207b2492e14b
AddItem crash
author | Nomad |
---|---|
date | Fri, 15 Feb 2013 22:54:19 +0200 |
parents | 49728858c35e |
children | a6a8fa73b4ec |
comparison
equal
deleted
inserted
replaced
187:49728858c35e | 188:207b2492e14b |
---|---|
269 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); | 269 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); |
270 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); | 270 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); |
271 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); | 271 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); |
272 if ( v17 && uActiveCharacter && !(v5->uFlags & 0x80) ) | 272 if ( v17 && uActiveCharacter && !(v5->uFlags & 0x80) ) |
273 { | 273 { |
274 __debugbreak(); // find out what's the speech | |
275 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21) | 274 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21) |
276 pPlayers[uActiveCharacter]->PlaySound(SPEECH_23, 0); | 275 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0); |
277 else | 276 else |
278 pPlayers[uActiveCharacter]->PlaySound(SPEECH_22, 0); | 277 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodDay, 0); |
279 } | 278 } |
280 } | 279 } |
281 | 280 |
282 | 281 |
283 //----- (0040894B) -------------------------------------------------------- | 282 //----- (0040894B) -------------------------------------------------------- |
284 bool Actor::CanAct() | 283 bool Actor::CanAct() |
285 { | 284 { |
286 signed int v1; // esi@1 | 285 signed int v1; // esi@1 |
287 bool v2; // edi@2 | 286 bool v2; // edi@2 |