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