Mercurial > mm7

comparison UI/UIHouses.cpp @ 2185:385040580292

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CastSpell continue
author Ritor1
date Mon, 27 Jan 2014 00:13:01 +0600
parents d28d3c006077
children 20995bb8895a
comparison
equal deleted inserted replaced
2184:e0863f5beee0 2185:385040580292
2281 memset(pPlayers[uActiveCharacter], 0, 0xA0u); 2281 memset(pPlayers[uActiveCharacter], 0, 0xA0u);
2282 pPlayers[uActiveCharacter]->sHealth = pPlayers[uActiveCharacter]->GetMaxHealth(); 2282 pPlayers[uActiveCharacter]->sHealth = pPlayers[uActiveCharacter]->GetMaxHealth();
2283 pPlayers[uActiveCharacter]->sMana = pPlayers[uActiveCharacter]->GetMaxMana(); 2283 pPlayers[uActiveCharacter]->sMana = pPlayers[uActiveCharacter]->GetMaxMana();
2284 if ( (signed int)window_SpeakInHouse->ptr_1C != 78 && ((signed int)window_SpeakInHouse->ptr_1C <= 80 || (signed int)window_SpeakInHouse->ptr_1C > 82) ) 2284 if ( (signed int)window_SpeakInHouse->ptr_1C != 78 && ((signed int)window_SpeakInHouse->ptr_1C <= 80 || (signed int)window_SpeakInHouse->ptr_1C > 82) )
2285 { 2285 {
2286 if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 ) 2286 if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )// если состояние зомби
2287 { 2287 {
2288 pPlayers[uActiveCharacter]->uCurrentFace = pPlayers[uActiveCharacter]->uPrevFace; 2288 pPlayers[uActiveCharacter]->uCurrentFace = pPlayers[uActiveCharacter]->uPrevFace;
2289 pPlayers[uActiveCharacter]->uVoiceID = pPlayers[uActiveCharacter]->uPrevVoiceID; 2289 pPlayers[uActiveCharacter]->uVoiceID = pPlayers[uActiveCharacter]->uPrevVoiceID;
2290 ReloadPlayerPortraits(uActiveCharacter - 1, pPlayers[uActiveCharacter]->uPrevFace); 2290 ReloadPlayerPortraits(uActiveCharacter - 1, pPlayers[uActiveCharacter]->uPrevFace);
2291 } 2291 }
2294 pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); 2294 pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536);
2295 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 2295 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
2296 return; 2296 return;
2297 } 2297 }
2298 if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 ) 2298 if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )
2299 {
2300 LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = v35; 2299 LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = v35;
2301 }
2302 else 2300 else
2303 { 2301 {
2304 if ( !pPlayers[uActiveCharacter]->pConditions[Condition_Eradicated] 2302 if ( !pPlayers[uActiveCharacter]->pConditions[Condition_Eradicated]
2305 && !pPlayers[uActiveCharacter]->pConditions[Condition_Pertified] && !pPlayers[uActiveCharacter]->pConditions[Condition_Dead] ) 2303 && !pPlayers[uActiveCharacter]->pConditions[Condition_Pertified] && !pPlayers[uActiveCharacter]->pConditions[Condition_Dead] )
2306 { 2304 {
2310 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 2308 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
2311 return; 2309 return;
2312 } 2310 }
2313 pPlayers[uActiveCharacter]->uPrevFace = pPlayers[uActiveCharacter]->uCurrentFace; 2311 pPlayers[uActiveCharacter]->uPrevFace = pPlayers[uActiveCharacter]->uCurrentFace;
2314 pPlayers[uActiveCharacter]->uPrevVoiceID = pPlayers[uActiveCharacter]->uVoiceID; 2312 pPlayers[uActiveCharacter]->uPrevVoiceID = pPlayers[uActiveCharacter]->uVoiceID;
2315 pPlayers[uActiveCharacter]->SetCondition(0x11u, 1); 2313 pPlayers[uActiveCharacter]->SetCondition(Condition_Zombie, 1);
2316 pPlayers[uActiveCharacter]->uVoiceID = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23; 2314 pPlayers[uActiveCharacter]->uVoiceID = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23;
2317 pPlayers[uActiveCharacter]->uCurrentFace = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23; 2315 pPlayers[uActiveCharacter]->uCurrentFace = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23;
2318 ReloadPlayerPortraits(uActiveCharacter - 1, (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23); 2316 ReloadPlayerPortraits(uActiveCharacter - 1, (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23);
2319 LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = LODWORD(pParty->uTimePlayed); 2317 pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] = pParty->uTimePlayed;
2320 //v39 = (GUIWindow *)HIDWORD(pParty->uTimePlayed); 2318 //v39 = (GUIWindow *)HIDWORD(pParty->uTimePlayed);
2321 } 2319 }
2322 //HIDWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = (int)v39; 2320 //HIDWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = (int)v39;
2323 pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] =pParty->uTimePlayed; 2321 pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] = pParty->uTimePlayed;
2324 pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0); 2322 pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0);
2325 pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0); 2323 pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0);
2326 pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); 2324 pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536);
2327 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 2325 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
2328 return; 2326 return;