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