Mercurial > mm7
changeset 1660:8fbc59bef5a0
Merge
| author | Nomad |
|---|---|
| date | Wed, 18 Sep 2013 11:24:03 +0200 |
| parents | 51c63e03e856 (current diff) 55bdb9b043e3 (diff) |
| children | c6882fd6c4ee |
| files | |
| diffstat | 4 files changed, 218 insertions(+), 245 deletions(-) [+] |
line wrap: on
line diff
--- a/Party.cpp Wed Sep 18 11:23:41 2013 +0200 +++ b/Party.cpp Wed Sep 18 11:24:03 2013 +0200 @@ -620,7 +620,7 @@ bTurnBasedModeOn = false; uActiveCharacter = 1; - ::pPlayers[0] = pPlayers; + ::pPlayers.ZerothIndex() = pPlayers; for (uint i = 0; i < 4; ++i) ::pPlayers[i + 1] = &pPlayers[i];
--- a/Player.cpp Wed Sep 18 11:23:41 2013 +0200 +++ b/Player.cpp Wed Sep 18 11:24:03 2013 +0200 @@ -7474,18 +7474,9 @@ Player *playerPtr; // ebx@3 Actor *actorPtr; // esi@3 unsigned int v8; // eax@4 - char *v9; // eax@5 - signed int v10; // eax@6 int v11; // edx@8 - int v12; // edx@9 - int v13; // edx@10 int v14; // edx@16 - int v15; // edx@17 - int v16; // edx@18 enum SoundID v17; // eax@24 - int v18; // eax@26 - unsigned __int8 v19; // zf@26 - unsigned __int8 v20; // sf@26 unsigned __int16 v21; // ax@29 signed int v22; // edi@36 int v23; // eax@38 @@ -7493,58 +7484,38 @@ AIState v25; // cx@47 signed int v26; // eax@49 int v27; // eax@54 - float v28; // ST18_4@58 - double v29; // st7@58 - float v30; // ST08_4@58 - double v31; // st7@58 - float v32; // ST04_4@58 - float v33; // ST00_4@58 int v34; // edi@61 int v35; // eax@70 - double v36; // st7@70 + int v36; // st7@70 SpriteObject *v37; // ebx@77 int v38; // edi@77 int v39; // esi@77 int v40; // eax@77 int v41; // eax@77 - int v42; // eax@78 Player *v43; // eax@81 - Actor *v44; // esi@82 + //Actor *actorPtr; // esi@82 Player *v45; // edi@84 unsigned __int16 v46; // ax@84 - int v47; // ebx@105 int v48; // eax@107 unsigned __int16 v49; // ax@116 int v50; // ebx@123 unsigned __int16 v51; // ax@124 - char v52; // bl@124 int v53; // eax@128 signed int v54; // eax@134 unsigned __int16 v55; // cx@137 - signed int v56; // eax@139 + signed int recvdMagicDmg; // eax@139 int v57; // eax@144 - float v58; // ST18_4@148 - double v59; // st7@148 - float v60; // ST08_4@148 - double v61; // st7@148 - float v62; // ST04_4@148 - float v63; // ST00_4@148 int v64; // ebx@151 int v65; // eax@161 - double v66; // st7@161 - signed int v67; // ecx@164 + int v66; // st7@161 signed int v68; // eax@170 int v69; // ecx@170 int v70; // eax@171 - enum SoundID v71; // [sp+20h] [bp-34h]@12 - int v72; // [sp+30h] [bp-24h]@164 - double v73; // [sp+40h] [bp-14h]@72 + int v72[4]; // [sp+30h] [bp-24h]@164 signed int v74; // [sp+44h] [bp-10h]@1 - unsigned int v75; // [sp+48h] [bp-Ch]@3 + int healthBeforeRecvdDamage; // [sp+48h] [bp-Ch]@3 unsigned int uActorID; // [sp+4Ch] [bp-8h]@1 - int v77; // [sp+50h] [bp-4h]@26 - signed int a4a; // [sp+60h] [bp+Ch]@162 - Player *a4b; // [sp+60h] [bp+Ch]@168 + int dmgToReceive; // [sp+50h] [bp-4h]@26 v4 = PID_ID(uObjID); v5 = PID_TYPE(uObjID) - 2; @@ -7554,7 +7525,7 @@ { playerPtr = &pParty->pPlayers[a4]; actorPtr = &pActors[v4]; - v75 = playerPtr->sHealth; + healthBeforeRecvdDamage = playerPtr->sHealth; if ( v5 != 1 || !stru_50C198.ActorHitOrMiss(actorPtr, playerPtr) ) return; v8 = playerPtr->pEquipment.uArmor; @@ -7587,15 +7558,12 @@ } } pAudioPlayer->PlaySound(v17, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); - v18 = Actor::_43B3E0_CalcDamage(actorPtr, v74); - v19 = HIDWORD(actorPtr->pActorBuffs[3].uExpireTime) == 0; - v20 = SHIDWORD(actorPtr->pActorBuffs[3].uExpireTime) < 0; - v77 = v18; - if ( !v20 && (!(v20 | v19) || LODWORD(actorPtr->pActorBuffs[3].uExpireTime) > 0) ) + dmgToReceive = Actor::_43B3E0_CalcDamage(actorPtr, v74); + if ( actorPtr->pActorBuffs[3].uExpireTime > 0 ) { v21 = actorPtr->pActorBuffs[3].uPower; if ( v21 ) - v77 /= (signed int)v21; + dmgToReceive /= (signed int)v21; } switch (v74) { @@ -7617,16 +7585,15 @@ } if ( !(dword_6BE368_debug_settings_2 & 0x10) ) { - v24 = playerPtr->ReceiveDamage(v77, (DAMAGE_TYPE)v22); - if ( SHIDWORD(playerPtr->pPlayerBuffs[10].uExpireTime) >= 0 - && (SHIDWORD(playerPtr->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(playerPtr->pPlayerBuffs[10].uExpireTime)) ) + v24 = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)v22); + if ( playerPtr->pPlayerBuffs[10].uExpireTime > 0 ) { v25 = actorPtr->uAIState; if ( v25 != Dying && v25 != Dead) { v26 = stru_50C198.CalcMagicalDamageToActor(actorPtr, v22, v24); actorPtr->sCurrentHP -= v26; - if ( v26 ) + if ( v26 >= 0 ) { if ( actorPtr->sCurrentHP >= 1 ) { @@ -7635,16 +7602,10 @@ } else { - if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 ) + if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS) { v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; - if ( pRenderer->pRenderD3D ) - { - if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) - { - pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, v27, 0, 0); - } - } + pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)v27, 0, 0); } Actor::Die(uActorID); Actor::ApplyFineForKillingPeasant(uActorID); @@ -7662,25 +7623,20 @@ if ( !(dword_6BE368_debug_settings_2 & 0x10) && actorPtr->pMonsterInfo.uSpecialAttack && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) + { playerPtr->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); + } } if ( !pParty->bTurnBasedModeOn ) { v35 = playerPtr->GetActualEndurance(); - v36 = (double)(20 - playerPtr->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; - playerPtr->SetRecoveryTime((signed __int64)v36); - } - if ( v77 ) - { - v73 = (double)(signed int)v75; - if ( (double)playerPtr->GetMaxHealth() * 0.25 < v73 ) - { - if ( playerPtr->sHealth > 0 ) - { - if ( (double)playerPtr->GetMaxHealth() * 0.25 >= (double)playerPtr->sHealth ) - playerPtr->PlaySound(SPEECH_48, 0); - } - } + v36 = (int)((20 - playerPtr->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333); + playerPtr->SetRecoveryTime(v36); + } + int yellThreshold = playerPtr->GetMaxHealth() / 4; + if ( yellThreshold < playerPtr->sHealth && yellThreshold >= healthBeforeRecvdDamage && playerPtr->sHealth > 0 ) + { + playerPtr->PlaySound(SPEECH_48, 0); } viewparams->bRedrawGameUI = 1; return; @@ -7693,171 +7649,25 @@ v40 = PID_TYPE(v37->spell_caster_pid); uActorID = PID_ID(v37->spell_caster_pid); v41 = v40 - 2; - if ( !v41 ) - goto LABEL_80; - v42 = v41 - 1; - if ( !v42 ) - { - v44 = &pActors[v39]; - if ( a4 == -1 ) - a4 = stru_50C198.which_player_would_attack(v44); - v45 = &pParty->pPlayers[a4]; - v77 = Actor::_43B3E0_CalcDamage(v44, v74); - v46 = v37->uType; - if ( v37->uType == 545 ) - { - LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); - v52 = v51; - if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) - { - sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); - ShowStatusBarString(pTmpBuf.data(), 2u); - v45->PlaySound(SPEECH_6, 0); - return; - } - } - else + if ( v40 == 2 ) + { + if ( a4 != -1 ) { - if ( v46 != 555 - && v46 != 510 - && v46 != 500 - && v46 != 515 - && v46 != 505 - && v46 != 530 - && v46 != 525 - && v46 != 520 - && v46 != 535 - && v46 != 540 ) - goto LABEL_115; - } - if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) - return; - if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) - v77 >>= 1; - if ( v45->HasEnchantedItemEquipped(36) ) - v77 >>= 1; - if ( v45->HasEnchantedItemEquipped(69) ) - v77 >>= 1; - if ( v45->HasItemEquipped(EQUIP_ARMOUR) - && v45->pInventoryItemList[v45->pEquipment.uArmor-1].uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) - v77 >>= 1; - if ( v45->HasItemEquipped(EQUIP_MAIN_HAND)) - { - v48 = v45->pInventoryItemList[v45->pEquipment.uMainHand - 1].uItemID; - if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType(EQUIP_MAIN_HAND) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) - v77 >>= 1; - } - if ( v45->HasItemEquipped(EQUIP_OFF_HAND)) - { - v48 = v45->pInventoryItemList[v45->pEquipment.uShield - 1].uItemID; - if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) - v77 >>= 1; - } - LABEL_115: - if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) - { - v49 = v44->pActorBuffs[3].uPower; - if ( v49 ) - v77 /= (signed int)v49; - } - if ( !v74 ) - { - v50 = v44->pMonsterInfo.uAttack1Type; - goto LABEL_133; - } - if ( v74 == 1 ) - { - v50 = v44->pMonsterInfo.uAttack2Type; - goto LABEL_133; - } - if ( v74 == 2 ) - { - v53 = v44->pMonsterInfo.uSpell1ID; + v43 = &pParty->pPlayers[a4]; } else { - if ( v74 != 3 ) + v74 = 0; + for (int i = 1; i <= 4; i++) { - if ( v74 == 4 ) - v50 = v44->pMonsterInfo.field_3C_some_special_attack; - else - v50 = 4; - LABEL_133: - if ( !(dword_6BE368_debug_settings_2 & 0x10) ) - { - v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); - if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) - { - if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) - { - v55 = v44->uAIState; - if ( v55 != Dying && v55 != Dead) - { - v56 = stru_50C198.CalcMagicalDamageToActor(v44, v50, v54); - v44->sCurrentHP -= v56; - if ( v56 ) - { - if ( v44->sCurrentHP >= 1 ) - { - Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); - Actor::AggroSurroundingPeasants(uActorID, 1); - } - else - { - if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) - { - v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v44->uActorRadius : v44->uActorRadius; - if ( pRenderer->pRenderD3D ) - { - if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) - { - pDecalBuilder->AddBloodsplat(v44->vPosition.x, v44->vPosition.y, v44->vPosition.z, 1.0, 0.0, 0.0, v57, 0, 0); - } - } - } - Actor::Die(uActorID); - Actor::ApplyFineForKillingPeasant(uActorID); - Actor::AggroSurroundingPeasants(uActorID, 1); - if ( v44->pMonsterInfo.uExp ) - GivePartyExp(pMonsterStats->pInfos[v44->pMonsterInfo.uID].uExp); - v64 = SPEECH_51; - if ( rand() % 100 < 20 ) - v64 = ((signed int)v44->pMonsterInfo.uHP >= 100) + 1; - v45->PlaySound((PlayerSpeech)v64, 0); - } - } - } - } - } - } - if ( !v74 - && !(dword_6BE368_debug_settings_2 & 0x10) - && v44->pMonsterInfo.uSpecialAttack - && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) - v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); - if ( !pParty->bTurnBasedModeOn ) - { - v65 = v45->GetActualEndurance(); - v66 = (double)(20 - v45->GetParameterBonus(v65)) - * flt_6BE3A4_debug_recmod1 - * 2.133333333333333; - v45->SetRecoveryTime((signed __int64)v66); - } - return; + v72[v74] = i; + v74++; } - v53 = v44->pMonsterInfo.uSpell2ID; + if ( v74 ) + { + v43 = &pParty->pPlayers[v72[rand() % v74]];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; + } } - v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); - goto LABEL_133; - } - if ( v42 != 1 ) - return; - LABEL_80: - if ( a4 != -1 ) - { - v43 = &pParty->pPlayers[a4]; - LABEL_168: - a4b = v43; if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) { v70 = v43->GetMaxHealth(); @@ -7869,7 +7679,7 @@ v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); v69 = 0; } - a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); + v43->ReceiveDamage(v68, (DAMAGE_TYPE)v69); if ( v38 == OBJECT_Player && !qword_A750D8 ) { qword_A750D8 = 256i64; @@ -7878,22 +7688,147 @@ } return; } - v74 = 0; - a4a = 1; - do - { - if ( pPlayers[a4a]->CanAct() ) + else if ( v40 == 3 ) + { + actorPtr = &pActors[v39]; + if ( a4 == -1 ) + a4 = stru_50C198.which_player_would_attack(actorPtr); + v45 = &pParty->pPlayers[a4]; + dmgToReceive = Actor::_43B3E0_CalcDamage(actorPtr, v74); + v46 = v37->uType; + if ( v37->uType == 545 ) + { + v51 = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); + if ( SkillToMastery(v51) >= 4 && rand() % 100 < (v51 & 0x3F) ) + { + sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); + ShowStatusBarString(pTmpBuf.data(), 2u); + v45->PlaySound(SPEECH_6, 0); + return; + } + } + else if ( v46 == 555 + || v46 == 510 + || v46 == 500 + || v46 == 515 + || v46 == 505 + || v46 == 530 + || v46 == 525 + || v46 == 520 + || v46 == 535 + || v46 == 540 ) + { + if ( !stru_50C198.ActorHitOrMiss(actorPtr, v45) ) + return; + if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) + dmgToReceive >>= 1; + if ( v45->HasEnchantedItemEquipped(36) ) + dmgToReceive >>= 1; + if ( v45->HasEnchantedItemEquipped(69) ) + dmgToReceive >>= 1; + if ( v45->HasItemEquipped(EQUIP_ARMOUR) + && v45->pInventoryItemList[v45->pEquipment.uArmor-1].uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) + dmgToReceive >>= 1; + if ( v45->HasItemEquipped(EQUIP_MAIN_HAND)) + { + v48 = v45->pInventoryItemList[v45->pEquipment.uMainHand - 1].uItemID; + if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType(EQUIP_MAIN_HAND) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) + dmgToReceive >>= 1; + } + if ( v45->HasItemEquipped(EQUIP_OFF_HAND)) + { + v48 = v45->pInventoryItemList[v45->pEquipment.uShield - 1].uItemID; + if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) + dmgToReceive >>= 1; + } + } + if ( actorPtr->pActorBuffs[3].uExpireTime > 0 ) + { + v49 = actorPtr->pActorBuffs[3].uPower; + if ( v49 ) + dmgToReceive /= (signed int)v49; + } + switch(v74) { - v67 = v74++; - *(&v72 + v67) = a4a; + case 0: + v50 = actorPtr->pMonsterInfo.uAttack1Type; + break; + case 1: + v50 = actorPtr->pMonsterInfo.uAttack2Type; + break; + case 2: + v53 = actorPtr->pMonsterInfo.uSpell1ID; + v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); + break; + case 3: + v53 = actorPtr->pMonsterInfo.uSpell2ID; + v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); + break; + case 4: + v50 = actorPtr->pMonsterInfo.field_3C_some_special_attack; + break; + case 5: + v50 = 4; + break; } - ++a4a; - } - while ( a4a <= 4 ); - if ( v74 ) - { - v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; - goto LABEL_168; + if ( !(dword_6BE368_debug_settings_2 & 0x10) ) + { + v54 = v45->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)v50); + if ( v45->pPlayerBuffs[10].uExpireTime > 0 ) + { + v55 = actorPtr->uAIState; + if ( v55 != Dying && v55 != Dead) + { + recvdMagicDmg = stru_50C198.CalcMagicalDamageToActor(actorPtr, v50, v54); + actorPtr->sCurrentHP -= recvdMagicDmg; + if ( recvdMagicDmg >= 0 ) + { + if ( actorPtr->sCurrentHP >= 1 ) + { + Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); + Actor::AggroSurroundingPeasants(uActorID, 1); + } + else + { + if ( pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].bQuestMonster & 1 && pRenderer->pRenderD3D && pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) + { + v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * actorPtr->uActorRadius : actorPtr->uActorRadius; + pDecalBuilder->AddBloodsplat(actorPtr->vPosition.x, actorPtr->vPosition.y, actorPtr->vPosition.z, 1.0, 0.0, 0.0, (float)v57, 0, 0); + } + Actor::Die(uActorID); + Actor::ApplyFineForKillingPeasant(uActorID); + Actor::AggroSurroundingPeasants(uActorID, 1); + if ( actorPtr->pMonsterInfo.uExp ) + GivePartyExp(pMonsterStats->pInfos[actorPtr->pMonsterInfo.uID].uExp); + v64 = SPEECH_51; + if ( rand() % 100 < 20 ) + v64 = ((signed int)actorPtr->pMonsterInfo.uHP >= 100) + 1; + v45->PlaySound((PlayerSpeech)v64, 0); + } + } + } + } + } + if ( !v74 + && !(dword_6BE368_debug_settings_2 & 0x10) + && actorPtr->pMonsterInfo.uSpecialAttack + && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackType ) + { + v45->_48DCF6(actorPtr->pMonsterInfo.uSpecialAttack, actorPtr); + } + if ( !pParty->bTurnBasedModeOn ) + { + v65 = v45->GetActualEndurance(); + v66 = (int)((20 - v45->GetParameterBonus(v65)) + * flt_6BE3A4_debug_recmod1 + * 2.133333333333333); + v45->SetRecoveryTime(v66); + } + return; + } + else + { + return; } } }
--- a/mm7_data.cpp Wed Sep 18 11:23:41 2013 +0200 +++ b/mm7_data.cpp Wed Sep 18 11:24:03 2013 +0200 @@ -1312,7 +1312,7 @@ struct Texture *pTexture_PlayerFaceEradicated; struct Texture *pTexture_PlayerFaceDead; std::array< std::array<struct Texture *, 56>, 4> pTextures_PlayerFaces; -std::array<struct Player *, 5> pPlayers; +NZIArray<struct Player *, 5> pPlayers; __int64 qword_A750D8; // weak enum PlayerSpeech PlayerSpeechID; int uSpeakingCharacter; // weak
--- a/mm7_data.h Wed Sep 18 11:23:41 2013 +0200 +++ b/mm7_data.h Wed Sep 18 11:24:03 2013 +0200 @@ -3,6 +3,7 @@ #include "VectorTypes.h" #include "OSAPI.h" #include <array> +#include <assert.h> typedef char _UNKNOWN; typedef unsigned int uint; @@ -282,7 +283,44 @@ return uint64(x) > uint64(x+y); } +template<class _Ty, + size_t _Size> +class NZIArray : std::array<_Ty, _Size> +{ +public: + reference ZerothIndex() + { + return std::array<_Ty, _Size>::operator [](0); + } + reference operator[](size_type _Pos) + { // subscript nonmutable sequence +#if _ITERATOR_DEBUG_LEVEL == 2 + assert(_Pos != 0 && "not allowed to access zeroth element"); + +#elif _ITERATOR_DEBUG_LEVEL == 1 + _SCL_SECURE_VALIDATE_RANGE(_Pos != 0); +#endif /* _ITERATOR_DEBUG_LEVEL */ + + __analysis_assume(_Pos != 0); + + return std::array<_Ty, _Size>::operator [](_Pos); + } + + const_reference operator[](size_type _Pos) const + { // subscript nonmutable sequence +#if _ITERATOR_DEBUG_LEVEL == 2 + assert(_Pos != 0 && "not allowed to access zeroth element"); + +#elif _ITERATOR_DEBUG_LEVEL == 1 + _SCL_SECURE_VALIDATE_RANGE(_Pos != 0); +#endif /* _ITERATOR_DEBUG_LEVEL */ + + __analysis_assume(_Pos != 0); + + return std::array<_Ty, _Size>::operator [](_Pos); + } +}; //------------------------------------------------------------------------- // Data declarations @@ -970,7 +1008,7 @@ extern struct Texture *pTexture_PlayerFaceDead; extern std::array< std::array<struct Texture *, 56>, 4> pTextures_PlayerFaces; extern int dword_A75070; // weak -extern std::array<struct Player *, 5> pPlayers; +extern NZIArray<struct Player *, 5> pPlayers; extern __int64 qword_A750D8; // weak extern enum PlayerSpeech PlayerSpeechID; extern int uSpeakingCharacter; // weak