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