Mercurial > mm7
annotate Party.cpp @ 2253:aff7a7b072b7
adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
| author | Grumpy7 |
|---|---|
| date | Wed, 26 Feb 2014 23:35:23 +0100 |
| parents | c4f87fb3cfee |
| children | 27f2a2c2fd8f |
| rev | line source |
|---|---|
|
2253
aff7a7b072b7
adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Grumpy7
parents:
2242
diff
changeset
|
1 #define _CRT_SECURE_NO_WARNINGS |
| 0 | 2 #include "Party.h" |
| 3 #include "MapInfo.h" | |
| 2044 | 4 #include "Timer.h" |
| 0 | 5 #include "AudioPlayer.h" |
| 6 #include "IconFrameTable.h" | |
| 7 #include "Mouse.h" | |
| 8 #include "PlayerFrameTable.h" | |
| 9 #include "TurnEngine.h" | |
| 10 #include "Viewport.h" | |
| 11 #include "Actor.h" | |
| 12 #include "GUIWindow.h" | |
| 189 | 13 #include "texts.h" |
| 0 | 14 |
| 15 #include "mm7_data.h" | |
|
828
0f56abdcce94
Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents:
783
diff
changeset
|
16 #include "MM7.h" |
| 1295 | 17 #include "Outdoor.h" |
| 18 #include "Indoor.h" | |
| 1297 | 19 #include "Texture.h" |
| 20 #include "LOD.h" | |
| 21 #include "Sprites.h" | |
| 22 #include "SpriteObject.h" | |
| 23 #include "ObjectList.h" | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
24 #include "Conditions.h" |
| 0 | 25 |
| 26 Party *pParty; // idb | |
| 27 | |
| 28 struct ActionQueue *pPartyActionQueue = new ActionQueue; | |
| 29 | |
| 30 | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
31 std::array<bool, 4> playerAlreadyPicked; // byte_AE3368_ |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
32 char PickedPlayer2_unused; // byte_AE3369_ |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
33 char PickedPlayer3_unused; // byte_AE336A_ |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
34 char PickedPlayer4_unused; // byte_AE336B_ |
| 0 | 35 |
| 1035 | 36 |
| 37 | |
| 38 //----- (0044A56A) -------------------------------------------------------- | |
| 39 void Party::CountHirelings() | |
| 40 { | |
| 41 field_70A = 0; | |
| 42 | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
43 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; ++i) |
| 1035 | 44 { |
| 1980 | 45 NPCData* npc = &pNPCStats->pNewNPCData[i]; |
| 1035 | 46 if (npc->Hired() && |
| 47 (!pHirelings[0].pName || strcmp(npc->pName, pHirelings[0].pName))) | |
| 48 { | |
| 49 if (!pHirelings[1].pName || strcmp(npc->pName, pHirelings[1].pName)) | |
| 50 ++field_70A; | |
| 51 } | |
| 52 } | |
| 53 } | |
| 54 | |
| 55 | |
| 783 | 56 // inlined |
| 57 //----- (mm6c::004858D0) -------------------------------------------------- | |
| 58 void Party::Zero() | |
| 59 { | |
| 60 uFlags2 = 0; | |
| 61 uNumGoldInBank = 0; | |
| 62 | |
| 2159 | 63 uCurrentYear = 0; |
| 64 uCurrentMonth = 0; | |
| 65 uCurrentMonthWeek = 0; | |
| 66 uDaysPlayed = 0; | |
| 67 uCurrentHour = 0; | |
| 68 uCurrentMinute = 0; | |
| 69 uCurrentTimeSecond = 0; | |
| 783 | 70 |
| 2159 | 71 field_6FC = 0; |
| 72 days_played_without_rest = 0; | |
| 73 vPosition.x = 0; | |
| 74 vPosition.y = 0; | |
| 75 vPosition.z = 0; | |
| 76 uFallStartY = 0; | |
| 77 sRotationY = 0; | |
| 78 sRotationX = 0; | |
| 79 uFallSpeed = 0; | |
| 80 field_28 = 0; | |
| 81 uDefaultPartyHeight = 192; | |
| 82 field_14_radius = 37; | |
| 83 y_rotation_granularity = 25; | |
| 84 y_rotation_speed = 90; | |
|
1425
16a24dc103e7
uninitialized Party::walk_sound_timer leads to crash
Nomad
parents:
1405
diff
changeset
|
85 |
| 2159 | 86 uWalkSpeed = 384; |
| 87 walk_sound_timer = 0; | |
| 88 | |
| 89 field_24 = 5; | |
| 90 field_6FC = 0; | |
| 91 field_708 = 15; | |
| 92 field_0 = 25; | |
|
1425
16a24dc103e7
uninitialized Party::walk_sound_timer leads to crash
Nomad
parents:
1405
diff
changeset
|
93 |
| 2159 | 94 uNumDeaths = 0; |
| 95 uNumPrisonTerms = 0; | |
| 96 uNumBountiesCollected = 0; | |
| 97 monster_for_hunting_killed.fill(0); | |
| 98 monster_id_for_hunting.fill(0); | |
| 99 memset(_quest_bits, 0, sizeof(_quest_bits)); | |
| 100 pArcomageWins.fill(0); | |
| 101 uNumArenaPageWins = 0; | |
| 102 uNumArenaSquireWins = 0; | |
| 103 uNumArenaKnightWins = 0; | |
| 104 uNumArenaLordWins = 0; | |
| 783 | 105 } |
| 106 | |
| 107 //inlined | |
| 108 //----- (mm6c::0045BE90) -------------------------------------------------- | |
| 109 void ActionQueue::Reset() | |
| 110 { | |
| 111 uNumActions = 0; | |
| 112 } | |
| 0 | 113 |
| 114 //----- (004760C1) -------------------------------------------------------- | |
| 115 void ActionQueue::Add(PartyAction action) | |
| 116 { | |
| 117 if (uNumActions < 30) | |
| 118 pActions[uNumActions++] = action; | |
| 119 } | |
| 120 | |
| 121 //----- (00497FC5) -------------------------------------------------------- | |
| 122 bool Party::_497FC5_check_party_perception_against_level() | |
| 123 { | |
| 124 int uMaxPerception; // edi@1 | |
| 125 signed int v5; // eax@3 | |
| 126 bool result; // eax@7 | |
| 127 | |
| 128 uMaxPerception = 0; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
129 for (int i = 0; i < 4; i++) |
| 0 | 130 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
131 if ( this->pPlayers[i].CanAct() ) |
| 0 | 132 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
133 v5 = this->pPlayers[i].GetPerception(); |
| 0 | 134 if ( v5 > uMaxPerception ) |
| 135 uMaxPerception = v5; | |
| 136 } | |
| 137 } | |
| 138 if ( uLevelMapStatsID && (signed int)uLevelMapStatsID < 77 ) | |
| 139 result = uMaxPerception >= 2 * pMapStats->pInfos[uLevelMapStatsID]._per; | |
| 140 else | |
| 141 result = 0; | |
| 142 return result; | |
| 143 } | |
| 144 | |
| 145 //----- (004936E1) -------------------------------------------------------- | |
| 146 void Party::SetHoldingItem(ItemGen *pItem) | |
| 147 { | |
| 148 sub_421B2C_PlaceInInventory_or_DropPickedItem(); | |
| 201 | 149 memcpy(&pPickedItem, pItem, sizeof(pPickedItem)); |
| 150 pMouse->SetCursorBitmapFromItemID(pPickedItem.uItemID); | |
| 0 | 151 } |
| 152 | |
| 153 //----- (0049370F) -------------------------------------------------------- | |
| 154 int Party::GetNextActiveCharacter() | |
| 155 { | |
| 156 int v2; // eax@4 | |
| 157 signed int v8; // esi@23 | |
| 158 int v12; // [sp+Ch] [bp-4h]@1 | |
| 159 | |
| 160 v12 = 0; | |
| 161 if ( pParty->bTurnBasedModeOn == 1 ) | |
| 162 { | |
| 2242 | 163 if ( pTurnEngine->turn_stage != TE_ATTACK || PID_TYPE(pTurnEngine->pQueue[0].uPackedID) != OBJECT_Player) |
| 0 | 164 return 0; |
| 848 | 165 v2 = PID_ID(pTurnEngine->pQueue[0].uPackedID); |
| 0 | 166 return v2 + 1; |
| 167 } | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
168 |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
169 if ( playerAlreadyPicked[0] && playerAlreadyPicked[1] && playerAlreadyPicked[2] && playerAlreadyPicked[3] ) |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
170 playerAlreadyPicked.fill(false); |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
171 for (int i = 0; i < 4; i++) |
| 0 | 172 { |
| 2062 | 173 if ( !this->pPlayers[i].CanAct() || this->pPlayers[i].uTimeToRecovery > 0) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
174 playerAlreadyPicked[i] = true; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
175 else if ( !playerAlreadyPicked[i] ) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
176 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
177 playerAlreadyPicked[i] = true; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
178 if (i > 0) //TODO check if this condition really should be here. it is equal to the original source but still seems kind of weird |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
179 return i + 1; |
| 0 | 180 break; |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
181 } |
| 89 | 182 } |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
183 |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
184 for (int i = 0; i < 4; i++) |
| 0 | 185 { |
| 2062 | 186 if ( this->pPlayers[i].CanAct() && this->pPlayers[i].uTimeToRecovery == 0 ) |
| 0 | 187 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
188 if ( v12 == 0 || this->pPlayers[i].uSpeedBonus > v8 ) |
| 0 | 189 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
190 v8 = this->pPlayers[i].uSpeedBonus; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
191 v12 = i + 1; |
| 0 | 192 } |
| 193 } | |
| 194 } | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
195 return v12; |
| 0 | 196 } |
| 197 | |
| 198 | |
| 199 //----- (00493244) -------------------------------------------------------- | |
| 200 bool Party::HasItem(unsigned int uItemID) | |
| 201 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
202 for (int player = 0; player < 4; player++) |
| 0 | 203 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
204 for (int itemPos = 0; itemPos < 138; itemPos++) |
| 0 | 205 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
206 if (pParty->pPlayers[player].pOwnItems[itemPos].uItemID == uItemID) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
207 return true; |
| 0 | 208 } |
| 209 } | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
210 return false; |
| 0 | 211 } |
| 212 | |
| 213 | |
| 214 //----- (00492AD5) -------------------------------------------------------- | |
| 593 | 215 void Party::SetFood(unsigned int uNumFood) |
| 0 | 216 { |
| 217 pUIAnim_Food->uAnimTime = 0; | |
| 218 pParty->uNumFoodRations = uNumFood; | |
| 592 | 219 pUIAnim_Food->uAnimLength = 8 * pIconsFrameTable->pIcons[pUIAnim_Food->uIconID].uAnimLength; |
| 0 | 220 } |
| 221 | |
| 222 //----- (00492B03) -------------------------------------------------------- | |
| 223 void Party::TakeFood(unsigned int uNumFood) | |
| 224 { | |
| 592 | 225 if (pParty->uNumFoodRations <= uNumFood) |
| 226 pParty->uNumFoodRations = 0; | |
| 0 | 227 else |
| 592 | 228 pParty->uNumFoodRations -= uNumFood; |
| 229 | |
| 0 | 230 pUIAnim_Food->uAnimTime = 0; |
| 592 | 231 pUIAnim_Food->uAnimLength = 8 * pIconsFrameTable->pIcons[pUIAnim_Food->uIconID].uAnimLength; |
| 0 | 232 } |
| 233 | |
| 234 //----- (00492B42) -------------------------------------------------------- | |
| 592 | 235 void Party::GiveFood(unsigned int _this) |
| 0 | 236 { |
| 237 pParty->uNumFoodRations += _this; | |
| 238 pUIAnim_Food->uAnimTime = 0; | |
| 592 | 239 pUIAnim_Food->uAnimLength = 8 * pIconsFrameTable->pIcons[pUIAnim_Food->uIconID].uAnimLength; |
| 0 | 240 } |
| 241 | |
| 242 //----- (00492B70) -------------------------------------------------------- | |
| 243 void Party::SetGold(unsigned int uNumGold) | |
| 244 { | |
| 245 pParty->uNumGold = uNumGold; | |
| 246 pUIAnim_Gold->uAnimTime = 0; | |
| 592 | 247 pUIAnim_Gold->uAnimLength = 8 * pIconsFrameTable->pIcons[pUIAnim_Gold->uIconID].uAnimLength; |
| 0 | 248 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); |
| 249 } | |
| 250 | |
| 251 //----- (00492BB6) -------------------------------------------------------- | |
| 252 void Party::TakeGold(unsigned int uNumGold) | |
| 253 { | |
| 254 if ( uNumGold <= pParty->uNumGold ) | |
| 255 pParty->uNumGold -= uNumGold; | |
| 256 else | |
| 257 pParty->uNumGold = 0; | |
| 258 pUIAnim_Gold->uAnimTime = 0; | |
| 592 | 259 pUIAnim_Gold->uAnimLength = 8 * pIconsFrameTable->pIcons[pUIAnim_Gold->uIconID].uAnimLength; |
| 0 | 260 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); |
| 261 } | |
| 262 | |
| 263 //----- (0049135E) -------------------------------------------------------- | |
| 264 unsigned int Party::GetPartyFame() | |
| 265 { | |
| 566 | 266 unsigned __int64 total_exp = 0; |
| 267 for (uint i = 0; i < 4; ++i) | |
| 268 total_exp += pPlayers[i].uExperience; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
269 return (unsigned int)(min(total_exp / 1000, UINT_MAX)); //min wasn't present, but could be incorrect without it |
| 0 | 270 } |
| 271 | |
| 272 //----- (0049137D) -------------------------------------------------------- | |
| 273 void Party::CreateDefaultParty(char bGiveItems) | |
| 274 { | |
| 275 Player *pCharacter; // esi@3 | |
| 276 int uSkillIdx; // eax@11 | |
| 277 unsigned int v16; // [sp-4h] [bp-44h]@26 | |
| 278 signed int uNumPlayers; // [sp+18h] [bp-28h]@1 | |
| 279 ItemGen Dst; // [sp+1Ch] [bp-24h]@10 | |
| 280 | |
| 130 | 281 pHireling1Name[0] = 0; |
| 282 pHireling2Name[0] = 0; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
283 this->hirelingScrollPosition = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
284 memset(&pHirelings, 0, sizeof(pHirelings)); |
| 130 | 285 |
| 0 | 286 strcpy(this->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); //Zoltan |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
287 this->pPlayers[0].uPrevFace = 17; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
288 this->pPlayers[0].uCurrentFace = 17; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
289 this->pPlayers[0].uPrevVoiceID = 17; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
290 this->pPlayers[0].uVoiceID = 17; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
291 this->pPlayers[0].uMight = 30; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
292 this->pPlayers[0].uIntelligence = 5; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
293 this->pPlayers[0].uWillpower = 5; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
294 this->pPlayers[0].uEndurance = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
295 this->pPlayers[0].uAccuracy = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
296 this->pPlayers[0].uSpeed = 14; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
297 this->pPlayers[0].uLuck = 7; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
298 this->pPlayers[0].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
299 this->pPlayers[0].pActiveSkills[PLAYER_SKILL_ARMSMASTER] = 1; // armsmaster |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
300 this->pPlayers[0].pActiveSkills[PLAYER_SKILL_BOW] = 1; // bow |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
301 this->pPlayers[0].pActiveSkills[PLAYER_SKILL_SWORD] = 1; // sword |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
302 this->pPlayers[1].uPrevFace = 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
303 this->pPlayers[1].uCurrentFace = 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
304 this->pPlayers[1].uPrevVoiceID = 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
305 this->pPlayers[1].uVoiceID = 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
306 strcpy(this->pPlayers[1].pName, pGlobalTXT_LocalizationStrings[506]); //Roderic |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
307 this->pPlayers[1].uMight = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
308 this->pPlayers[1].uIntelligence = 9; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
309 this->pPlayers[1].uWillpower = 9; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
310 this->pPlayers[1].uEndurance = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
311 this->pPlayers[1].uAccuracy = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
312 this->pPlayers[1].uSpeed = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
313 this->pPlayers[1].uLuck = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
314 this->pPlayers[1].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
315 this->pPlayers[1].pActiveSkills[PLAYER_SKILL_STEALING] = 1; // stealing |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
316 this->pPlayers[1].pActiveSkills[PLAYER_SKILL_DAGGER] = 1; // dagger |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
317 this->pPlayers[1].pActiveSkills[PLAYER_SKILL_TRAP_DISARM] = 1; // disarm trap |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
318 this->pPlayers[2].uPrevFace = 14; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
319 this->pPlayers[2].uCurrentFace = 14; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
320 this->pPlayers[2].uPrevVoiceID = 14; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
321 this->pPlayers[2].uVoiceID = 14; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
322 strcpy(this->pPlayers[2].pName, pGlobalTXT_LocalizationStrings[508]); // Serena |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
323 this->pPlayers[2].uMight = 12; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
324 this->pPlayers[2].uIntelligence = 9; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
325 this->pPlayers[2].uWillpower = 20; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
326 this->pPlayers[2].uEndurance = 22; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
327 this->pPlayers[2].uAccuracy = 7; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
328 this->pPlayers[2].uSpeed = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
329 this->pPlayers[2].uLuck = 7; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
330 this->pPlayers[2].pActiveSkills[PLAYER_SKILL_ALCHEMY] = 1; // alchemy |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
331 this->pPlayers[2].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
332 this->pPlayers[2].pActiveSkills[PLAYER_SKILL_BODY] = 1; // body |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
333 this->pPlayers[2].pActiveSkills[PLAYER_SKILL_MACE] = 1; // mace |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
334 strcpy(this->pPlayers[3].pName, pGlobalTXT_LocalizationStrings[507]); // Alexis |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
335 this->pPlayers[3].uPrevFace = 10; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
336 this->pPlayers[3].uCurrentFace = 10; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
337 this->pPlayers[3].uEndurance = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
338 this->pPlayers[3].uAccuracy = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
339 this->pPlayers[3].uSpeed = 13; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
340 this->pPlayers[3].uPrevVoiceID = 10; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
341 this->pPlayers[3].uVoiceID = 10; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
342 this->pPlayers[3].uMight = 5; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
343 this->pPlayers[3].uIntelligence = 30; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
344 this->pPlayers[3].uWillpower = 9; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
345 this->pPlayers[3].uLuck = 7; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
346 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
347 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_AIR] = 1; // air |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
348 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_FIRE] = 1; // fire |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
349 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_STAFF] = 1; // staff |
| 0 | 350 for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++) |
| 351 { | |
| 135 | 352 pCharacter = &pParty->pPlayers[uNumPlayers]; |
| 353 if (pCharacter->classType == PLAYER_CLASS_KNIGHT) | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
354 pCharacter->sResMagicBase = 10; //player[i].pResMagicBase |
| 321 | 355 pCharacter->lastOpenedSpellbookPage = 0; |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
356 for (int i = 0; i < 9; i++)//for Magic Book |
| 0 | 357 { |
| 358 if (pPlayers[uNumPlayers].pActiveSkills[12+i]) | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
359 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
360 pCharacter->lastOpenedSpellbookPage = i; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
361 break; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
362 } |
| 0 | 363 } |
| 364 pCharacter->uExpressionTimePassed = 0; | |
| 365 Dst.Reset(); | |
| 366 if ( bGiveItems ) | |
| 367 { | |
| 439 | 368 pItemsTable->GenerateItem(2, 40, &Dst); //ring |
| 0 | 369 pCharacter->AddItem2(-1, &Dst); |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
370 for (uSkillIdx = 0; uSkillIdx < 36; uSkillIdx++) |
| 0 | 371 { |
| 372 if ( pCharacter->pActiveSkills[uSkillIdx] ) | |
| 373 { | |
| 374 switch ( uSkillIdx ) | |
| 375 { | |
| 376 case PLAYER_SKILL_STAFF: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
377 pCharacter->WearItem(ITEM_STAFF_1); |
| 0 | 378 break; |
| 379 case PLAYER_SKILL_SWORD: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
380 pCharacter->WearItem(ITEM_LONGSWORD_1); |
| 0 | 381 break; |
| 382 case PLAYER_SKILL_DAGGER: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
383 pCharacter->WearItem(ITEM_DAGGER_1); |
| 0 | 384 break; |
| 385 case PLAYER_SKILL_AXE: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
386 pCharacter->WearItem(ITEM_AXE_1); |
| 0 | 387 break; |
| 388 case PLAYER_SKILL_SPEAR: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
389 pCharacter->WearItem(ITEM_SPEAR_1); |
| 0 | 390 break; |
| 391 case PLAYER_SKILL_BOW: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
392 pCharacter->WearItem(ITEM_CROSSBOW_1); |
| 0 | 393 break; |
| 394 case PLAYER_SKILL_MACE: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
395 pCharacter->WearItem(ITEM_MACE_1); |
| 0 | 396 break; |
| 397 case PLAYER_SKILL_SHIELD: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
398 pCharacter->WearItem(ITEM_BUCKLER_1); |
| 0 | 399 break; |
| 400 case PLAYER_SKILL_LEATHER: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
401 pCharacter->WearItem(ITEM_LEATHER_1); |
| 0 | 402 break; |
| 403 case PLAYER_SKILL_CHAIN: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
404 pCharacter->WearItem(ITEM_CHAINMAIL_1); |
| 0 | 405 break; |
| 406 case PLAYER_SKILL_PLATE: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
407 pCharacter->WearItem(ITEM_PLATE_1); |
| 0 | 408 break; |
| 409 case PLAYER_SKILL_FIRE: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
410 pCharacter->AddItem(-1, ITEM_SPELLBOOK_FIRE_STRIKE); |
| 0 | 411 break; |
| 412 case PLAYER_SKILL_AIR: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
413 pCharacter->AddItem(-1, ITEM_SPELLBOOK_AIR_FEATHER_FALL); |
| 0 | 414 break; |
| 415 case PLAYER_SKILL_WATER: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
416 pCharacter->AddItem(-1, ITEM_SPELLBOOK_WATER_POISON_SPRAY); |
| 0 | 417 break; |
| 418 case PLAYER_SKILL_EARTH: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
419 pCharacter->AddItem(-1, ITEM_SPELLBOOK_EARTH_SLOW); |
| 0 | 420 break; |
| 421 case PLAYER_SKILL_SPIRIT: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
422 pCharacter->AddItem(-1, ITEM_SPELLBOOK_SPIRIT_BLESS); |
| 0 | 423 break; |
| 424 case PLAYER_SKILL_MIND: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
425 pCharacter->AddItem(-1, ITEM_SPELLBOOK_MIND_MIND_BLAST); |
| 0 | 426 break; |
| 427 case PLAYER_SKILL_BODY: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
428 pCharacter->AddItem(-1, ITEM_SPELLBOOK_BODY_FIRST_AID); |
| 0 | 429 break; |
| 430 case PLAYER_SKILL_ITEM_ID: | |
| 431 case PLAYER_SKILL_REPAIR: | |
| 432 case PLAYER_SKILL_MEDITATION: | |
| 433 case PLAYER_SKILL_PERCEPTION: | |
| 434 case PLAYER_SKILL_DIPLOMACY: | |
| 435 case PLAYER_SKILL_TRAP_DISARM: | |
| 436 case PLAYER_SKILL_LEARNING: | |
| 437 pCharacter->AddItem(-1, ITEM_POTION_BOTTLE); | |
| 438 v16 = 5 * (rand() % 3 + 40); // simple reagent | |
| 439 pCharacter->AddItem(-1, v16); | |
| 440 break; | |
| 441 case PLAYER_SKILL_DODGE: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
442 pCharacter->AddItem(-1, ITEM_BOOTS_1); |
| 0 | 443 break; |
| 444 case PLAYER_SKILL_UNARMED: | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
445 pCharacter->AddItem(-1, ITEM_GAUNTLETS_1); |
| 0 | 446 break; |
| 447 default: | |
| 448 break; | |
| 449 } | |
| 450 } | |
| 451 } | |
| 1071 | 452 for (int i = 0; i < 138; i++) |
| 0 | 453 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
454 if ( pCharacter->pInventoryItemList[i].uItemID != 0) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
455 pCharacter->pInventoryItemList[i].SetIdentified(); |
| 0 | 456 } |
| 457 } | |
| 458 pCharacter->sHealth = pCharacter->GetMaxHealth(); | |
| 459 pCharacter->sMana = pCharacter->GetMaxMana(); | |
| 460 } | |
| 461 } | |
| 462 | |
| 463 //----- (004917CE) -------------------------------------------------------- | |
| 464 int Party::Reset() | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
465 { |
| 783 | 466 Zero(); |
| 0 | 467 |
| 468 field_708 = 15; | |
| 469 sEyelevel = 160; | |
| 470 uNumGold = 200; | |
| 471 uNumFoodRations = 7; | |
| 472 | |
| 783 | 473 |
| 373 | 474 alignment = PartyAlignment_Neutral; |
| 475 SetUserInterface(alignment, true); | |
| 0 | 476 |
| 477 uTimePlayed = 0x21C00u; | |
| 478 uLastRegenerationTime = 0x21C00; | |
| 479 | |
| 480 bTurnBasedModeOn = false; | |
| 481 | |
| 482 uActiveCharacter = 1; | |
|
1861
a86c60679949
changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents:
1840
diff
changeset
|
483 ::pPlayers.ZerothIndex() = &pPlayers[0]; |
| 0 | 484 for (uint i = 0; i < 4; ++i) |
| 485 ::pPlayers[i + 1] = &pPlayers[i]; | |
| 486 | |
| 135 | 487 pPlayers[0].Reset(PLAYER_CLASS_KNIGHT); |
| 488 pPlayers[1].Reset(PLAYER_CLASS_THEIF); | |
| 489 pPlayers[2].Reset(PLAYER_CLASS_CLERIC); | |
| 490 pPlayers[3].Reset(PLAYER_CLASS_SORCERER); | |
| 1014 | 491 pPlayers[0].uCurrentFace = 17; |
| 492 pPlayers[0].uPrevVoiceID = 17; | |
| 0 | 493 pPlayers[0].uVoiceID = 17; |
| 494 pPlayers[0].SetInitialStats(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
495 |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
496 pPlayers[0].uSex = pPlayers[0].GetSexByVoice(); |
| 0 | 497 pPlayers[0].RandomizeName(); |
| 498 strcpy(pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); | |
| 499 | |
| 500 | |
| 1014 | 501 pPlayers[1].uCurrentFace = 3; |
| 502 pPlayers[1].uPrevVoiceID = 3; | |
| 0 | 503 pPlayers[1].uVoiceID = 3; |
| 504 pPlayers[1].SetInitialStats(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
505 pPlayers[1].uSex = pPlayers[1].GetSexByVoice(); |
| 0 | 506 pPlayers[1].RandomizeName(); |
| 507 strcpy(pPlayers[1].pName, pGlobalTXT_LocalizationStrings[506]); | |
| 1014 | 508 pPlayers[2].uCurrentFace = 14; |
| 509 pPlayers[2].uPrevVoiceID = 14; | |
| 0 | 510 pPlayers[2].uVoiceID = 14; |
| 511 pPlayers[2].SetInitialStats(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
512 pPlayers[2].uSex = pPlayers[3].GetSexByVoice(); |
| 0 | 513 pPlayers[2].RandomizeName(); |
| 514 strcpy(pPlayers[2].pName, pGlobalTXT_LocalizationStrings[508]); | |
| 1014 | 515 pPlayers[3].uCurrentFace = 10; |
| 516 pPlayers[3].uPrevVoiceID = 10; | |
| 0 | 517 pPlayers[3].uVoiceID = 10; |
| 518 pPlayers[3].SetInitialStats(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
519 pPlayers[3].uSex = pPlayers[3].GetSexByVoice(); |
| 0 | 520 pPlayers[3].RandomizeName(); |
| 521 strcpy(pPlayers[3].pName, pGlobalTXT_LocalizationStrings[507]); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
522 |
| 0 | 523 for (uint i = 0; i < 4; ++i) |
| 524 { | |
| 525 pPlayers[i].uTimeToRecovery = 0; | |
| 526 for (uint j = 0; j < 20; ++j) | |
| 527 pPlayers[i].pConditions[j] = 0; | |
| 528 | |
| 529 for (uint j = 0; j < 24; ++j) | |
| 530 pPlayers[i].pPlayerBuffs[j].Reset(); | |
| 531 | |
| 130 | 532 pPlayers[i].expression = CHARACTER_EXPRESSION_1; |
| 0 | 533 pPlayers[i].uExpressionTimePassed = 0; |
| 534 pPlayers[i].uExpressionTimeLength = rand() % 256 + 128; | |
| 535 } | |
| 536 | |
| 537 for (uint i = 1; i < 20; ++i) | |
| 538 pPartyBuffs[i].Reset(); | |
| 539 | |
| 540 | |
| 1035 | 541 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; // default character ui - stats |
| 0 | 542 uFlags = 0; |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
543 memset(_autonote_bits, 0, sizeof(_autonote_bits)); |
| 2196 | 544 memset(_quest_bits, 0, sizeof(_quest_bits)); |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
545 pIsArtifactFound.fill(0); |
| 1035 | 546 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_RED_POTION_ACTIVE, 1); |
| 547 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_SEASHELL_ACTIVE, 1); | |
| 548 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LONGBOW_ACTIVE, 1); | |
| 549 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_PLATE_ACTIVE, 1); | |
| 550 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LUTE_ACTIVE, 1); | |
| 551 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_HAT_ACTIVE, 1); | |
| 0 | 552 |
|
1868
351b4ff10ac1
changed some memsets to fills in player.cpp, party.cpp and changing to sizeof(varName)
Grumpy7
parents:
1861
diff
changeset
|
553 PartyTimes._shop_ban_times.fill(0); |
| 0 | 554 |
| 555 memcpy(pNPCStats->pNewNPCData, pNPCStats->pNPCData, 0x94BCu); | |
| 556 memcpy(pNPCStats->pGroups_copy, pNPCStats->pGroups, 0x66u); | |
| 655 | 557 pNPCStats->pNewNPCData[3].uFlags |= 128;//|= 0x80u; Lady Margaret |
| 0 | 558 _494035_timed_effects__water_walking_damage__etc(); |
| 559 pEventTimer->Pause(); | |
| 560 return 0; | |
| 561 } | |
| 562 | |
| 563 | |
| 564 //----- (0043AD34) -------------------------------------------------------- | |
| 565 void Party::Yell() | |
| 566 { | |
| 90 | 567 Actor *v0; // esi@5 |
| 0 | 568 int v1; // edi@9 |
| 569 int v2; // ebx@9 | |
| 570 int v3; // eax@9 | |
| 571 | |
| 1167 | 572 if ( (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime > 0 ) |
| 573 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset(); | |
| 0 | 574 if ( pParty->bTurnBasedModeOn != 1 ) |
| 575 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
576 for (unsigned int i = 0; i < uNumActors; i++) |
| 0 | 577 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
578 v0 = &pActors[i]; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
579 if ( v0->Actor::CanAct() && v0->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long && v0->pMonsterInfo.uMovementType != 5 ) |
| 0 | 580 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
581 v1 = abs(v0->vPosition.x - pParty->vPosition.x); |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
582 v2 = abs(v0->vPosition.y - pParty->vPosition.y); |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
583 v3 = abs(v0->vPosition.z - pParty->vPosition.z); |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
584 if (int_get_vector_length(v1, v2, v3) < 512) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
585 Actor::AI_Flee(i, 4, 0, 0); |
| 0 | 586 } |
| 587 } | |
| 588 } | |
| 589 } | |
| 590 | |
| 591 //----- (00491BF9) -------------------------------------------------------- | |
| 592 void Party::ResetPosMiscAndSpellBuffs() | |
| 593 { | |
| 594 this->vPosition.y = 0; | |
| 595 this->vPosition.z = 0; | |
| 596 this->vPosition.x = 0; | |
| 597 this->uFallStartY = 0; | |
| 598 this->sRotationY = 0; | |
| 599 this->sRotationX = 0; | |
| 600 this->uFallSpeed = 0; | |
| 601 this->field_28 = 0; | |
| 602 this->uDefaultPartyHeight = 120; | |
| 1546 | 603 this->field_14_radius = 37; |
| 120 | 604 this->y_rotation_granularity = 25; |
| 0 | 605 this->uWalkSpeed = 384; |
| 122 | 606 this->y_rotation_speed = 90; |
| 0 | 607 this->field_24 = 5; |
| 608 this->field_6FC = 0; | |
| 609 this->field_708 = 15; | |
| 610 this->field_0 = 25; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
611 |
| 1980 | 612 for (int playerId = 0; playerId < 4; playerId++) |
| 0 | 613 { |
| 1980 | 614 for (int buffId = 0; buffId < 24; buffId++) |
| 0 | 615 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
616 this->pPlayers[playerId].pPlayerBuffs[buffId].Reset(); |
| 0 | 617 } |
| 618 } | |
| 1980 | 619 for (int buffId = 0; buffId < 20; buffId++) |
| 0 | 620 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
621 this->pPartyBuffs[buffId].Reset(); |
| 0 | 622 } |
| 623 } | |
| 624 | |
| 625 //----- (004909F4) -------------------------------------------------------- | |
| 130 | 626 void Party::UpdatePlayersAndHirelingsEmotions() |
| 0 | 627 { |
| 628 int v4; // edx@27 | |
| 130 | 629 |
| 630 for (int i = 0; i < 4; ++i) | |
| 0 | 631 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
632 Player* player = &pPlayers[i]; |
| 130 | 633 player->uExpressionTimePassed += (unsigned short)pMiscTimer->uTimeElapsed; |
| 634 | |
| 1980 | 635 uint condition = player->GetMajorConditionIdx(); |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
636 if (condition == Condition_Good || condition == Condition_Zombie) |
| 0 | 637 { |
| 130 | 638 if (player->uExpressionTimePassed < player->uExpressionTimeLength) |
| 639 continue; | |
| 640 | |
| 641 player->uExpressionTimePassed = 0; | |
| 642 if (player->expression != 1 || rand() % 5) | |
| 0 | 643 { |
| 130 | 644 player->expression = CHARACTER_EXPRESSION_1; |
| 645 player->uExpressionTimeLength = rand() % 256 + 32; | |
| 0 | 646 } |
| 647 else | |
| 648 { | |
| 130 | 649 v4 = rand() % 100; |
| 650 if (v4 < 25) player->expression = CHARACTER_EXPRESSION_13; | |
| 651 else if (v4 < 31) player->expression = CHARACTER_EXPRESSION_14; | |
| 652 else if (v4 < 37) player->expression = CHARACTER_EXPRESSION_15; | |
| 653 else if (v4 < 43) player->expression = CHARACTER_EXPRESSION_16; | |
| 654 else if (v4 < 46) player->expression = CHARACTER_EXPRESSION_17; | |
| 655 else if (v4 < 52) player->expression = CHARACTER_EXPRESSION_18; | |
| 656 else if (v4 < 58) player->expression = CHARACTER_EXPRESSION_19; | |
| 657 else if (v4 < 64) player->expression = CHARACTER_EXPRESSION_20; | |
| 658 else if (v4 < 70) player->expression = CHARACTER_EXPRESSION_54; | |
| 659 else if (v4 < 76) player->expression = CHARACTER_EXPRESSION_55; | |
| 660 else if (v4 < 82) player->expression = CHARACTER_EXPRESSION_56; | |
| 661 else if (v4 < 88) player->expression = CHARACTER_EXPRESSION_57; | |
| 662 else if (v4 < 94) player->expression = CHARACTER_EXPRESSION_29; | |
| 663 else player->expression = CHARACTER_EXPRESSION_30; | |
| 664 } | |
| 665 | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
666 for (unsigned int j = 0; j < pPlayerFrameTable->uNumFrames; ++j) |
| 130 | 667 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
668 PlayerFrame* frame = &pPlayerFrameTable->pFrames[j]; |
| 130 | 669 if (frame->expression == player->expression) |
| 0 | 670 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
671 player->uExpressionTimeLength = 8 * frame->uAnimLength; |
| 130 | 672 break; |
| 0 | 673 } |
| 674 } | |
| 675 } | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
676 else if (player->expression != CHARACTER_EXPRESSION_DMGRECVD_MINOR && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
677 player->expression != CHARACTER_EXPRESSION_DMGRECVD_MODERATE && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
678 player->expression != CHARACTER_EXPRESSION_DMGRECVD_MAJOR || |
| 130 | 679 player->uExpressionTimePassed >= player->uExpressionTimeLength) |
| 0 | 680 { |
| 130 | 681 player->uExpressionTimeLength = 0; |
| 682 player->uExpressionTimePassed = 0; | |
| 683 | |
| 684 switch (condition) | |
| 0 | 685 { |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
686 case Condition_Dead: player->expression = CHARACTER_EXPRESSION_DEAD; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
687 case Condition_Pertified: player->expression = CHARACTER_EXPRESSION_PERTIFIED; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
688 case Condition_Eradicated: player->expression = CHARACTER_EXPRESSION_ERADICATED; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
689 case Condition_Cursed: player->expression = CHARACTER_EXPRESSION_CURSED; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
690 case Condition_Weak: player->expression = CHARACTER_EXPRESSION_WEAK; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
691 case Condition_Sleep: player->expression = CHARACTER_EXPRESSION_SLEEP; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
692 case Condition_Fear: player->expression = CHARACTER_EXPRESSION_FEAR; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
693 case Condition_Drunk: player->expression = CHARACTER_EXPRESSION_DRUNK; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
694 case Condition_Insane: player->expression = CHARACTER_EXPRESSION_INSANE; break; |
| 2187 | 695 case Condition_Poison_Weak: |
| 696 case Condition_Poison_Medium: | |
| 697 case Condition_Poison_Severe: player->expression = CHARACTER_EXPRESSION_POISONED; break; | |
| 698 case Condition_Disease_Weak: | |
| 699 case Condition_Disease_Medium: | |
| 700 case Condition_Disease_Severe: player->expression = CHARACTER_EXPRESSION_DISEASED; break; | |
|
1361
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
701 case Condition_Paralyzed: player->expression = CHARACTER_EXPRESSION_PARALYZED; break; |
|
b3ac17fd12de
Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents:
1359
diff
changeset
|
702 case Condition_Unconcious: player->expression = CHARACTER_EXPRESSION_UNCONCIOUS; break; |
| 130 | 703 default: |
| 1545 | 704 Error("Invalid condition: %u", condition); |
| 0 | 705 } |
| 706 } | |
| 130 | 707 } |
| 708 | |
| 709 for (int i = 0; i < 2; ++i) | |
| 710 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
711 NPCData* hireling = &pParty->pHirelings[i]; |
| 291 | 712 if (!hireling->evt_C) |
| 130 | 713 continue; |
| 714 | |
| 291 | 715 hireling->evt_B += pMiscTimer->uTimeElapsed; |
| 716 if (hireling->evt_B >= hireling->evt_C) | |
| 130 | 717 { |
| 291 | 718 hireling->evt_A = 0; |
| 719 hireling->evt_B = 0; | |
| 720 hireling->evt_C = 0; | |
| 130 | 721 |
| 1545 | 722 Assert(sizeof(NPCData) == 0x4C); |
| 130 | 723 memset(hireling, 0, sizeof(*hireling)); |
| 724 | |
|
1793
4dee76d79c78
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents:
1747
diff
changeset
|
725 pParty->hirelingScrollPosition = 0; |
| 1035 | 726 pParty->CountHirelings(); |
| 727 viewparams->bRedrawGameUI = true; | |
| 130 | 728 } |
| 0 | 729 } |
| 730 } | |
| 731 | |
| 732 //----- (00490D02) -------------------------------------------------------- | |
| 733 void Party::RestAndHeal() | |
| 734 { | |
| 910 | 735 Player *pPlayer; // esi@4 |
| 736 bool have_vessels_soul; // [sp+10h] [bp-8h]@10 | |
| 0 | 737 |
| 910 | 738 for ( uint i = 0; i < 20; ++i ) |
| 739 pParty->pPartyBuffs[i].Reset(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
740 |
| 910 | 741 for ( int pPlayerID = 0; pPlayerID < 4; ++pPlayerID ) |
| 742 { | |
| 743 pPlayer = &pParty->pPlayers[pPlayerID]; | |
| 744 for ( uint i = 0; i < 20; ++i ) | |
| 745 pPlayer->pPlayerBuffs[i].Reset(); | |
| 746 | |
| 747 pPlayer->Zero(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
748 if ( pPlayer->pConditions[Condition_Dead] || pPlayer->pConditions[Condition_Pertified] || pPlayer->pConditions[Condition_Eradicated] )//Dead/Petrified/Eradicated |
| 910 | 749 continue; |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
750 pPlayer->pConditions[Condition_Unconcious] = 0;//Unconcious |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
751 pPlayer->pConditions[Condition_Drunk] = 0;//Drunk |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
752 pPlayer->pConditions[Condition_Fear] = 0;//Fear |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
753 pPlayer->pConditions[Condition_Sleep] = 0;//Sleep |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
754 pPlayer->pConditions[Condition_Weak] = 0;//Weak |
| 910 | 755 pPlayer->uTimeToRecovery = 0; |
| 756 pPlayer->sHealth = pPlayer->GetMaxHealth(); | |
| 757 pPlayer->sMana = pPlayer->GetMaxMana(); | |
| 758 if ( pPlayer->classType == PLAYER_CLASS_LICH ) | |
| 0 | 759 { |
| 910 | 760 have_vessels_soul = false; |
| 2189 | 761 for ( uint i = 0; i < 126; i++ ) |
| 0 | 762 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
763 if ( pPlayer->pInventoryItemList[i].uItemID == ITEM_LICH_JAR_FULL && pPlayer->pInventoryItemList[i].uHolderPlayer == pPlayerID + 1 ) |
| 910 | 764 have_vessels_soul = true; |
| 0 | 765 } |
| 910 | 766 if ( !have_vessels_soul ) |
| 0 | 767 { |
| 910 | 768 pPlayer->sHealth = pPlayer->GetMaxHealth() / 2; |
| 769 pPlayer->sMana = pPlayer->GetMaxMana() / 2; | |
| 0 | 770 } |
| 771 } | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
772 |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
773 if (pPlayer->pConditions[Condition_Zombie]) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
774 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
775 pPlayer->sMana = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
776 pPlayer->sHealth /= 2; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
777 } |
| 2187 | 778 else if ( pPlayer->pConditions[Condition_Poison_Severe] || pPlayer->pConditions[Condition_Disease_Severe] ) |
| 0 | 779 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
780 pPlayer->sHealth /= 4; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
781 pPlayer->sMana /= 4; |
| 0 | 782 } |
| 2187 | 783 else if ( pPlayer->pConditions[Condition_Poison_Medium] || pPlayer->pConditions[Condition_Disease_Medium] ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
784 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
785 pPlayer->sHealth /= 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
786 pPlayer->sMana /= 3; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
787 } |
| 2187 | 788 else if ( pPlayer->pConditions[Condition_Poison_Weak] || pPlayer->pConditions[Condition_Disease_Weak] ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
789 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
790 pPlayer->sHealth /= 2; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
791 pPlayer->sMana /= 2; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
792 } |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
793 if ( pPlayer->pConditions[Condition_Insane] ) |
| 910 | 794 pPlayer->sMana = 0; |
| 130 | 795 UpdatePlayersAndHirelingsEmotions(); |
| 0 | 796 } |
| 766 | 797 pParty->days_played_without_rest = 0; |
| 1295 | 798 } |
|
1359
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
799 |
| 1295 | 800 //----- (004938D1) -------------------------------------------------------- |
| 801 void __fastcall Rest(unsigned int uHoursToSleep) | |
| 802 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
803 signed __int64 v2; // st7@3 |
| 1295 | 804 |
| 805 if ( uHoursToSleep > 240 ) | |
| 806 InitializeActors(); | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
807 v2 = (signed __int64)((7680 * uHoursToSleep) * 0.033333335); |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
808 pParty->uTimePlayed += v2; |
| 2063 | 809 for (int i = 1; i <= 4; i++) |
| 1295 | 810 { |
| 2063 | 811 pPlayers[i]->Recover((int)v2); |
| 1295 | 812 } |
| 813 _494035_timed_effects__water_walking_damage__etc(); | |
| 814 } | |
| 815 //----- (004B1BDB) -------------------------------------------------------- | |
| 1459 | 816 void RestAndHeal(__int64 uNumMinutes) |
| 1295 | 817 { |
| 818 signed __int64 v1; // ST2C_8@1 | |
| 819 signed __int64 v2; // qax@1 | |
| 820 unsigned __int64 v4; // qax@1 | |
| 821 unsigned int v5; // ebx@1 | |
| 822 | |
| 823 pParty->pHirelings[0].bHasUsedTheAbility = 0; | |
| 824 pParty->pHirelings[1].bHasUsedTheAbility = 0; | |
| 825 pParty->uTimePlayed += (signed __int64)((double)(7680 * uNumMinutes) * 0.033333335); | |
| 826 v1 = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375); | |
| 827 v2 = v1 / 60 / 60; | |
| 828 v4 = (unsigned int)v2 / 0x18; | |
| 829 v5 = (unsigned int)(v4 / 7) >> 2; | |
| 830 pParty->uCurrentTimeSecond = v1 % 60; | |
| 831 pParty->uCurrentMinute = v1 / 60 % 60; | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
832 pParty->uCurrentHour = v2 % 24; |
| 1295 | 833 pParty->uCurrentMonthWeek = v4 / 7 & 3; |
| 834 pParty->uDaysPlayed = (unsigned int)v4 % 0x1C; | |
| 835 pParty->uCurrentMonth = v5 % 0xC; | |
| 836 pParty->uCurrentYear = v5 / 0xC + game_starting_year; | |
| 837 pParty->RestAndHeal(); | |
| 2154 | 838 |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
839 for (int i = 0; i < 4; i++) |
| 1295 | 840 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
841 pParty->pPlayers[i].uTimeToRecovery = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
842 pParty->pPlayers[i].uNumDivineInterventionCastsThisDay = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
843 pParty->pPlayers[i].uNumArmageddonCasts = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
844 pParty->pPlayers[i].uNumFireSpikeCasts = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
845 pParty->pPlayers[i].field_1B3B = 0; |
| 1295 | 846 } |
| 847 pParty->UpdatePlayersAndHirelingsEmotions(); | |
| 848 } | |
| 1297 | 849 //----- (0041F5BE) -------------------------------------------------------- |
| 1458 | 850 void Sleep6Hours() |
| 1297 | 851 { |
| 1396 | 852 if ( _506F18_num_minutes_to_sleep < 6 ) |
| 1297 | 853 { |
| 1396 | 854 if ( _506F18_num_minutes_to_sleep ) |
| 1297 | 855 { |
| 1396 | 856 Rest(_506F18_num_minutes_to_sleep); |
| 857 _506F18_num_minutes_to_sleep = 0; | |
| 1297 | 858 LoadActualSkyFrame(); |
| 859 } | |
| 1522 | 860 if ( dword_506F14 == 2 ) |
| 861 { | |
| 1521 | 862 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); |
| 863 } | |
| 1297 | 864 } |
| 865 else | |
| 866 { | |
| 867 Rest(6u); | |
| 1396 | 868 _506F18_num_minutes_to_sleep -= 6; |
| 1297 | 869 LoadActualSkyFrame(); |
| 870 } | |
| 871 viewparams->bRedrawGameUI = 1; | |
| 872 } | |
| 873 | |
| 1295 | 874 //----- (0047752B) -------------------------------------------------------- |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
875 int Party::GetPartyReputation() |
| 1295 | 876 { |
| 877 DDM_DLV_Header *v0; // ebx@1 | |
| 878 signed int v1; // esi@3 | |
| 879 | |
| 880 v0 = &pOutdoor->ddm; | |
| 881 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) | |
| 882 v0 = &pIndoor->dlv; | |
| 883 v1 = 0; | |
| 884 if ( CheckHiredNPCSpeciality(Pirate) ) | |
| 885 v1 += 5; | |
| 886 if ( CheckHiredNPCSpeciality(Burglar) ) | |
| 887 v1 += 5; | |
| 888 if ( CheckHiredNPCSpeciality(Gypsy) ) | |
| 889 v1 += 5; | |
| 890 if ( CheckHiredNPCSpeciality(Duper) ) | |
| 891 v1 += 5; | |
| 892 if ( CheckHiredNPCSpeciality(FallenWizard) ) | |
| 893 v1 += 5; | |
| 894 return v1 + v0->uReputation; | |
| 1296 | 895 } |
| 896 //----- (004269A2) -------------------------------------------------------- | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
897 void Party::GivePartyExp(unsigned int pEXPNum) |
| 1296 | 898 { |
| 899 signed int pActivePlayerCount; // ecx@1 | |
| 900 int pLearningPercent; // eax@13 | |
| 901 | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
902 if ( pEXPNum > 0) |
| 1296 | 903 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
904 pActivePlayerCount = 0; |
| 1296 | 905 for ( uint i = 0; i < 4; ++i ) |
| 906 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
907 if ( !pParty->pPlayers[i].pConditions[Condition_Unconcious] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
908 !pParty->pPlayers[i].pConditions[Condition_Dead] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
909 !pParty->pPlayers[i].pConditions[Condition_Pertified] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
910 !pParty->pPlayers[i].pConditions[Condition_Eradicated] ) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
911 pActivePlayerCount ++; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
912 } |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
913 if ( pActivePlayerCount ) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
914 { |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
915 pEXPNum = pEXPNum / pActivePlayerCount; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
916 for ( uint i = 0; i < 4; ++i ) |
| 1296 | 917 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
918 if ( !pParty->pPlayers[i].pConditions[Condition_Unconcious] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
919 !pParty->pPlayers[i].pConditions[Condition_Dead] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
920 !pParty->pPlayers[i].pConditions[Condition_Pertified] && |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
921 !pParty->pPlayers[i].pConditions[Condition_Eradicated] ) |
| 1296 | 922 { |
| 923 pLearningPercent = pParty->pPlayers[i].GetLearningPercent(); | |
| 924 pEXPNum = pEXPNum + pEXPNum * pLearningPercent / 100; | |
| 925 pParty->pPlayers[i].uExperience += pEXPNum; | |
| 926 if ( pParty->pPlayers[i].uExperience > 4000000000i64 ) | |
| 927 { | |
| 928 pParty->pPlayers[i].uExperience = 0; | |
| 929 } | |
| 930 } | |
| 931 } | |
| 932 } | |
| 933 } | |
| 934 } | |
| 1297 | 935 //----- (00420C05) -------------------------------------------------------- |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
936 void Party::PartyFindsGold(unsigned int uNumGold, int _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal) |
| 1297 | 937 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
938 int hirelingSalaries; // ebp@1 |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
939 unsigned int goldToGain; // esi@1 |
| 1297 | 940 NPCData *v12; // ecx@21 |
| 941 unsigned int v13; // ecx@23 | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
942 signed int hirelingCount; // [sp+Ch] [bp-4h]@6 |
| 1297 | 943 |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
944 hirelingSalaries = 0; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
945 goldToGain = uNumGold; |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
946 |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
947 if ( _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal == 2 ) |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
948 pTmpBuf2[0] = 0; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
949 else if ( _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal == 1 ) |
| 1297 | 950 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
951 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[467], uNumGold);// You found %lu gold! |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
952 } |
| 1297 | 953 else |
| 954 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
955 hirelingCount = 0; |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
956 for (int i = 0; i < 2; i++) |
| 1297 | 957 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
958 if (this->pHirelings[i].pName) |
| 1297 | 959 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
960 hirelingCount++; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
961 pTmpBuf[hirelingCount] = i; |
| 1297 | 962 } |
| 963 } | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
964 for (uint i = 0; i < pNPCStats->uNumNewNPCs; i++) |
| 1297 | 965 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
966 if ( pNPCStats->pNewNPCData[i].uFlags & 0x80 |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
967 && (!this->pHirelings[0].pName || strcmp(pNPCStats->pNewNPCData[i].pName, this->pHirelings[0].pName)) |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
968 && (!this->pHirelings[1].pName || strcmp(pNPCStats->pNewNPCData[i].pName, this->pHirelings[1].pName)) ) |
| 1297 | 969 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
970 hirelingCount++; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
971 pTmpBuf[hirelingCount] = i + 2; |
| 1297 | 972 } |
| 973 } | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
974 for (int i = 0; i < hirelingCount; i++) |
| 1297 | 975 { |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
976 uchar thisBufId = (uchar)pTmpBuf[i]; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
977 if (thisBufId < 2) |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
978 v12 = &this->pHirelings[thisBufId]; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
979 else |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
980 v12 = &pNPCStats->pNPCData[thisBufId + 499]; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
981 v13 = v12->uProfession; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
982 if ( v13 ) |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
983 hirelingSalaries += pNPCStats->pProfessions[v13].uHirePrice;//*(&pNPCStats->field_13A58 + 5 * v13); |
| 1297 | 984 } |
| 985 if ( CheckHiredNPCSpeciality(Factor) ) | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
986 goldToGain += (signed int)(10 * goldToGain) / 100; |
| 1297 | 987 if ( CheckHiredNPCSpeciality(Banker) ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
988 goldToGain += (signed int)(20 * goldToGain) / 100; |
| 1297 | 989 if ( CheckHiredNPCSpeciality(Pirate) ) |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
990 goldToGain += (signed int)(10 * goldToGain) / 100; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
991 if ( hirelingSalaries ) |
| 1297 | 992 { |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
993 hirelingSalaries = (signed int)(goldToGain * hirelingSalaries / 100) / 100; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
994 if ( hirelingSalaries < 1 ) |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
995 hirelingSalaries = 1; |
|
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
996 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[466], goldToGain, hirelingSalaries);// You found %lu gold (followers take %lu)! |
| 1297 | 997 } |
| 998 else | |
| 999 { | |
|
1827
0c75c3e7e436
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents:
1826
diff
changeset
|
1000 sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[467], goldToGain);// You found %lu gold! |
| 1297 | 1001 } |
| 1002 } | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
1003 this->uNumGold += goldToGain - hirelingSalaries; |
|
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
1004 pUIAnim_Gold->uAnimTime = 0; |
| 1297 | 1005 pUIAnim_Gold->uAnimLength = 8 * pIconsFrameTable->pIcons[(signed __int16)pUIAnim_Gold->uIconID].uAnimLength; |
| 1006 if ( pTmpBuf2[0] ) | |
| 1007 ShowStatusBarString(pTmpBuf2.data(), 2u); | |
|
1828
35c1e4ff6ba7
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents:
1827
diff
changeset
|
1008 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); |
| 1297 | 1009 } |
| 1010 //----- (00421B2C) -------------------------------------------------------- | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1011 void Party::sub_421B2C_PlaceInInventory_or_DropPickedItem() |
| 1297 | 1012 { |
| 1013 unsigned int v0; // eax@2 | |
| 1014 Texture *v1; // ebx@2 | |
| 1015 int v2; // eax@3 | |
| 1016 int v4; // eax@6 | |
| 1017 unsigned __int16 v5; // dx@11 | |
| 1018 signed int v6; // eax@11 | |
| 1019 __int16 v8; // ax@16 | |
| 1020 SpriteObject a1; // [sp+4h] [bp-78h]@11 | |
| 1021 int v11; // [sp+74h] [bp-8h]@2 | |
| 1022 int v12; // [sp+78h] [bp-4h]@5 | |
| 1023 | |
| 1024 if ( !pParty->pPickedItem.uItemID ) | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1025 return; |
| 1297 | 1026 v0 = pIcons_LOD->LoadTexture( |
|
1709
8251e59fd7c1
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents:
1657
diff
changeset
|
1027 pParty->pPickedItem.GetIconName(), |
| 1297 | 1028 TEXTURE_16BIT_PALETTE); |
| 1029 v1 = pIcons_LOD->GetTexture(v0); | |
| 1030 v11 = areWeLoadingTexture; | |
| 1031 if ( uActiveCharacter | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1032 && (v2 = ::pPlayers[uActiveCharacter]->AddItem(-1, pParty->pPickedItem.uItemID)) != 0 ) |
| 1297 | 1033 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1034 memcpy(&::pPlayers[uActiveCharacter]->pInventoryItemList[v2-1], &pParty->pPickedItem, 0x24u); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1035 pMouse->RemoveHoldingItem(); |
| 1297 | 1036 } |
| 1037 else | |
| 1038 { | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1039 for (v12 = 0; v12 < 4; v12++) |
| 1297 | 1040 { |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1041 v4 = pParty->pPlayers[v12].AddItem(-1, pParty->pPickedItem.uItemID); |
| 1297 | 1042 if ( v4 ) |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1043 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1044 memcpy(&pParty->pPlayers[v12].pInventoryItemList[v4 - 1], &pParty->pPickedItem, sizeof(ItemGen)); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1045 pMouse->RemoveHoldingItem(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1046 break; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1047 } |
| 1297 | 1048 } |
| 1049 if ( v12 == 4 ) | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1050 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1051 v5 = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1052 v6 = 0; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1053 a1.uType = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1054 for ( uint i = 0; i < pObjectList->uNumObjects; i++ ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1055 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1056 if ( v5 == pObjectList->pObjects[i].uObjectID ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1057 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1058 v6 = i; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1059 break; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1060 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1061 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1062 a1.spell_caster_pid = OBJECT_Player; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1063 a1.uObjectDescID = v6; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1064 a1.vPosition.y = pParty->vPosition.y; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1065 a1.vPosition.x = pParty->vPosition.x; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1066 a1.vPosition.z = pParty->sEyelevel + pParty->vPosition.z; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1067 a1.uSoundID = 0; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1068 a1.uFacing = 0; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1069 a1.uAttributes = 8; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1070 v8 = pIndoor->GetSector( |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1071 pParty->vPosition.x, |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1072 pParty->vPosition.y, |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1073 pParty->sEyelevel + pParty->vPosition.z); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1074 a1.uSpriteFrameID = 0; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1075 a1.uSectorID = v8; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1076 memcpy(&a1.stru_24, &pParty->pPickedItem, sizeof(a1.stru_24)); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1077 a1.Create(pParty->sRotationY, 184, 200, 0); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1078 pMouse->RemoveHoldingItem(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1079 } |
| 1297 | 1080 } |
| 1081 if ( !v11 ) | |
| 1082 { | |
| 1083 v1->Release(); | |
| 1084 pIcons_LOD->SyncLoadedFilesCount(); | |
| 1085 } | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1086 return; |
|
1359
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1087 } |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1088 |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1089 |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1090 //----- (0048C6F6) -------------------------------------------------------- |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1091 bool Party::AddItemToParty(ItemGen *pItem) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1092 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1093 unsigned int v2; // eax@1 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1094 char *v5; // eax@8 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1095 Texture *v7; // ebx@10 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1096 signed int v8; // esi@10 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1097 Player *v9; // edi@11 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1098 int v10; // eax@11 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1099 int v21; // [sp+24h] [bp-4h]@10 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1100 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1101 v2 = pItem->uItemID; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1102 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1103 pItem->SetIdentified(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1104 |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1105 v5 = pItemsTable->pItems[v2].pIconName; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1106 if ( v5 ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1107 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1108 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1109 v21 = areWeLoadingTexture; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1110 v8 = 0; |
| 2024 | 1111 uint current_player = uActiveCharacter; |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1112 for (int i = 0; i < 4; i++) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1113 { |
| 2024 | 1114 current_player = current_player + i; |
| 1115 if ( current_player > 4 ) | |
| 1116 current_player = current_player - 4; | |
| 1117 v9 = ::pPlayers[current_player]; | |
|
1829
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1118 v10 = v9->AddItem(-1, pItem->uItemID); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1119 if ( v10 ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1120 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1121 memcpy(&v9->pInventoryItemList[v10-1], pItem, 0x24u); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1122 pItem->Reset(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1123 pAudioPlayer->PlaySound(SOUND_GoldReceived, 0, 0, -1, 0, 0, 0, 0); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1124 v9->PlaySound(SPEECH_60, 0); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1125 if ( !v21 ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1126 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1127 v7->Release(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1128 pIcons_LOD->SyncLoadedFilesCount(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1129 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1130 return true; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1131 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1132 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1133 if ( !v21 ) |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1134 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1135 v7->Release(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1136 pIcons_LOD->SyncLoadedFilesCount(); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1137 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1138 return false; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1139 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1140 else |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1141 { |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1142 MessageBoxW(nullptr, L"Invalid picture_name detected ::addItem()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Party.cpp:795", 0); |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1143 return false; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1144 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1145 } |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1146 // 506128: using guessed type int areWeLoadingTexture; |
|
e4e27261d84e
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
Grumpy7
parents:
1828
diff
changeset
|
1147 |
|
1359
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1148 bool Party::IsPartyEvil() |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1149 { |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1150 return _449B57_test_bit(_quest_bits, 100); |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1151 } |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1152 |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1153 bool Party::IsPartyGood() |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1154 { |
|
60cdc3eac407
_449B57_test_bit(pParty->_quest_bits, 99) and _449B57_test_bit(pParty->_quest_bits, 100) changed to Party::IsPartyGood, Party::IsPartyEvil, respectively
Grumpy7
parents:
1340
diff
changeset
|
1155 return _449B57_test_bit(_quest_bits, 99); |
| 1297 | 1156 } |