Mercurial > mm7
comparison Party.cpp @ 1483:223605b325b3
Слияние
author | Ritor1 |
---|---|
date | Thu, 29 Aug 2013 12:04:55 +0600 |
parents | 2ca62c9e7b3c |
children | d023247ae118 |
comparison
equal
deleted
inserted
replaced
1482:cfd99b6177a3 | 1483:223605b325b3 |
---|---|
1179 } | 1179 } |
1180 while ( (signed int)v3 <= (signed int)&pPlayers[4] ); | 1180 while ( (signed int)v3 <= (signed int)&pPlayers[4] ); |
1181 _494035_timed_effects__water_walking_damage__etc(); | 1181 _494035_timed_effects__water_walking_damage__etc(); |
1182 } | 1182 } |
1183 //----- (004B1BDB) -------------------------------------------------------- | 1183 //----- (004B1BDB) -------------------------------------------------------- |
1184 void __stdcall RestAndHeal(__int64 uNumMinutes) | 1184 void RestAndHeal(__int64 uNumMinutes) |
1185 { | 1185 { |
1186 signed __int64 v1; // ST2C_8@1 | 1186 signed __int64 v1; // ST2C_8@1 |
1187 signed __int64 v2; // qax@1 | 1187 signed __int64 v2; // qax@1 |
1188 signed __int64 v3; // ST1C_8@1 | 1188 signed __int64 v3; // ST1C_8@1 |
1189 unsigned __int64 v4; // qax@1 | 1189 unsigned __int64 v4; // qax@1 |
1216 } | 1216 } |
1217 while ( v6 <= &pParty->pPlayers[3] ); | 1217 while ( v6 <= &pParty->pPlayers[3] ); |
1218 pParty->UpdatePlayersAndHirelingsEmotions(); | 1218 pParty->UpdatePlayersAndHirelingsEmotions(); |
1219 } | 1219 } |
1220 //----- (0041F5BE) -------------------------------------------------------- | 1220 //----- (0041F5BE) -------------------------------------------------------- |
1221 void __cdecl Sleep6Hours() | 1221 void Sleep6Hours() |
1222 { | 1222 { |
1223 if ( _506F18_num_minutes_to_sleep < 6 ) | 1223 if ( _506F18_num_minutes_to_sleep < 6 ) |
1224 { | 1224 { |
1225 pParty->pPlayers[3].SetAsleep(false); | 1225 pParty->pPlayers[3].SetAsleep(false); |
1226 pParty->pPlayers[2].SetAsleep(false); | 1226 pParty->pPlayers[2].SetAsleep(false); |
1262 } | 1262 } |
1263 viewparams->bRedrawGameUI = 1; | 1263 viewparams->bRedrawGameUI = 1; |
1264 } | 1264 } |
1265 | 1265 |
1266 //----- (0047752B) -------------------------------------------------------- | 1266 //----- (0047752B) -------------------------------------------------------- |
1267 int __cdecl GetPartyReputation() | 1267 int GetPartyReputation() |
1268 { | 1268 { |
1269 DDM_DLV_Header *v0; // ebx@1 | 1269 DDM_DLV_Header *v0; // ebx@1 |
1270 signed int v1; // esi@3 | 1270 signed int v1; // esi@3 |
1271 | 1271 |
1272 v0 = &pOutdoor->ddm; | 1272 v0 = &pOutdoor->ddm; |
1425 if ( pTmpBuf2[0] ) | 1425 if ( pTmpBuf2[0] ) |
1426 ShowStatusBarString(pTmpBuf2.data(), 2u); | 1426 ShowStatusBarString(pTmpBuf2.data(), 2u); |
1427 pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2); | 1427 pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2); |
1428 } | 1428 } |
1429 //----- (00421B2C) -------------------------------------------------------- | 1429 //----- (00421B2C) -------------------------------------------------------- |
1430 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem() | 1430 bool sub_421B2C_PlaceInInventory_or_DropPickedItem() |
1431 { | 1431 { |
1432 unsigned int v0; // eax@2 | 1432 unsigned int v0; // eax@2 |
1433 Texture *v1; // ebx@2 | 1433 Texture *v1; // ebx@2 |
1434 int v2; // eax@3 | 1434 int v2; // eax@3 |
1435 Player *v3; // esi@5 | 1435 Player *v3; // esi@5 |