Mercurial > mm7

annotate Actor.cpp @ 2154:9bd7522cdbbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Render decoupling. Unsorted variables cleaning.
author Nomad
date Thu, 09 Jan 2014 14:36:48 +0200
parents d28d3c006077
children 5b27c035a241
rev   line source
1253
fac7751b2dc9 included header cleanup
Grumpy7
parents: 1205
diff changeset
1 #include "mm7_data.h"
1016
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
2 #include "DecalBuilder.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
3
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
4 #include "Sprites.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
5 #include "stru6.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
6
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
7
0
Ritor1
parents:
diff changeset
8 #include "Actor.h"
2037
7a9477135943 Renamed Math.h -> OurMath.h (file resolution was sometimes ambiguous)
Nomad
parents: 2001
diff changeset
9 #include "OurMath.h"
0
Ritor1
parents:
diff changeset
10 #include "Outdoor.h"
Ritor1
parents:
diff changeset
11 #include "AudioPlayer.h"
Ritor1
parents:
diff changeset
12 #include "Game.h"
Ritor1
parents:
diff changeset
13 #include "ObjectList.h"
Ritor1
parents:
diff changeset
14 #include "Overlays.h"
Ritor1
parents:
diff changeset
15 #include "Events.h"
Ritor1
parents:
diff changeset
16 #include "FactionTable.h"
Ritor1
parents:
diff changeset
17 #include "TurnEngine.h"
Ritor1
parents:
diff changeset
18 #include "MapInfo.h"
924
a78f08dbeb88 CastSpellInfo
Ritor1
parents: 910
diff changeset
19 #include "CastSpellInfo.h"
2044
28cb79ae2f6f Time.h rename
Ritor1
parents: 2037
diff changeset
20 #include "Timer.h"
0
Ritor1
parents:
diff changeset
21 #include "LOD.h"
Ritor1
parents:
diff changeset
22 #include "Party.h"
Ritor1
parents:
diff changeset
23 #include "GUIWindow.h"
1638
ccde94f02b75 class IndoorCamera split into BLVRenderParams and ODMRenderParams
Nomad
parents: 1603
diff changeset
24 #include "Outdoor_stuff.h"
0
Ritor1
parents:
diff changeset
25
828
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
26 #include "MM7.h"
1016
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 994
diff changeset
27 #include "SpriteObject.h"
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
28 #include "stru298.h"
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
29 #include "Log.h"
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
30 #include "Texts.h"
1828
35c1e4ff6ba7 party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
Grumpy7
parents: 1827
diff changeset
31 #include "Level/Decoration.h"
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
32 #include "Viewport.h"
828
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
33
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
34
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
35
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
36
0f56abdcce94 Massive refactors of spells + PID (packed id) macros introduced.
Nomad
parents: 823
diff changeset
37
1202
0dbf6c4dd029 arrays to std::arrays phase 1
Grumpy7
parents: 1165
diff changeset
38 std::array<Actor, 500> pActors;
1503
4ce525fe9ea9 Fix types.
yoctozepto
parents: 1493
diff changeset
39 size_t uNumActors;
0
Ritor1
parents:
diff changeset
40
2001
79cdb74efa93 mistake in previous commit
zipi
parents: 2000
diff changeset
41 stru319 stru_50C198; // idb
0
Ritor1
parents:
diff changeset
42
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
43
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
44 std::array<uint, 5> _4DF380_hostilityRanges = {0, 1024, 2560, 5120, 10240};
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
45
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
46
2153
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
47
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
48
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
49 //----- (0042FB5C) --------------------------------------------------------
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
50 // True if monster should play attack animation when casting this spell.
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
51 bool ShouldMonsterPlayAttackAnim(signed int spell_id)
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
52 {
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
53 switch (spell_id)
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
54 {
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
55 case SPELL_FIRE_HASTE:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
56 case SPELL_AIR_SHIELD:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
57 case SPELL_EARTH_STONESKIN:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
58 case SPELL_SPIRIT_BLESS:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
59 case SPELL_SPIRIT_FATE:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
60 case SPELL_SPIRIT_HEROISM:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
61 case SPELL_BODY_HAMMERHANDS:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
62 case SPELL_BODY_POWER_CURE:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
63 case SPELL_LIGHT_DISPEL_MAGIC:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
64 case SPELL_LIGHT_DAY_OF_PROTECTION:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
65 case SPELL_LIGHT_HOUR_OF_POWER:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
66 case SPELL_DARK_PAIN_REFLECTION:
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
67 return false;
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
68 }
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
69
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
70 return true;
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
71 }
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
72
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
73
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
74 //----- (0041AF52) --------------------------------------------------------
1761
Ritor1
parents: 1709
diff changeset
75 void Actor::DrawHealthBar(Actor *actor, GUIWindow *window)
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
76 {
1763
Ritor1
parents: 1761
diff changeset
77 unsigned int bar_length; // esi@1
Ritor1
parents: 1761
diff changeset
78 unsigned int uX; // ebx@10
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
79 unsigned int v9; // [sp+14h] [bp-Ch]@4
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
80 unsigned int v10; // [sp+1Ch] [bp-4h]@4
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
81
1849
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
82 if (actor->pMonsterInfo.uHP <= 25)
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
83 bar_length = 25;
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
84 else if ( actor->pMonsterInfo.uHP < 200 )
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
85 bar_length = actor->pMonsterInfo.uHP;
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
86 else
1763
Ritor1
parents: 1761
diff changeset
87 bar_length = 200;
1849
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
88
1763
Ritor1
parents: 1761
diff changeset
89 v10 = bar_length;
1849
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
90 if ( actor->sCurrentHP <= (0.34 * actor->pMonsterInfo.uHP) )
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
91 v9 = uTextureID_mhp_red;
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
92 else if ( actor->sCurrentHP <= ( 0.67 * actor->pMonsterInfo.uHP) )
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
93 v9 = uTextureID_mhp_yel;
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
94 else
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
95 v9 = uTextureID_mhp_grn;
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
96
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
97 if ( actor->sCurrentHP < (int)actor->pMonsterInfo.uHP )
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
98 {
1763
Ritor1
parents: 1761
diff changeset
99 v10 = bar_length / actor->pMonsterInfo.uHP * actor->sCurrentHP;
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
100 }
1849
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
101
1763
Ritor1
parents: 1761
diff changeset
102 uX = window->uFrameX + (signed int)(window->uFrameWidth - bar_length) / 2;
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
103
1763
Ritor1
parents: 1761
diff changeset
104 pRenderer->SetTextureClipRect(uX, window->uFrameY + 32, uX + bar_length, window->uFrameY + 52);
Ritor1
parents: 1761
diff changeset
105 pRenderer->DrawTextureIndexed(uX, window->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_bd));
Ritor1
parents: 1761
diff changeset
106 pRenderer->SetTextureClipRect(uX, window->uFrameY + 32, uX + v10, window->uFrameY + 52);
Ritor1
parents: 1761
diff changeset
107 pRenderer->DrawTextureIndexed(uX, window->uFrameY + 34, pIcons_LOD->GetTexture(v9));
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
108
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
109 pRenderer->ResetTextureClipRect();
1763
Ritor1
parents: 1761
diff changeset
110 pRenderer->DrawTextureIndexed(uX - 5, window->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_capl));
Ritor1
parents: 1761
diff changeset
111 pRenderer->DrawTextureIndexed(uX + bar_length, window->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_capr));
994
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
112 }
3431f6abc786 GameUI clean
Nomad
parents: 972
diff changeset
113
781
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
114 //----- (00448A40) --------------------------------------------------------
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
115 void Actor::ToggleFlag(signed int uActorID, unsigned int uFlag, int bToggle)
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
116 {
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
117 if ( uActorID >= 0 && uActorID <= (signed int)(uNumActors - 1) )
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
118 {
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
119 if ( bToggle )
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
120 {
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
121 pActors[uActorID].uAttributes |= uFlag;
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
122 }
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
123 else
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
124 {
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
125 if ( uFlag == 0x10000 )
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
126 {
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
127 if (pActors[uActorID].uAIState == Disabled )
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
128 pActors[uActorID].uAIState = Standing;
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
129 }
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
130 pActors[uActorID].uAttributes &= ~uFlag;
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
131 }
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
132 }
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
133 }
0
Ritor1
parents:
diff changeset
134
Ritor1
parents:
diff changeset
135 //----- (00448518) --------------------------------------------------------
Ritor1
parents:
diff changeset
136 void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3)
Ritor1
parents:
diff changeset
137 {
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
138 for (uint i = 0; i < uNumActors; i++)
0
Ritor1
parents:
diff changeset
139 {
1849
794f6ac640f4 Actor::ToggleFlag, sub_448518_npc_set_item cleanup
Grumpy7
parents: 1828
diff changeset
140 if (pActors[uNumActors].sNPC_ID == npc)
0
Ritor1
parents:
diff changeset
141 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
142 Actor::GiveItem(i, item, a3);
0
Ritor1
parents:
diff changeset
143 }
Ritor1
parents:
diff changeset
144 }
Ritor1
parents:
diff changeset
145 }
Ritor1
parents:
diff changeset
146
Ritor1
parents:
diff changeset
147 //----- (004485A7) --------------------------------------------------------
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 515
diff changeset
148 void Actor::GiveItem(signed int uActorID, unsigned int uItemID, unsigned int bGive)
0
Ritor1
parents:
diff changeset
149 {
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 515
diff changeset
150 if ( (uActorID >= 0) && (signed int)uActorID <= (signed int)(uNumActors - 1) )
0
Ritor1
parents:
diff changeset
151 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
152 Actor* currActor = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
153 if ( bGive )
Ritor1
parents:
diff changeset
154 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
155 if ( currActor->uCarriedItemID == 0)
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
156 currActor->uCarriedItemID = uItemID;
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
157 else if ( currActor->array_000234[0].uItemID == 0)
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
158 currActor->array_000234[0].uItemID = uItemID;
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
159 else if ( currActor->array_000234[1].uItemID == 0)
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
160 currActor->array_000234[1].uItemID = uItemID;
0
Ritor1
parents:
diff changeset
161 }
Ritor1
parents:
diff changeset
162 else
Ritor1
parents:
diff changeset
163 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
164 if ( currActor->uCarriedItemID == uItemID )
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
165 currActor->uCarriedItemID = 0;
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
166 else if ( currActor->array_000234[0].uItemID == uItemID )
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
167 currActor->array_000234[0].Reset();
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
168 else if ( currActor->array_000234[1].uItemID == uItemID )
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
169 currActor->array_000234[1].Reset();
0
Ritor1
parents:
diff changeset
170 }
Ritor1
parents:
diff changeset
171 }
Ritor1
parents:
diff changeset
172 }
Ritor1
parents:
diff changeset
173
Ritor1
parents:
diff changeset
174 //----- (0040894B) --------------------------------------------------------
Ritor1
parents:
diff changeset
175 bool Actor::CanAct()
Ritor1
parents:
diff changeset
176 {
1114
d110108dab74 fixing bad bitwise operator fix
Grumpy7
parents: 1110
diff changeset
177 bool isparalyzed; // esi@1
d110108dab74 fixing bad bitwise operator fix
Grumpy7
parents: 1110
diff changeset
178 bool isstoned; // edi@2
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
179 AIState v3; // ax@6
0
Ritor1
parents:
diff changeset
180
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
181 isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned
1946
aa3ca49a10f5 pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
Grumpy7
parents: 1945
diff changeset
182 isparalyzed = (signed __int64)this->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0;// paralyzed
0
Ritor1
parents:
diff changeset
183 v3 = this->uAIState;
1114
d110108dab74 fixing bad bitwise operator fix
Grumpy7
parents: 1110
diff changeset
184 return !(isstoned || isparalyzed || v3 == Dying || v3 == Dead || v3 == Removed || v3 == Summoned || v3 == Disabled);
0
Ritor1
parents:
diff changeset
185 }
Ritor1
parents:
diff changeset
186
Ritor1
parents:
diff changeset
187 //----- (004089C7) --------------------------------------------------------
303
3dcc9d945eeb DamageMonsterFromParty
Nomad
parents: 291
diff changeset
188 bool Actor::IsNotAlive()
0
Ritor1
parents:
diff changeset
189 {
1115
849b848ed871 wrong IsNotAlive() condition fix
Grumpy7
parents: 1114
diff changeset
190 bool isstoned; // esi@1
0
Ritor1
parents:
diff changeset
191
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
192 isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned
1115
849b848ed871 wrong IsNotAlive() condition fix
Grumpy7
parents: 1114
diff changeset
193 return (isstoned || (uAIState == Dying) || (uAIState == Dead) || (uAIState == Removed) || (uAIState == Summoned) || (uAIState == Disabled));
0
Ritor1
parents:
diff changeset
194 }
Ritor1
parents:
diff changeset
195
Ritor1
parents:
diff changeset
196 //----- (004086E9) --------------------------------------------------------
Ritor1
parents:
diff changeset
197 void Actor::SetRandomGoldIfTheresNoItem()
Ritor1
parents:
diff changeset
198 {
Ritor1
parents:
diff changeset
199 int v2; // edi@1
Ritor1
parents:
diff changeset
200 unsigned __int8 v4; // al@7
Ritor1
parents:
diff changeset
201
Ritor1
parents:
diff changeset
202 v2 = 0;
Ritor1
parents:
diff changeset
203 if ( !this->array_000234[3].uItemID )
Ritor1
parents:
diff changeset
204 {
Ritor1
parents:
diff changeset
205 if ( this->pMonsterInfo.uTreasureDiceRolls )
Ritor1
parents:
diff changeset
206 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
207 for (int i = 0; i < this->pMonsterInfo.uTreasureDiceRolls; i++)
0
Ritor1
parents:
diff changeset
208 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
209 v2 += rand() % this->pMonsterInfo.uTreasureDiceSides + 1;
0
Ritor1
parents:
diff changeset
210 }
Ritor1
parents:
diff changeset
211 if ( v2 )
Ritor1
parents:
diff changeset
212 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
213 this->array_000234[3].uItemID = 197;
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
214 this->array_000234[3].uSpecEnchantmentType = v2; //actual gold amount
0
Ritor1
parents:
diff changeset
215 }
Ritor1
parents:
diff changeset
216 }
Ritor1
parents:
diff changeset
217 }
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
218 if ( rand() % 100 < this->pMonsterInfo.uTreasureDropChance )
0
Ritor1
parents:
diff changeset
219 {
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
220 v4 = this->pMonsterInfo.uTreasureLevel;
0
Ritor1
parents:
diff changeset
221 if ( v4 )
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
222 pItemsTable->GenerateItem(v4, this->pMonsterInfo.uTreasureType, &this->array_000234[2]);
0
Ritor1
parents:
diff changeset
223 }
1850
521ffedabe19 sub_448518_npc_set_item using body of cleaned up Actor::GiveItem
Grumpy7
parents: 1849
diff changeset
224 this->uAttributes |= 0x800000;
0
Ritor1
parents:
diff changeset
225 }
Ritor1
parents:
diff changeset
226
Ritor1
parents:
diff changeset
227 //----- (00404AC7) --------------------------------------------------------
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
228 void Actor::AI_SpellAttack(unsigned int uActorID, AIDirection *pDir, int uSpellID, int a4, unsigned int uSkillLevel)
0
Ritor1
parents:
diff changeset
229 {
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
230 Actor *actorPtr; // esi@1
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
231 unsigned int realPoints; // edi@1
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
232 unsigned int masteryLevel; // eax@1
0
Ritor1
parents:
diff changeset
233 int v8; // edi@16
Ritor1
parents:
diff changeset
234 signed int v10; // ecx@22
Ritor1
parents:
diff changeset
235 int v19; // edi@34
Ritor1
parents:
diff changeset
236 int v20; // eax@35
Ritor1
parents:
diff changeset
237 signed int v23; // eax@41
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
238 int v28; // st6@50
0
Ritor1
parents:
diff changeset
239 int v30; // esi@50
Ritor1
parents:
diff changeset
240 int v31; // ST3C_4@51
Ritor1
parents:
diff changeset
241 unsigned int v32; // edi@51
Ritor1
parents:
diff changeset
242 signed int v36; // eax@67
Ritor1
parents:
diff changeset
243 int v39; // ecx@75
Ritor1
parents:
diff changeset
244 int v42; // ecx@91
Ritor1
parents:
diff changeset
245 int v44; // ecx@100
Ritor1
parents:
diff changeset
246 int v48; // ecx@110
Ritor1
parents:
diff changeset
247 int v51; // ecx@130
Ritor1
parents:
diff changeset
248 int v54; // ecx@138
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
249 Player *v57; // esi@145
0
Ritor1
parents:
diff changeset
250 int v58; // eax@146
Ritor1
parents:
diff changeset
251 int v59; // edi@146
Ritor1
parents:
diff changeset
252 int v60; // eax@146
Ritor1
parents:
diff changeset
253 int v61; // edi@146
Ritor1
parents:
diff changeset
254 int v62; // eax@146
Ritor1
parents:
diff changeset
255 signed int v63; // edi@146
Ritor1
parents:
diff changeset
256 int v68; // edi@168
Ritor1
parents:
diff changeset
257 signed int v70; // ecx@172
Ritor1
parents:
diff changeset
258 int v79; // edx@185
Ritor1
parents:
diff changeset
259 int v80; // eax@185
Ritor1
parents:
diff changeset
260 signed int v89; // ecx@192
Ritor1
parents:
diff changeset
261 signed int v91; // eax@200
Ritor1
parents:
diff changeset
262 int v94; // ecx@208
Ritor1
parents:
diff changeset
263 int v96; // ecx@217
Ritor1
parents:
diff changeset
264 int pitch; // [sp+2Ch] [bp-A4h]@51
Ritor1
parents:
diff changeset
265 int v114; // [sp+48h] [bp-88h]@41
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
266 SpriteObject a1; // [sp+4Ch] [bp-84h]@1
0
Ritor1
parents:
diff changeset
267 int v116; // [sp+BCh] [bp-14h]@49
Ritor1
parents:
diff changeset
268 int v118; // [sp+C4h] [bp-Ch]@29
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
269 int v119; // [sp+C8h] [bp-8h]@48
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
270 int v120; // [sp+CCh] [bp-4h]@1
0
Ritor1
parents:
diff changeset
271 int spellnuma; // [sp+D8h] [bp+8h]@29
Ritor1
parents:
diff changeset
272 int spellnumb; // [sp+D8h] [bp+8h]@48
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
273 int spellnumc; // [sp+D8h] [bp+8h]@50
0
Ritor1
parents:
diff changeset
274 int spellnume; // [sp+D8h] [bp+8h]@179
Ritor1
parents:
diff changeset
275 int a1a; // [sp+E0h] [bp+10h]@34
Ritor1
parents:
diff changeset
276 int a1c; // [sp+E0h] [bp+10h]@184
Ritor1
parents:
diff changeset
277
1855
51e9b4621d0a Actor::AI_SpellAttack preparing to remove label 159
Grumpy7
parents: 1853
diff changeset
278
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
279 actorPtr = &pActors[uActorID];
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
280 realPoints = uSkillLevel & 0x3F;
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
281 masteryLevel = SkillToMastery(uSkillLevel);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
282
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
283 switch (uSpellID)
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
284 {
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
285 case SPELL_FIRE_FIRE_BOLT:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
286 case SPELL_FIRE_FIREBALL:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
287 case SPELL_FIRE_INCINERATE:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
288 case SPELL_AIR_LIGHNING_BOLT:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
289 case SPELL_WATER_ICE_BOLT:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
290 case SPELL_WATER_ACID_BURST:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
291 case SPELL_EARTH_BLADES:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
292 case SPELL_EARTH_ROCK_BLAST:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
293 case SPELL_MIND_MIND_BLAST:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
294 case SPELL_MIND_PSYCHIC_SHOCK:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
295 case SPELL_BODY_HARM:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
296 case SPELL_LIGHT_LIGHT_BOLT:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
297 case SPELL_DARK_TOXIC_CLOUD:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
298 case SPELL_DARK_DRAGON_BREATH:
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
299 a1.uType = stru_4E3ACC[uSpellID].uType;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
300 a1.uObjectDescID = GetObjDescId(uSpellID);
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
301 a1.stru_24.Reset();
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
302 a1.spell_id = uSpellID;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
303 a1.spell_level = uSkillLevel;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
304 a1.vPosition.x = actorPtr->vPosition.x;
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
305 a1.spell_skill = 0;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
306 a1.vPosition.y = actorPtr->vPosition.y;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
307 a1.vPosition.z = actorPtr->vPosition.z + ((signed int)actorPtr->uActorHeight >> 1);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
308 a1.uFacing = LOWORD(pDir->uYawAngle);
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
309 a1.uSoundID = 0;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
310 a1.uAttributes = 0;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
311 v89 = pDir->uDistance;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
312 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, a1.vPosition.z);
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
313 a1.uSpriteFrameID = 0;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
314 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
315 a1.spell_target_pid = 0;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
316 if ((double)v89 < 307.2 )
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
317 a1.field_60_distance_related_prolly_lod = 0;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
318 else if ( v89 < 1024 )
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
319 a1.field_60_distance_related_prolly_lod = 1;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
320 else if ( v89 < 2560 )
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
321 a1.field_60_distance_related_prolly_lod = 2;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
322 else
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
323 a1.field_60_distance_related_prolly_lod = 3;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
324
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
325 a1.field_61 = 2;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
326 v91 = a1.Create(
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
327 pDir->uYawAngle,
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
328 pDir->uPitchAngle,
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
329 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
330 0);
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
331 if ( v91 != -1 )
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
332 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
333 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[uSpellID], PID(OBJECT_Item, v91), 0, -1, 0, 0, 0, 0);
1856
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
334 return;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
335 }
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
336 return;
656962b05d32 Actor::AI_SpellAttack label 159 removed
Grumpy7
parents: 1855
diff changeset
337 break;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
338
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
339 case SPELL_FIRE_HASTE:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
340 if (masteryLevel == 1 || masteryLevel == 2)
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
341 v39 = 60 * (realPoints + 60);
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
342 else if (masteryLevel == 3 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
343 v39 = 180 * (realPoints + 20);
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
344 else if (masteryLevel == 4 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
345 v39 = 240 * (realPoints + 15);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
346 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
347 v39 = 0;
1963
223143ef1289 pActorBuffs[19] to pActorBuffs[ACTOR_BUFF_HASTE]
Grumpy7
parents: 1962
diff changeset
348 actorPtr->pActorBuffs[ACTOR_BUFF_HASTE].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
349 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v39 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
350 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
351 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
352 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
353 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
354 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr, 0xFF3C1Eu);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
355 pAudioPlayer->PlaySound((SoundID)10040, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
356 return;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
357
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
358 case SPELL_FIRE_METEOR_SHOWER:
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
359 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
360 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
361 v114 = pParty->vPosition.z + 2500;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
362 v23 = 8;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
363 if (masteryLevel == 2)
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
364 v23 = 10;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
365 else if (masteryLevel == 3)
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
366 v23 = 12;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
367 else if (masteryLevel == 4)
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
368 v23 = 14;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
369 spellnumb = 0;
1870
7a193504f18e Actor::AI_SpellAttack adding accidentally removed random position for meteor shower
Grumpy7
parents: 1865
diff changeset
370 v28 = 0;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
371 for ( int i = 0; i < v23; i++)
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
372 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
373 v30 = rand() % 1000;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
374 spellnumc = v30 - 2500;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
375 v120 = v28 * v28;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
376 v119 = spellnumb * spellnumb;
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
377 if ( sqrt((float)(spellnumc * spellnumc + v119 + v120)) <= 1.0 )
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
378 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
379 v32 = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
380 pitch = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
381 }
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
382 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
383 {
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
384 v31 = (signed __int64)sqrt((float)(v119 + v120));
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
385 v32 = stru_5C6E00->Atan2(spellnumb, (int)v28);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
386 pitch = stru_5C6E00->Atan2(v31, (int)spellnumc);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
387 }
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
388 a1.stru_24.Reset();
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
389 a1.uType = stru_4E3ACC[uSpellID].uType;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
390 a1.uObjectDescID = GetObjDescId(uSpellID);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
391 a1.spell_level = uSkillLevel;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
392 a1.vPosition.x = pParty->vPosition.x;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
393 a1.vPosition.y = pParty->vPosition.y;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
394 a1.vPosition.z = v30 + v114;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
395 a1.spell_id = SPELL_FIRE_METEOR_SHOWER;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
396 a1.spell_skill = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
397 a1.uAttributes = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
398 a1.uSectorID = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
399 a1.uSpriteFrameID = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
400 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
401 a1.spell_target_pid = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
402 a1.field_60_distance_related_prolly_lod = stru_50C198._427546(v30 + 2500);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
403 a1.uFacing = v32;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
404 a1.uSoundID = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
405 if (pDir->uDistance < 307.2 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
406 a1.field_60_distance_related_prolly_lod = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
407 else if ( pDir->uDistance < 1024 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
408 a1.field_60_distance_related_prolly_lod = 1;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
409 else if ( pDir->uDistance < 2560 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
410 a1.field_60_distance_related_prolly_lod = 2;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
411 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
412 a1.field_60_distance_related_prolly_lod = 3;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
413 a1.field_61 = 2;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
414 v36 = a1.Create(
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
415 v32,
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
416 pitch,
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
417 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
418 0);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
419 if ( v36 != -1 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
420 {
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
421 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[9], PID(OBJECT_Item, v36), 0, -1, 0, 0, 0, 0);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
422 }
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
423 spellnumb = rand() % 1024 - 512;
1870
7a193504f18e Actor::AI_SpellAttack adding accidentally removed random position for meteor shower
Grumpy7
parents: 1865
diff changeset
424 v28 = rand() % 1024 - 512;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
425 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
426 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
427 break;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
428
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
429 case SPELL_AIR_SPARKS:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
430 if (masteryLevel == 2 )
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
431 v10 = 5;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
432 else if (masteryLevel == 3 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
433 v10 = 7;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
434 else if (masteryLevel == 4 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
435 v10 = 9;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
436 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
437 v10 = 3;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
438 spellnuma = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
439 a1.uType = stru_4E3ACC[uSpellID].uType;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
440 v118 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v10 - 1);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
441 a1.uObjectDescID = GetObjDescId(uSpellID);
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
442
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
443 a1.stru_24.Reset();
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
444 a1.spell_id = SPELL_AIR_SPARKS;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
445 a1.spell_level = uSkillLevel;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
446 a1.vPosition.x = actorPtr->vPosition.x;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
447 a1.spell_skill = 0;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
448 a1.vPosition.y = actorPtr->vPosition.y;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
449 a1.vPosition.z = actorPtr->vPosition.z + ((signed int)actorPtr->uActorHeight >> 1);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
450 a1.uFacing = pDir->uYawAngle;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
451 a1.uSoundID = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
452 a1.uAttributes = 0;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
453 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, a1.vPosition.z);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
454 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
455 a1.uSpriteFrameID = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
456 a1.spell_target_pid = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
457 a1.field_60_distance_related_prolly_lod = 3;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
458 v19 = spellnuma / -2;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
459 a1a = spellnuma / 2;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
460 if ( spellnuma / -2 > spellnuma / 2 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
461 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
462 v20 = spellnuma / 2;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
463 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
464 else
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
465 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
466 do
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
467 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
468 a1.uFacing = v19 + LOWORD(pDir->uYawAngle);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
469 v20 = a1.Create(
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
470 (signed __int16)a1.uFacing,
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
471 pDir->uPitchAngle,
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
472 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
473 0);
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
474 v19 += v118;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
475 }
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
476 while ( v19 <= a1a );
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
477 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
478 if ( v20 != -1 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
479 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
480 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[15], PID(OBJECT_Item, v20), 0, -1, 0, 0, 0, 0);
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
481 return;
0
Ritor1
parents:
diff changeset
482 }
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
483 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
484 break;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
485
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
486 case SPELL_AIR_SHIELD:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
487 if (masteryLevel == 1 || masteryLevel == 2)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
488 v8 = 300 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
489 else if (masteryLevel == 3 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
490 v8 = 900 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
491 else if (masteryLevel == 4 )
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
492 v8 = 3600 * (realPoints + 64);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
493 else
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
494 v8 = 0;
1959
4fbffad6e011 pActorBuffs[15] to pActorBuffs[ACTOR_BUFF_SHIELD]
Grumpy7
parents: 1958
diff changeset
495 actorPtr->pActorBuffs[ACTOR_BUFF_SHIELD].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
496 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v8 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
497 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
498 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
499 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
500 0);
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
501 return;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
502
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
503 case SPELL_EARTH_STONESKIN:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
504 if (masteryLevel == 1 || masteryLevel == 2)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
505 v44 = 300 * realPoints + 3840;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
506 else if (masteryLevel == 3 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
507 v44 = 900 * realPoints + 3840;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
508 else if (masteryLevel == 4 )
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
509 v44 = 3600 * (realPoints + 64);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
510 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
511 v44 = 0;
1960
f92fc67d66cb pActorBuffs[16] to pActorBuffs[ACTOR_BUFF_STONESKIN]
Grumpy7
parents: 1959
diff changeset
512 actorPtr->pActorBuffs[ACTOR_BUFF_STONESKIN].Apply(
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
513 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v44 << 7) * 0.033333335),
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
514 masteryLevel,
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
515 realPoints + 5,
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
516 0,
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
517 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
518 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0x5C310Eu);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
519 pAudioPlayer->PlaySound((SoundID)13040, PID(OBJECT_Actor,uActorID), 0, -1, 0, 0, 0, 0);
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
520 return;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
521
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
522 case SPELL_SPIRIT_BLESS:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
523 if (masteryLevel == 1 || masteryLevel == 2)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
524 v42 = 300 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
525 else if (masteryLevel == 3 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
526 v42 = 900 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
527 else if (masteryLevel == 4 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
528 v42 = 1200 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
529 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
530 v42 = 0;
1961
592d604088b3 pActorBuffs[17] to pActorBuffs[ACTOR_BUFF_BLESS]
Grumpy7
parents: 1960
diff changeset
531 actorPtr->pActorBuffs[ACTOR_BUFF_BLESS].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
532 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v42 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
533 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
534 realPoints + 5,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
535 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
536 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
537 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0xC8C805u);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
538 pAudioPlayer->PlaySound((SoundID)14010, PID(OBJECT_Actor,uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
539 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
540 break;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
541
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
542 case SPELL_SPIRIT_FATE:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
543 if (masteryLevel == 1 || masteryLevel == 2)
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
544 v48 = 2 * realPoints + 40;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
545 else if (masteryLevel == 3 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
546 v48 = 3 * realPoints + 60;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
547 else if (masteryLevel == 4 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
548 v48 = 2 * (3 * realPoints + 60);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
549 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
550 v48 = 0;
1955
0c5326e2044a pActorBuffs[11] to pActorBuffs[ACTOR_BUFF_FATE]
Grumpy7
parents: 1951
diff changeset
551 actorPtr->pActorBuffs[ACTOR_BUFF_FATE].Apply(pParty->uTimePlayed + 1280, masteryLevel, v48, 0, 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
552 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0xC8C805u);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
553 pAudioPlayer->PlaySound((SoundID)14020, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
554 return;
1852
979380004db2 Actor::AI_SpellAttack, extracting common code from different mastery levels
Grumpy7
parents: 1851
diff changeset
555
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
556 case SPELL_SPIRIT_HEROISM:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
557 if (masteryLevel == 1 || masteryLevel == 2)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
558 v54 = 300 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
559 else if (masteryLevel == 3 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
560 v54 = 900 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
561 else if (masteryLevel == 4 )
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
562 v54 = 1200 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
563 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
564 v54 = 0;
1962
39a68477ead3 pActorBuffs[18] to pActorBuffs[ACTOR_BUFF_HEROISM]
Grumpy7
parents: 1961
diff changeset
565 actorPtr->pActorBuffs[ACTOR_BUFF_HEROISM].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
566 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v54 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
567 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
568 realPoints + 5,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
569 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
570 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
571 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0xC8C805u);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
572 pAudioPlayer->PlaySound((SoundID)14060, PID(OBJECT_Actor,uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
573 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
574
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
575 case SPELL_BODY_HAMMERHANDS:
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
576 if ( (signed int)masteryLevel <= 0 || (signed int)masteryLevel > 4 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
577 v51 = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
578 else
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
579 v51 = 3600 * realPoints;
1965
182d49f28170 pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
Grumpy7
parents: 1964
diff changeset
580 actorPtr->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
581 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v51 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
582 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
583 realPoints,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
584 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
585 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
586 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr, 0xA81376u);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
587 pAudioPlayer->PlaySound((SoundID)16060, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
588 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
589
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
590 case SPELL_BODY_POWER_CURE:
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
591 actorPtr->sCurrentHP += 5 * realPoints + 10;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
592 if ( actorPtr->sCurrentHP >= (signed int)actorPtr->pMonsterInfo.uHP )
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
593 actorPtr->sCurrentHP = LOWORD(actorPtr->pMonsterInfo.uHP);
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
594 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr, 0xA81376u);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
595 pAudioPlayer->PlaySound((SoundID)14020, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
596 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
597
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
598 case SPELL_LIGHT_DISPEL_MAGIC:
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
599 for (int i = 0; i < 20; i++ )
0
Ritor1
parents:
diff changeset
600 {
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
601 pParty->pPartyBuffs[i].Reset();
0
Ritor1
parents:
diff changeset
602 }
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
603 for (int i = 1; i <= 4; i++)
0
Ritor1
parents:
diff changeset
604 {
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
605 v57 = pPlayers[i];
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
606 v58 = v57->GetActualWillpower();
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
607 v59 = v57->GetParameterBonus(v58);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
608 v60 = v57->GetActualIntelligence();
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
609 v61 = (v57->GetParameterBonus(v60) + v59) / 2;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
610 v62 = v57->GetActualLuck();
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
611 v63 = v61 + v57->GetParameterBonus(v62) + 30;
0
Ritor1
parents:
diff changeset
612 if ( rand() % v63 < 30 )
Ritor1
parents:
diff changeset
613 {
1860
3186f469323a fixing some warnings in actor.cpp
Grumpy7
parents: 1859
diff changeset
614 for (uint k = 0; k < v57->pPlayerBuffs.size(); k++)
0
Ritor1
parents:
diff changeset
615 {
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
616 v57->pPlayerBuffs[k].Reset();
0
Ritor1
parents:
diff changeset
617 }
1853
4ae5b7e7a920 Actor::AI_SpellAttack unnesting ifs, simplifying cycles
Grumpy7
parents: 1852
diff changeset
618 pOtherOverlayList->_4418B1(11210, i + 99, 0, 65536);
0
Ritor1
parents:
diff changeset
619 }
Ritor1
parents:
diff changeset
620 }
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
621 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[80], PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
622 return;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
623
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
624 case SPELL_LIGHT_DAY_OF_PROTECTION:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
625 if (masteryLevel == 1 || masteryLevel == 2)
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
626 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
627 v96 = 300 * realPoints + 3840;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
628 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
629 else if (masteryLevel == 3 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
630 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
631 LOWORD(realPoints) = 3 * realPoints;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
632 v96 = 900 * (uSkillLevel & 0x3F) + 3840;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
633 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
634 else if (masteryLevel == 4 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
635 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
636 v96 = 1200 * realPoints + 3840;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
637 LOWORD(realPoints) = 4 * realPoints;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
638 }
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
639 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
640 {
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
641 LOWORD(realPoints) = uSkillLevel;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
642 v96 = 0;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
643 }
1957
3d0c57c4fa83 pActorBuffs[13] to pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION]
Grumpy7
parents: 1956
diff changeset
644 actorPtr->pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
645 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v96 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
646 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
647 realPoints,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
648 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
649 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
650 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr, 0xFFFFFFu);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
651 pAudioPlayer->PlaySound((SoundID)17070, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
652 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
653
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
654 case SPELL_LIGHT_HOUR_OF_POWER:
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
655 if (masteryLevel == 1 || masteryLevel == 2)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
656 v94 = 300 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
657 else if (masteryLevel == 3)
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
658 v94 = 900 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
659 else if (masteryLevel == 4)
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
660 v94 = 1200 * realPoints + 3840;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
661 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
662 v94 = 0;
1958
95095c2a5e19 pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
Grumpy7
parents: 1957
diff changeset
663 actorPtr->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
664 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v94 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
665 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
666 realPoints + 5,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
667 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
668 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
669 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr, 0xFFFFFFu);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
670 pAudioPlayer->PlaySound((SoundID)17080, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
671 return;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
672
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
673 case SPELL_DARK_SHARPMETAL:
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
674 if (masteryLevel == 2)
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
675 v70 = 5;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
676 else if (masteryLevel == 3)
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
677 v70 = 7;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
678 else if (masteryLevel == 4)
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
679 v70 = 9;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
680 else
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
681 v70 = 3;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
682
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
683 spellnume = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
684 a1.uType = stru_4E3ACC[uSpellID].uType;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
685 v116 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v70 - 1);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
686 a1.uObjectDescID = GetObjDescId(uSpellID);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
687 a1.stru_24.Reset();
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
688 a1.spell_id = uSpellID;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
689 a1.spell_level = uSkillLevel;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
690 a1.vPosition.x = actorPtr->vPosition.x;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
691 a1.spell_skill = 0;
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
692 a1.vPosition.y = actorPtr->vPosition.y;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
693 a1.vPosition.z = actorPtr->vPosition.z + ((signed int)actorPtr->uActorHeight >> 1);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
694 a1.uFacing = pDir->uYawAngle;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
695 a1.uSoundID = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
696 a1.uAttributes = 0;
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
697 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, a1.vPosition.z);
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
698 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
699 a1.uSpriteFrameID = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
700 a1.spell_target_pid = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
701 a1.field_60_distance_related_prolly_lod = 3;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
702 a1c = spellnume / -2;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
703 if ( spellnume / -2 > spellnume / 2 )
0
Ritor1
parents:
diff changeset
704 {
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
705 v80 = spellnume / -2;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
706 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
707 else
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
708 {
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
709 do
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
710 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
711 v79 = pDir->uYawAngle;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
712 a1.uFacing = a1c + LOWORD(pDir->uYawAngle);
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
713 v80 = a1.Create(
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
714 v79,
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
715 pDir->uPitchAngle,
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
716 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
717 0);
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
718 a1c += v116;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
719 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
720 while ( a1c <= spellnume / 2 );
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
721 }
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
722 if ( v80 != -1 )
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
723 {
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
724 pAudioPlayer->PlaySound((SoundID)word_4EE088_sound_ids[93], PID(OBJECT_Item, v80), 0, -1, 0, 0, 0, 0);
1851
80e897fc2438 Actor::AI_SpellAttack getting rid of labels, constant vars(used in playsound)
Grumpy7
parents: 1850
diff changeset
725 return;
0
Ritor1
parents:
diff changeset
726 }
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
727 return;
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
728 break;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
729
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
730 case SPELL_DARK_PAIN_REFLECTION:
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
731 if (masteryLevel == 0)
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
732 v68 = 0;
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
733 else if (masteryLevel == 1 || (masteryLevel == 2) || (masteryLevel == 3))
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
734 v68 = 300 * realPoints + 3840;
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
735 else
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
736 v68 = 900 * realPoints + 3840;
1964
2b6c6ff66823 pActorBuffs[20] to pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION]
Grumpy7
parents: 1963
diff changeset
737 actorPtr->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].Apply(
1857
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
738 pParty->uTimePlayed + (signed int)(signed __int64)((double)(v68 << 7) * 0.033333335),
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
739 masteryLevel,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
740 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
741 0,
f357e4cbd169 Actor::AI_SpellAttack moved spells into a huge case
Grumpy7
parents: 1856
diff changeset
742 0);
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
743 pGame->pStru6Instance->_4A7E89_sparkles_on_actor_after_it_casts_buff(actorPtr,0x7E7E7Eu);
1858
d7c028a6a084 Actor::AI_SpellAttack removing unnecessary temporary vars
Grumpy7
parents: 1857
diff changeset
744 pAudioPlayer->PlaySound((SoundID)18060, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
1855
51e9b4621d0a Actor::AI_SpellAttack preparing to remove label 159
Grumpy7
parents: 1853
diff changeset
745 return;
0
Ritor1
parents:
diff changeset
746 }
Ritor1
parents:
diff changeset
747 }
Ritor1
parents:
diff changeset
748
1859
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
749
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
750 //----- (new func) --------------------------------------------------------
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
751 unsigned short Actor::GetObjDescId( int spellId )
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
752 {
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
753 for (unsigned int i = 0; i < pObjectList->uNumObjects; i++)
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
754 {
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
755 if (stru_4E3ACC[spellId].uType == pObjectList->pObjects[i].uObjectID)
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
756 {
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
757 return i;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
758 break;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
759 }
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
760 }
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
761 return 0;
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
762 }
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
763
f135ff4decbb Actor::AI_SpellAttack finishing cleanup
Grumpy7
parents: 1858
diff changeset
764
0
Ritor1
parents:
diff changeset
765 //----- (0043ABB0) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
766 bool Actor::ArePeasantsOfSameFaction(Actor *a1, Actor *a2)
0
Ritor1
parents:
diff changeset
767 {
Ritor1
parents:
diff changeset
768 unsigned int v2; // esi@1
Ritor1
parents:
diff changeset
769 unsigned int v3; // edi@1
Ritor1
parents:
diff changeset
770
Ritor1
parents:
diff changeset
771 v2 = a1->uAlly;
Ritor1
parents:
diff changeset
772 v3 = a2->uAlly;
Ritor1
parents:
diff changeset
773 if ( !v2 )
Ritor1
parents:
diff changeset
774 v2 = (a1->pMonsterInfo.uID - 1) / 3 + 1;
Ritor1
parents:
diff changeset
775 if ( !v3 )
Ritor1
parents:
diff changeset
776 v3 = (a2->pMonsterInfo.uID - 1) / 3 + 1;
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
777 if ( v2 >= 39 && v2 <= 44 && v3 >= 39 && v3 <= 44
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
778 || v2 >= 45 && v2 <= 50 && v3 >= 45 && v3 <= 50
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
779 || v2 >= 51 && v2 <= 62 && v3 >= 51 && v3 <= 62
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
780 || v2 >= 78 && v2 <= 83 && v3 >= 78 && v3 <= 83
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
781 || v2 == v3
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
782 )
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
783 return true;
0
Ritor1
parents:
diff changeset
784 else
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
785 return false;
0
Ritor1
parents:
diff changeset
786 }
Ritor1
parents:
diff changeset
787
Ritor1
parents:
diff changeset
788 //----- (0043AC45) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
789 void Actor::AggroSurroundingPeasants(unsigned int uActorID, int a2)
0
Ritor1
parents:
diff changeset
790 {
Ritor1
parents:
diff changeset
791 int v4; // ebx@8
Ritor1
parents:
diff changeset
792 int v5; // ST1C_4@8
Ritor1
parents:
diff changeset
793 int v6; // eax@8
Ritor1
parents:
diff changeset
794
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
795 int x = 0; BYTE2(x) |= 8u;
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
796 int y = 0; y |= 0x80000;
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
797 Actor* victim = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
798 if ( a2 == 1 )
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
799 victim->uAttributes |= 0x80000;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
800
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
801 for (uint i = 0; i < uNumActors; ++i)
0
Ritor1
parents:
diff changeset
802 {
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
803 Actor* actor = &pActors[i];
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
804 if (!actor->CanAct() || i == uActorID)
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
805 continue;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
806
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
807 if (Actor::ArePeasantsOfSameFaction(victim, actor))
0
Ritor1
parents:
diff changeset
808 {
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
809 v4 = abs(actor->vPosition.x - victim->vPosition.x);
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
810 v5 = abs(actor->vPosition.y - victim->vPosition.y);
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
811 v6 = abs(actor->vPosition.z - victim->vPosition.z);
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
812 if (int_get_vector_length(v4, v5, v6) < 4096)
0
Ritor1
parents:
diff changeset
813 {
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
814 actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
815 if ( a2 == 1 )
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
816 actor->uAttributes |= 0x80000;
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1860
diff changeset
817
0
Ritor1
parents:
diff changeset
818 }
Ritor1
parents:
diff changeset
819 }
Ritor1
parents:
diff changeset
820 }
Ritor1
parents:
diff changeset
821 }
Ritor1
parents:
diff changeset
822
Ritor1
parents:
diff changeset
823 //----- (00404874) --------------------------------------------------------
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
824 void Actor::AI_RangedAttack( unsigned int uActorID, struct AIDirection *pDir, int type, char a4 )
0
Ritor1
parents:
diff changeset
825 {
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
826 Actor *actPtr; // esi@1
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
827 char specAb; // al@1
0
Ritor1
parents:
diff changeset
828 int v13; // edx@28
Ritor1
parents:
diff changeset
829
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
830 actPtr = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
831
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
832 SpriteObject a1; // [sp+Ch] [bp-74h]@1
0
Ritor1
parents:
diff changeset
833
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
834 switch ( type )
0
Ritor1
parents:
diff changeset
835 {
Ritor1
parents:
diff changeset
836 case 1:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
837 a1.uType = 545;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
838 break;
0
Ritor1
parents:
diff changeset
839 case 2:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
840 a1.uType = 550;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
841 break;
0
Ritor1
parents:
diff changeset
842 case 3:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
843 a1.uType = 510;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
844 break;
0
Ritor1
parents:
diff changeset
845 case 4:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
846 a1.uType = 500;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
847 break;
0
Ritor1
parents:
diff changeset
848 case 5:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
849 a1.uType = 515;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
850 break;
0
Ritor1
parents:
diff changeset
851 case 6:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
852 a1.uType = 505;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
853 break;
0
Ritor1
parents:
diff changeset
854 case 7:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
855 a1.uType = 530;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
856 break;
0
Ritor1
parents:
diff changeset
857 case 8:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
858 a1.uType = 525;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
859 break;
0
Ritor1
parents:
diff changeset
860 case 9:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
861 a1.uType = 520;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
862 break;
0
Ritor1
parents:
diff changeset
863 case 10:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
864 a1.uType = 535;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
865 break;
0
Ritor1
parents:
diff changeset
866 case 11:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
867 a1.uType = 540;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
868 break;
0
Ritor1
parents:
diff changeset
869 case 13:
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
870 a1.uType = 555;
0
Ritor1
parents:
diff changeset
871 break;
Ritor1
parents:
diff changeset
872 default:
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
873 return;
0
Ritor1
parents:
diff changeset
874 }
1932
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
875 bool found = false;
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
876 for ( uint i = 0; i < pObjectList->uNumObjects; i++)
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
877 {
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
878 if (pObjectList->pObjects[i].uObjectID == a1.uType)
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
879 {
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
880 a1.uObjectDescID = i;
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
881 found = true;
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
882 break;
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
883 }
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
884 }
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
885 if (!found)
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
886 {
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
887 Error("Item not found");
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
888 return;
28b8ecb5dac6 Fixing bug in Actor::AI_RangedAttack introduced by me
Grumpy7
parents: 1931
diff changeset
889 }
0
Ritor1
parents:
diff changeset
890 a1.stru_24.Reset();
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
891 a1.vPosition.x = actPtr->vPosition.x;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
892 a1.spell_id = 0;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
893 a1.vPosition.y = actPtr->vPosition.y;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
894 a1.spell_level = 0;
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
895 a1.spell_skill = 0;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
896 a1.vPosition.z = actPtr->vPosition.z - (unsigned int)(actPtr->uActorHeight * -0.75);
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
897 a1.uFacing = pDir->uYawAngle;
0
Ritor1
parents:
diff changeset
898 a1.uSoundID = 0;
Ritor1
parents:
diff changeset
899 a1.uAttributes = 0;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
900 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, a1.vPosition.z);
0
Ritor1
parents:
diff changeset
901 a1.uSpriteFrameID = 0;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
902 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
823
c1da83d8223f More spell renames
Nomad
parents: 822
diff changeset
903 a1.spell_target_pid = 0;
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
904 if (pDir->uDistance < 307.2 )
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
905 a1.field_60_distance_related_prolly_lod = 0;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
906 else if ( pDir->uDistance < 1024 )
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
907 a1.field_60_distance_related_prolly_lod = 1;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
908 else if ( pDir->uDistance < 2560 )
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
909 a1.field_60_distance_related_prolly_lod = 2;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
910 else
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
911 a1.field_60_distance_related_prolly_lod = 3;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
912
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
913 a1.field_61 = a4;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
914 a1.Create(
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
915 pDir->uYawAngle,
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
916 pDir->uPitchAngle,
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
917 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
918 0);
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
919 if ( actPtr->pMonsterInfo.uSpecialAbilityType == 1 )
0
Ritor1
parents:
diff changeset
920 {
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
921 specAb = actPtr->pMonsterInfo.uSpecialAbilityDamageDiceBonus;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
922 if ( specAb == 2 )
0
Ritor1
parents:
diff changeset
923 {
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
924 a1.vPosition.z += 40;
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
925 v13 = pDir->uYawAngle;
0
Ritor1
parents:
diff changeset
926 }
Ritor1
parents:
diff changeset
927 else
Ritor1
parents:
diff changeset
928 {
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
929 if ( specAb != 3 )
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
930 return;
0
Ritor1
parents:
diff changeset
931 a1.Create(
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
932 pDir->uYawAngle + 30, //TODO find out why the YawAngle change
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
933 pDir->uPitchAngle,
0
Ritor1
parents:
diff changeset
934 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
Ritor1
parents:
diff changeset
935 0);
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
936 v13 = pDir->uYawAngle - 30;
0
Ritor1
parents:
diff changeset
937 }
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
938 a1.Create(
0
Ritor1
parents:
diff changeset
939 v13,
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
940 pDir->uPitchAngle,
0
Ritor1
parents:
diff changeset
941 pObjectList->pObjects[(signed __int16)a1.uObjectDescID].uSpeed,
Ritor1
parents:
diff changeset
942 0);
Ritor1
parents:
diff changeset
943 }
1862
a2bdc17ffd2f Actor::AI_RangedAttack cleaned up
Grumpy7
parents: 1861
diff changeset
944 return;
0
Ritor1
parents:
diff changeset
945 }
Ritor1
parents:
diff changeset
946
Ritor1
parents:
diff changeset
947 //----- (00404736) --------------------------------------------------------
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
948 void Actor::Explode( unsigned int uActorID )
0
Ritor1
parents:
diff changeset
949 {
Ritor1
parents:
diff changeset
950 Actor *v1; // esi@1
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
951 SpriteObject a1; // [sp+Ch] [bp-78h]@1
0
Ritor1
parents:
diff changeset
952
Ritor1
parents:
diff changeset
953 v1 = &pActors[uActorID];
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
954 a1.uType = 600;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
955 a1.uObjectDescID = GetObjDescId(a1.uType);
0
Ritor1
parents:
diff changeset
956 a1.stru_24.Reset();
Ritor1
parents:
diff changeset
957 a1.vPosition.y = v1->vPosition.y;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
958 a1.spell_id = 0;
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
959 a1.spell_level = 0;
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 781
diff changeset
960 a1.spell_skill = 0;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
961 a1.vPosition.x = v1->vPosition.x;
0
Ritor1
parents:
diff changeset
962 a1.uFacing = 0;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
963 a1.vPosition.z = v1->vPosition.z - (unsigned int)(v1->uActorHeight * -0.75);
0
Ritor1
parents:
diff changeset
964 a1.uSoundID = 0;
Ritor1
parents:
diff changeset
965 a1.uAttributes = 0;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
966 a1.uSectorID = pIndoor->GetSector(a1.vPosition.x, a1.vPosition.y, a1.vPosition.z);
0
Ritor1
parents:
diff changeset
967 a1.uSpriteFrameID = 0;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
968 a1.spell_caster_pid = PID(OBJECT_Actor, uActorID);
823
c1da83d8223f More spell renames
Nomad
parents: 822
diff changeset
969 a1.spell_target_pid = 0;
0
Ritor1
parents:
diff changeset
970 a1.field_60_distance_related_prolly_lod = 3;
Ritor1
parents:
diff changeset
971 a1.field_61 = 4;
1863
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
972 a1.Create(0, 0, 0, 0);
97b75e6100ff Actor::Explode cleaned up
Grumpy7
parents: 1862
diff changeset
973 return;
0
Ritor1
parents:
diff changeset
974 }
Ritor1
parents:
diff changeset
975
Ritor1
parents:
diff changeset
976 //----- (004040E9) --------------------------------------------------------
Ritor1
parents:
diff changeset
977 // // Get direction vector from object1 to object2,
Ritor1
parents:
diff changeset
978 // // distance from object1 to object2 and Euler angles of the direction vector
Ritor1
parents:
diff changeset
979 // //
Ritor1
parents:
diff changeset
980 // //
Ritor1
parents:
diff changeset
981 // // object1 & object2 format : objectType | (objectID << 3)
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 488
diff changeset
982 // // objectType == 2 - SpriteObject
0
Ritor1
parents:
diff changeset
983 // // objectType == 3 - Actor
Ritor1
parents:
diff changeset
984 // // objectType == 4 - Party
Ritor1
parents:
diff changeset
985 // // objectType == 5 - Decoration
Ritor1
parents:
diff changeset
986 // //
Ritor1
parents:
diff changeset
987 // // originally this function had following prototype:
Ritor1
parents:
diff changeset
988 // // struct DirectionInfo GetDirectionInfo(signed int object1, signed int object2, signed int a4)
Ritor1
parents:
diff changeset
989 // // but compiler converts functions returning structures by value in the such way
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
990 void Actor::GetDirectionInfo( unsigned int uObj1ID, unsigned int uObj2ID, struct AIDirection *pOut, int a4 )
0
Ritor1
parents:
diff changeset
991 {
Ritor1
parents:
diff changeset
992 signed int v4; // eax@1
1336
Ritor1
parents: 1323
diff changeset
993 signed int v5; // ecx@1
0
Ritor1
parents:
diff changeset
994 int v18; // edx@15
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
995 float v31; // st7@45
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
996 float v32; // st6@45
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
997 float v33; // st7@45
0
Ritor1
parents:
diff changeset
998 Vec3_int_ v37; // [sp-10h] [bp-5Ch]@15
Ritor1
parents:
diff changeset
999 AIDirection v41; // [sp+14h] [bp-38h]@46
1336
Ritor1
parents: 1323
diff changeset
1000 float outy2; // [sp+38h] [bp-14h]@33
Ritor1
parents: 1323
diff changeset
1001 float outx2; // [sp+3Ch] [bp-10h]@33
0
Ritor1
parents:
diff changeset
1002 int outz; // [sp+40h] [bp-Ch]@6
Ritor1
parents:
diff changeset
1003 int outy; // [sp+44h] [bp-8h]@6
Ritor1
parents:
diff changeset
1004 int outx; // [sp+48h] [bp-4h]@6
Ritor1
parents:
diff changeset
1005 float a4a; // [sp+58h] [bp+Ch]@45
Ritor1
parents:
diff changeset
1006
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1007 v4 = PID_ID(uObj1ID);
1336
Ritor1
parents: 1323
diff changeset
1008 //v6 = uObj2ID;
Ritor1
parents: 1323
diff changeset
1009 v5 = PID_ID(uObj2ID);
Ritor1
parents: 1323
diff changeset
1010 switch( PID_TYPE(uObj1ID) )
0
Ritor1
parents:
diff changeset
1011 {
1336
Ritor1
parents: 1323
diff changeset
1012 case OBJECT_Item:
Ritor1
parents: 1323
diff changeset
1013 {
Ritor1
parents: 1323
diff changeset
1014 outx = pSpriteObjects[v4].vPosition.x;
Ritor1
parents: 1323
diff changeset
1015 outy = pSpriteObjects[v4].vPosition.y;
Ritor1
parents: 1323
diff changeset
1016 outz = pSpriteObjects[v4].vPosition.z;
Ritor1
parents: 1323
diff changeset
1017 break;
Ritor1
parents: 1323
diff changeset
1018 }
Ritor1
parents: 1323
diff changeset
1019 case OBJECT_Actor:
Ritor1
parents: 1323
diff changeset
1020 {
Ritor1
parents: 1323
diff changeset
1021 outx = pActors[v4].vPosition.x;
Ritor1
parents: 1323
diff changeset
1022 outy = pActors[v4].vPosition.y;
Ritor1
parents: 1323
diff changeset
1023 outz = pActors[v4].vPosition.z - (unsigned int)(signed __int64)((double)pActors[v4].uActorHeight * -0.75);
Ritor1
parents: 1323
diff changeset
1024 break;
Ritor1
parents: 1323
diff changeset
1025 }
Ritor1
parents: 1323
diff changeset
1026 case OBJECT_Player:
Ritor1
parents: 1323
diff changeset
1027 {
Ritor1
parents: 1323
diff changeset
1028 if ( !v4 )
Ritor1
parents: 1323
diff changeset
1029 {
Ritor1
parents: 1323
diff changeset
1030 outx = pParty->vPosition.x;
Ritor1
parents: 1323
diff changeset
1031 outy = pParty->vPosition.y;
Ritor1
parents: 1323
diff changeset
1032 outz = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
Ritor1
parents: 1323
diff changeset
1033 break;
Ritor1
parents: 1323
diff changeset
1034 }
Ritor1
parents: 1323
diff changeset
1035 if ( v4 == 4 )
Ritor1
parents: 1323
diff changeset
1036 {
Ritor1
parents: 1323
diff changeset
1037 v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
Ritor1
parents: 1323
diff changeset
1038 v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1039 v37.x = pParty->vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1040 v37.y = pParty->vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1041 Vec3_int_::Rotate(24, v18, 0, v37, &outx, &outy, &outz);
Ritor1
parents: 1323
diff changeset
1042 break;
Ritor1
parents: 1323
diff changeset
1043 }
Ritor1
parents: 1323
diff changeset
1044 if ( v4 == 3 )
Ritor1
parents: 1323
diff changeset
1045 {
Ritor1
parents: 1323
diff changeset
1046 v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
Ritor1
parents: 1323
diff changeset
1047 v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1048 v37.x = pParty->vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1049 v37.y = pParty->vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1050 Vec3_int_::Rotate(8, v18, 0, v37, &outx, &outy, &outz);
Ritor1
parents: 1323
diff changeset
1051 break;
Ritor1
parents: 1323
diff changeset
1052 }
Ritor1
parents: 1323
diff changeset
1053 if ( v4 == 2 )
Ritor1
parents: 1323
diff changeset
1054 {
Ritor1
parents: 1323
diff changeset
1055 v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
Ritor1
parents: 1323
diff changeset
1056 v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1057 v37.x = pParty->vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1058 v37.y = pParty->vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1059 Vec3_int_::Rotate(8, v18, 0, v37, &outx, &outy, &outz);
Ritor1
parents: 1323
diff changeset
1060 break;
Ritor1
parents: 1323
diff changeset
1061 }
Ritor1
parents: 1323
diff changeset
1062 if ( v4 == 1 )
Ritor1
parents: 1323
diff changeset
1063 {
Ritor1
parents: 1323
diff changeset
1064 v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
Ritor1
parents: 1323
diff changeset
1065 v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1066 v37.x = pParty->vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1067 v37.y = pParty->vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1068 Vec3_int_::Rotate(24, v18, 0, v37, &outx, &outy, &outz);
Ritor1
parents: 1323
diff changeset
1069 break;
Ritor1
parents: 1323
diff changeset
1070 }
Ritor1
parents: 1323
diff changeset
1071 }
Ritor1
parents: 1323
diff changeset
1072 case OBJECT_Decoration:
Ritor1
parents: 1323
diff changeset
1073 {
Ritor1
parents: 1323
diff changeset
1074 outx = pLevelDecorations[v4].vPosition.x;
Ritor1
parents: 1323
diff changeset
1075 outy = pLevelDecorations[v4].vPosition.y;
Ritor1
parents: 1323
diff changeset
1076 outz = pLevelDecorations[v4].vPosition.z;
Ritor1
parents: 1323
diff changeset
1077 break;
Ritor1
parents: 1323
diff changeset
1078 }
Ritor1
parents: 1323
diff changeset
1079 default:
Ritor1
parents: 1323
diff changeset
1080 {
Ritor1
parents: 1323
diff changeset
1081 outz = 0;
Ritor1
parents: 1323
diff changeset
1082 outy = 0;
Ritor1
parents: 1323
diff changeset
1083 outx = 0;
Ritor1
parents: 1323
diff changeset
1084 break;
Ritor1
parents: 1323
diff changeset
1085 }
Ritor1
parents: 1323
diff changeset
1086 case OBJECT_BModel:
Ritor1
parents: 1323
diff changeset
1087 {
Ritor1
parents: 1323
diff changeset
1088 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
Ritor1
parents: 1323
diff changeset
1089 {
Ritor1
parents: 1323
diff changeset
1090 outx = (pIndoor->pFaces[v4].pBounding.x1 + pIndoor->pFaces[v4].pBounding.x2) >> 1;
Ritor1
parents: 1323
diff changeset
1091 outy = (pIndoor->pFaces[v4].pBounding.y1 + pIndoor->pFaces[v4].pBounding.y2) >> 1;
Ritor1
parents: 1323
diff changeset
1092 outz = (pIndoor->pFaces[v4].pBounding.z1 + pIndoor->pFaces[v4].pBounding.z2) >> 1;
Ritor1
parents: 1323
diff changeset
1093 }
Ritor1
parents: 1323
diff changeset
1094 break;
Ritor1
parents: 1323
diff changeset
1095 }
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
1096 }
1336
Ritor1
parents: 1323
diff changeset
1097
Ritor1
parents: 1323
diff changeset
1098 switch( PID_TYPE(uObj2ID) )
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
1099 {
1336
Ritor1
parents: 1323
diff changeset
1100 case OBJECT_Item:
Ritor1
parents: 1323
diff changeset
1101 {
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1102 outx2 = (float)pSpriteObjects[v5].vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1103 outy2 =(float) pSpriteObjects[v5].vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1104 a4 = pSpriteObjects[v5].vPosition.z;
Ritor1
parents: 1323
diff changeset
1105 break;
Ritor1
parents: 1323
diff changeset
1106 }
Ritor1
parents: 1323
diff changeset
1107 case OBJECT_Actor:
Ritor1
parents: 1323
diff changeset
1108 {
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1109 outx2 = (float)pActors[v5].vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1110 outy2 = (float)pActors[v5].vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1111 a4 = pActors[v5].vPosition.z - (unsigned int)(signed __int64)((double)pActors[v5].uActorHeight * -0.75);
Ritor1
parents: 1323
diff changeset
1112 break;
Ritor1
parents: 1323
diff changeset
1113 }
Ritor1
parents: 1323
diff changeset
1114 case OBJECT_Player:
Ritor1
parents: 1323
diff changeset
1115 {
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1116 outx2 = (float)pParty->vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1117 outy2 = (float)pParty->vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1118 if ( !a4 )
Ritor1
parents: 1323
diff changeset
1119 a4 = pParty->sEyelevel;
Ritor1
parents: 1323
diff changeset
1120 a4 = pParty->vPosition.z + a4;
Ritor1
parents: 1323
diff changeset
1121 break;
Ritor1
parents: 1323
diff changeset
1122 }
Ritor1
parents: 1323
diff changeset
1123 case OBJECT_Decoration:
Ritor1
parents: 1323
diff changeset
1124 {
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1125 outx2 = (float)pLevelDecorations[v5].vPosition.x;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1126 outy2 = (float)pLevelDecorations[v5].vPosition.y;
1336
Ritor1
parents: 1323
diff changeset
1127 a4 = pLevelDecorations[v5].vPosition.z;
Ritor1
parents: 1323
diff changeset
1128 break;
Ritor1
parents: 1323
diff changeset
1129 }
Ritor1
parents: 1323
diff changeset
1130 default:
Ritor1
parents: 1323
diff changeset
1131 {
Ritor1
parents: 1323
diff changeset
1132 outx2 = 0.0;
Ritor1
parents: 1323
diff changeset
1133 outy2 = 0.0;
Ritor1
parents: 1323
diff changeset
1134 a4 = 0;
Ritor1
parents: 1323
diff changeset
1135 break;
Ritor1
parents: 1323
diff changeset
1136 }
Ritor1
parents: 1323
diff changeset
1137 case OBJECT_BModel:
Ritor1
parents: 1323
diff changeset
1138 {
Ritor1
parents: 1323
diff changeset
1139 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
Ritor1
parents: 1323
diff changeset
1140 {
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1141 outx2 = (float)((pIndoor->pFaces[v5].pBounding.x1 + pIndoor->pFaces[v5].pBounding.x2) >> 1);
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1142 outy2 = (float)((pIndoor->pFaces[v5].pBounding.y1 + pIndoor->pFaces[v5].pBounding.y2) >> 1);
1336
Ritor1
parents: 1323
diff changeset
1143 a4 = (pIndoor->pFaces[v5].pBounding.z1 + pIndoor->pFaces[v5].pBounding.z2) >> 1;
Ritor1
parents: 1323
diff changeset
1144 }
Ritor1
parents: 1323
diff changeset
1145 break;
Ritor1
parents: 1323
diff changeset
1146 }
0
Ritor1
parents:
diff changeset
1147 }
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
1148
1864
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1149 v31 = (float)outx2 - (float)outx;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1150 v32 = (float)outy2 - (float)outy;
b6258f64e313 Actor::GetDirectionInfo some minor changes
Grumpy7
parents: 1863
diff changeset
1151 a4a = (float)a4 - (float)outz;
1336
Ritor1
parents: 1323
diff changeset
1152 outx2 = v32 * v32;
Ritor1
parents: 1323
diff changeset
1153 outy2 = v31 * v31;
Ritor1
parents: 1323
diff changeset
1154 v33 = sqrt(a4a * a4a + outy2 + outx2);
0
Ritor1
parents:
diff changeset
1155 if ( v33 <= 1.0 )
Ritor1
parents:
diff changeset
1156 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1157 pOut->vDirection.x = 65536;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1158 pOut->vDirection.y = 0;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1159 pOut->vDirection.z = 0;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1160 pOut->uDistance = 1;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1161 pOut->uDistanceXZ = 1;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1162 pOut->uYawAngle = 0;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1163 pOut->uPitchAngle = 0;
0
Ritor1
parents:
diff changeset
1164 }
Ritor1
parents:
diff changeset
1165 else
Ritor1
parents:
diff changeset
1166 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1167 pOut->vDirection.x = (int32_t)(1.0 / v33 * v31 * 65536.0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1168 pOut->vDirection.y = (int32_t)(1.0 / v33 * v32 * 65536.0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1169 pOut->vDirection.z = (int32_t)(1.0 / v33 * a4a * 65536.0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1170 pOut->uDistance = (uint)v33;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1171 pOut->uDistanceXZ = (uint)sqrt(outy2 + outx2);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1172 pOut->uYawAngle = stru_5C6E00->Atan2((signed __int64)v31, (signed __int64)v32);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1173 pOut->uPitchAngle = stru_5C6E00->Atan2(pOut->uDistanceXZ, (signed __int64)a4a);
0
Ritor1
parents:
diff changeset
1174 }
Ritor1
parents:
diff changeset
1175 }
Ritor1
parents:
diff changeset
1176
Ritor1
parents:
diff changeset
1177 //----- (00404030) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1178 void Actor::AI_FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, AIDirection *a4)
0
Ritor1
parents:
diff changeset
1179 {
Ritor1
parents:
diff changeset
1180 AIDirection *v7; // eax@3
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1181 AIDirection v1; // eax@3
0
Ritor1
parents:
diff changeset
1182 Actor *v9; // ebx@3
Ritor1
parents:
diff changeset
1183 AIDirection a3; // [sp+8h] [bp-38h]@4
Ritor1
parents:
diff changeset
1184
Ritor1
parents:
diff changeset
1185 if ( rand() % 100 >= 5 )
Ritor1
parents:
diff changeset
1186 {
1865
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1187 v9 = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
1188 if ( !a4 )
Ritor1
parents:
diff changeset
1189 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1190 Actor::GetDirectionInfo(PID(OBJECT_Actor, uActorID), uObjID, &v1, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1191 v7 = &v1;
1865
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1192 }
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1193 else
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1194 {
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1195 v7 = a4;
0
Ritor1
parents:
diff changeset
1196 }
1865
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1197 v9->uYawAngle = v7->uYawAngle;
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1198 v9->uCurrentActionTime = 0;
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1199 v9->vVelocity.z = 0;
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1200 v9->vVelocity.y = 0;
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1201 v9->vVelocity.x = 0;
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1202 v9->uPitchAngle = v7->uPitchAngle;
0
Ritor1
parents:
diff changeset
1203 v9->uCurrentActionLength = 256;
Ritor1
parents:
diff changeset
1204 v9->uAIState = Interacting;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1205 v9->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1206 }
Ritor1
parents:
diff changeset
1207 else
1865
e622546c8f0c Actor::AI_FaceObject cleanup
Grumpy7
parents: 1864
diff changeset
1208 Actor::AI_Bored(uActorID, uObjID, a4);
0
Ritor1
parents:
diff changeset
1209 }
Ritor1
parents:
diff changeset
1210
Ritor1
parents:
diff changeset
1211 //----- (00403F58) --------------------------------------------------------
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
1212 void Actor::AI_StandOrBored(unsigned int uActorID, signed int uObjID, int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
1213 {
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1214 if (rand() % 2)
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
1215 AI_Bored(uActorID, uObjID, a4);
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1216 else
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
1217 AI_Stand(uActorID, uObjID, uActionLength, a4);
0
Ritor1
parents:
diff changeset
1218 }
Ritor1
parents:
diff changeset
1219
Ritor1
parents:
diff changeset
1220 //----- (00403EB6) --------------------------------------------------------
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1221 void Actor::AI_Stand(unsigned int uActorID, unsigned int object_to_face_pid, unsigned int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
1222 {
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1223 assert(uActorID < uNumActors);
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1974
diff changeset
1224 Actor* actor = &pActors[uActorID];
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1225
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1226 AIDirection a3;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1227 if (!a4)
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1228 {
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1229 Actor::GetDirectionInfo(PID(OBJECT_Actor, uActorID), object_to_face_pid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1230 a4 = &a3;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1231 }
0
Ritor1
parents:
diff changeset
1232
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1233 actor->uAIState = Standing;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1234 if (!uActionLength)
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1235 actor->uCurrentActionLength = rand() % 256 + 256;
0
Ritor1
parents:
diff changeset
1236 else
413
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1237 actor->uCurrentActionLength = uActionLength;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1238 actor->uCurrentActionTime = 0;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1239 actor->uYawAngle = a4->uYawAngle;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1240 actor->uPitchAngle = a4->uPitchAngle;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1241 actor->vVelocity.z = 0;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1242 actor->vVelocity.y = 0;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1243 actor->vVelocity.x = 0;
111f25d1cc04 AI_Stand
Nomad
parents: 402
diff changeset
1244 actor->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1245 }
Ritor1
parents:
diff changeset
1246
Ritor1
parents:
diff changeset
1247 //----- (00403E61) --------------------------------------------------------
Ritor1
parents:
diff changeset
1248 void __fastcall Actor::StandAwhile(unsigned int uActorID)
Ritor1
parents:
diff changeset
1249 {
1763
Ritor1
parents: 1761
diff changeset
1250 pActors[uActorID].uCurrentActionLength = rand() % 128 + 128;
Ritor1
parents: 1761
diff changeset
1251 pActors[uActorID].uCurrentActionTime = 0;
Ritor1
parents: 1761
diff changeset
1252 pActors[uActorID].uAIState = Standing;
Ritor1
parents: 1761
diff changeset
1253 pActors[uActorID].vVelocity.z = 0;
Ritor1
parents: 1761
diff changeset
1254 pActors[uActorID].vVelocity.y = 0;
Ritor1
parents: 1761
diff changeset
1255 pActors[uActorID].vVelocity.x = 0;
Ritor1
parents: 1761
diff changeset
1256 pActors[uActorID].UpdateAnimation();
0
Ritor1
parents:
diff changeset
1257 }
Ritor1
parents:
diff changeset
1258
Ritor1
parents:
diff changeset
1259 //----- (00403C6C) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1260 void Actor::AI_MeleeAttack(unsigned int uActorID, signed int sTargetPid, struct AIDirection *arg0)
0
Ritor1
parents:
diff changeset
1261 {
Ritor1
parents:
diff changeset
1262 Actor *v3; // ebx@1
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1263 int16_t v6; // esi@6
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1264 int16_t v7; // edi@6
0
Ritor1
parents:
diff changeset
1265 signed int v8; // eax@7
Ritor1
parents:
diff changeset
1266 Vec3_int_ v10; // ST04_12@9
Ritor1
parents:
diff changeset
1267 AIDirection *v12; // eax@11
Ritor1
parents:
diff changeset
1268 AIDirection a3; // [sp+Ch] [bp-48h]@12
Ritor1
parents:
diff changeset
1269 AIDirection v20; // [sp+28h] [bp-2Ch]@12
Ritor1
parents:
diff changeset
1270 int v23; // [sp+4Ch] [bp-8h]@6
Ritor1
parents:
diff changeset
1271 unsigned int v25; // [sp+5Ch] [bp+8h]@13
Ritor1
parents:
diff changeset
1272
Ritor1
parents:
diff changeset
1273 v3 = &pActors[uActorID];
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1274 if ( v3->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY && v3->pMonsterInfo.uAIType == 1 )
0
Ritor1
parents:
diff changeset
1275 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1276 Actor::AI_Stand(uActorID, sTargetPid, 0, arg0);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1277 return;
0
Ritor1
parents:
diff changeset
1278 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1279
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1280 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1281 {
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1282 v8 = PID_ID(sTargetPid);
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1283 v6 = pActors[v8].vPosition.x;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1284 v7 = pActors[v8].vPosition.y;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1285 v23 = (int)(pActors[v8].uActorHeight * 0.75 + pActors[v8].vPosition.z);
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1286 }
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1287 else if ( PID_TYPE(sTargetPid) == OBJECT_Player)
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1288 {
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1289 v6 = pParty->vPosition.x;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1290 v7 = pParty->vPosition.y;
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1291 v23 = pParty->vPosition.z + pParty->sEyelevel;
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1292 }
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1293 else
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1294 {
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1295 Error("Should not get here");
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1296 return;
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1297 }
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1298 v10.z = (int32_t)(v3->uActorHeight * 0.75 + v3->vPosition.z);
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1299 v10.y = v3->vPosition.y;
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1300 v10.x = v3->vPosition.x;
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1301
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1302 if ( sub_407A1C((int)v6, (int)v7, v23, v10) )
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1303 {
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1304 if (arg0 != nullptr)
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1305 {
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1306 v12 = arg0;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1307 }
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1308 else
0
Ritor1
parents:
diff changeset
1309 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1310 Actor::GetDirectionInfo(PID(OBJECT_Actor, uActorID), sTargetPid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1311 v12 = &a3;
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1312 }
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1313 v3->uYawAngle = LOWORD(v12->uYawAngle);
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1314 v3->uCurrentActionLength = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkMelee]].uAnimLength * 8;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1315 v3->uCurrentActionTime = 0;
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1316 v3->uAIState = AttackingMelee;
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1317 Actor::PlaySound(uActorID, 0);
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1318 v25 = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1319 if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1320 {
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1321 v25 *= 2;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1322 }
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1323 if ( pParty->bTurnBasedModeOn != 1 )
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1324 {
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1325 v3->pMonsterInfo.uRecoveryTime = (int)(flt_6BE3A8_debug_recmod2 * v25 * 2.133333333333333);
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1326 }
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1327 else
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1328 {
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1329 v3->pMonsterInfo.uRecoveryTime = v25;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1330 }
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1331 v3->vVelocity.z = 0;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1332 v3->vVelocity.y = 0;
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1333 v3->vVelocity.x = 0;
849
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1334 v3->UpdateAnimation();
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1335 }
8fafe3645f36 * PID replaces
zipi
parents: 848
diff changeset
1336 else
1871
e26d8d15ef30 Actor::AI_MeleeAttack cleaned up
Grumpy7
parents: 1870
diff changeset
1337 Actor::AI_Pursue1(uActorID, sTargetPid, rand() % 2, 64, arg0);
0
Ritor1
parents:
diff changeset
1338 }
Ritor1
parents:
diff changeset
1339
Ritor1
parents:
diff changeset
1340 //----- (00438CF3) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1341 void Actor::ApplyFineForKillingPeasant(unsigned int uActorID)
0
Ritor1
parents:
diff changeset
1342 {
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1343 if ( uLevelMapStatsID == 0 || !pActors[uActorID].IsPeasant())
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1344 return;
0
Ritor1
parents:
diff changeset
1345
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1346 if ( (uLevelMapStatsID == 6 || uLevelMapStatsID == 7) && pParty->IsPartyEvil()) //celeste and bracada
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1347 return;
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1348
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1349 if ( (uLevelMapStatsID == 5 || uLevelMapStatsID == 8) && pParty->IsPartyGood()) // the pit and deyja
0
Ritor1
parents:
diff changeset
1350 return;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1351
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1352 pParty->uFine += 100 * (pMapStats->pInfos[uLevelMapStatsID]._steal_perm + pActors[uActorID].pMonsterInfo.uLevel + pParty->GetPartyReputation());
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1353 if ( pParty->uFine < 0 )
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1354 pParty->uFine = 0;
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1355 if ( pParty->uFine > 4000000 )
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1356 pParty->uFine = 4000000;
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1357
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1358 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
0
Ritor1
parents:
diff changeset
1359 {
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1360 if (pOutdoor->ddm.uReputation < 10000)
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1361 pOutdoor->ddm.uReputation++;
0
Ritor1
parents:
diff changeset
1362 }
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1363 else if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
0
Ritor1
parents:
diff changeset
1364 {
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1365 if (pIndoor->dlv.uReputation < 10000)
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1366 pIndoor->dlv.uReputation++;
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1367 }
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1368 else assert(false);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1369
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1370 if ( pParty->uFine )
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1371 {
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1372 for ( int i = 1; i <= 4; i++)
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1373 {
1873
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1374 if ( !_449B57_test_bit(pPlayers[i]->_achieved_awards_bits, 1) )
a53bd0511de2 Actor::ApplyFineForKillingPeasant cleaned up
Grumpy7
parents: 1871
diff changeset
1375 _449B7E_toggle_bit(pPlayers[i]->_achieved_awards_bits, 1, 1u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1376 }
0
Ritor1
parents:
diff changeset
1377 }
Ritor1
parents:
diff changeset
1378 }
Ritor1
parents:
diff changeset
1379
Ritor1
parents:
diff changeset
1380 //----- (0043AE80) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1381 void Actor::AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3)
0
Ritor1
parents:
diff changeset
1382 {
Ritor1
parents:
diff changeset
1383 unsigned int v4; // esi@1
Ritor1
parents:
diff changeset
1384
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
1385 v4 = PID(OBJECT_Actor,uActorID);
0
Ritor1
parents:
diff changeset
1386 switch ( a2 )
Ritor1
parents:
diff changeset
1387 {
Ritor1
parents:
diff changeset
1388 case 1:
Ritor1
parents:
diff changeset
1389 if ( a3 )
Ritor1
parents:
diff changeset
1390 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1391 pOtherOverlayList->_4418B6(904, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
0
Ritor1
parents:
diff changeset
1392 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1393 return;
0
Ritor1
parents:
diff changeset
1394 case 2:
Ritor1
parents:
diff changeset
1395 if ( a3 )
Ritor1
parents:
diff changeset
1396 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1397 pOtherOverlayList->_4418B6(905, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
0
Ritor1
parents:
diff changeset
1398 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1399 return;
0
Ritor1
parents:
diff changeset
1400 case 3:
Ritor1
parents:
diff changeset
1401 if ( a3 )
Ritor1
parents:
diff changeset
1402 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1403 pOtherOverlayList->_4418B6(906, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
0
Ritor1
parents:
diff changeset
1404 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1405 return;
0
Ritor1
parents:
diff changeset
1406 case 4:
Ritor1
parents:
diff changeset
1407 if ( a3 )
Ritor1
parents:
diff changeset
1408 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1409 pOtherOverlayList->_4418B6(907, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
0
Ritor1
parents:
diff changeset
1410 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1411 return;
0
Ritor1
parents:
diff changeset
1412 case 5:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1413 pOtherOverlayList->_4418B6(901, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1414 return;
0
Ritor1
parents:
diff changeset
1415 case 6:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1416 pOtherOverlayList->_4418B6(902, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1417 return;
0
Ritor1
parents:
diff changeset
1418 case 7:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1419 pOtherOverlayList->_4418B6(903, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1420 return;
0
Ritor1
parents:
diff changeset
1421 case 8:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1422 pOtherOverlayList->_4418B6(900, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1423 return;
0
Ritor1
parents:
diff changeset
1424 case 9:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1425 pOtherOverlayList->_4418B6(909, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1426 return;
0
Ritor1
parents:
diff changeset
1427 case 10:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1428 pOtherOverlayList->_4418B6(908, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1429 return;
0
Ritor1
parents:
diff changeset
1430 default:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1431 return;
0
Ritor1
parents:
diff changeset
1432 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1433 return;
0
Ritor1
parents:
diff changeset
1434 }
Ritor1
parents:
diff changeset
1435
Ritor1
parents:
diff changeset
1436 //----- (0043B3E0) --------------------------------------------------------
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1437 int Actor::_43B3E0_CalcDamage( signed int dmgSource )
0
Ritor1
parents:
diff changeset
1438 {
Ritor1
parents:
diff changeset
1439 signed int v2; // ebp@1
Ritor1
parents:
diff changeset
1440 int v3; // eax@9
Ritor1
parents:
diff changeset
1441 signed int v4; // edi@9
Ritor1
parents:
diff changeset
1442 int v5; // esi@9
Ritor1
parents:
diff changeset
1443 unsigned __int16 v8; // si@21
Ritor1
parents:
diff changeset
1444 int v9; // edi@21
Ritor1
parents:
diff changeset
1445 signed int v10; // eax@23
Ritor1
parents:
diff changeset
1446 int v11; // [sp+10h] [bp-4h]@1
Ritor1
parents:
diff changeset
1447
Ritor1
parents:
diff changeset
1448 v2 = 0;
Ritor1
parents:
diff changeset
1449 v11 = 0;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1450
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1451 switch( dmgSource )
0
Ritor1
parents:
diff changeset
1452 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1453 case 0:
1958
95095c2a5e19 pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
Grumpy7
parents: 1957
diff changeset
1454 if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
95095c2a5e19 pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
Grumpy7
parents: 1957
diff changeset
1455 v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
1962
39a68477ead3 pActorBuffs[18] to pActorBuffs[ACTOR_BUFF_HEROISM]
Grumpy7
parents: 1961
diff changeset
1456 if ( this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower > v2 )
39a68477ead3 pActorBuffs[18] to pActorBuffs[ACTOR_BUFF_HEROISM]
Grumpy7
parents: 1961
diff changeset
1457 v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower;
1965
182d49f28170 pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
Grumpy7
parents: 1964
diff changeset
1458 if ( this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime > 0 )
182d49f28170 pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
Grumpy7
parents: 1964
diff changeset
1459 v2 += this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uPower;
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1460 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1461 v4 = this->pMonsterInfo.uAttack1DamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1462 v5 = this->pMonsterInfo.uAttack1DamageBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1463 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1464 case 1:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1465 v3 = this->pMonsterInfo.uAttack2DamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1466 v4 = this->pMonsterInfo.uAttack2DamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1467 v5 = this->pMonsterInfo.uAttack2DamageBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1468 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1469 case 2:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1470 v8 = this->pMonsterInfo.uSpellSkillAndMastery1;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1471 v9 = this->pMonsterInfo.uSpell1ID;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1472 v10 = SkillToMastery(v8);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1473 return _43AFE3_calc_spell_damage(v9, v8 & 0x3F, v10, 0);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1474 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1475 case 3:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1476 v8 = this->pMonsterInfo.uSpellSkillAndMastery2;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1477 v9 = this->pMonsterInfo.uSpell2ID;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1478 v10 = SkillToMastery(v8);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1479 return _43AFE3_calc_spell_damage(v9, v8 & 0x3F, v10, 0);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1480 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1481 case 4:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1482 v3 = this->pMonsterInfo.uSpecialAbilityDamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1483 v4 = this->pMonsterInfo.uSpecialAbilityDamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1484 v5 = this->pMonsterInfo.uSpecialAbilityDamageDiceBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1485 default:
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1486 return 0;
0
Ritor1
parents:
diff changeset
1487 }
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1488 for ( int i = 0; i < v3; i++)
0
Ritor1
parents:
diff changeset
1489 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1490 v11 += rand() % v4 + 1;
0
Ritor1
parents:
diff changeset
1491 }
Ritor1
parents:
diff changeset
1492 return v11 + v5 + v2;
Ritor1
parents:
diff changeset
1493 }
Ritor1
parents:
diff changeset
1494
Ritor1
parents:
diff changeset
1495 //----- (00438B9B) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1496 bool Actor::IsPeasant()
0
Ritor1
parents:
diff changeset
1497 {
Ritor1
parents:
diff changeset
1498 unsigned int v1; // eax@1
Ritor1
parents:
diff changeset
1499
Ritor1
parents:
diff changeset
1500 v1 = this->uAlly;
Ritor1
parents:
diff changeset
1501 if ( !v1 )
Ritor1
parents:
diff changeset
1502 v1 = (this->pMonsterInfo.uID - 1) / 3 + 1;
Ritor1
parents:
diff changeset
1503 return (signed int)v1 >= 39 && (signed int)v1 <= 44
Ritor1
parents:
diff changeset
1504 || (signed int)v1 >= 45 && (signed int)v1 <= 50
Ritor1
parents:
diff changeset
1505 || (signed int)v1 >= 51 && (signed int)v1 <= 62
Ritor1
parents:
diff changeset
1506 || (signed int)v1 >= 78 && (signed int)v1 <= 83;
Ritor1
parents:
diff changeset
1507 }
Ritor1
parents:
diff changeset
1508
Ritor1
parents:
diff changeset
1509 //----- (0042EBEE) --------------------------------------------------------
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1510 void Actor::StealFrom( unsigned int uActorID )
0
Ritor1
parents:
diff changeset
1511 {
Ritor1
parents:
diff changeset
1512 Player *pPlayer; // edi@1
Ritor1
parents:
diff changeset
1513 int v4; // ebx@2
Ritor1
parents:
diff changeset
1514 unsigned int v5; // eax@2
Ritor1
parents:
diff changeset
1515 DDM_DLV_Header *v6; // esi@4
Ritor1
parents:
diff changeset
1516 int v8; // [sp+8h] [bp-4h]@6
Ritor1
parents:
diff changeset
1517
243
a6a8fa73b4ec cleaning
zipi
parents: 188
diff changeset
1518 pPlayer = &pParty->pPlayers[uActiveCharacter-1];
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1519 if ( pPlayer->CanAct() )
0
Ritor1
parents:
diff changeset
1520 {
1517
c3da3c2985b8 Clean CastSpellInfo. (1)
yoctozepto
parents: 1503
diff changeset
1521 CastSpellInfoHelpers::_427D48();
0
Ritor1
parents:
diff changeset
1522 v4 = 0;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1523 v5 = pMapStats->GetMapInfo(pCurrentMapName);
0
Ritor1
parents:
diff changeset
1524 if ( v5 )
Ritor1
parents:
diff changeset
1525 v4 = pMapStats->pInfos[v5]._steal_perm;
Ritor1
parents:
diff changeset
1526 v6 = &pOutdoor->ddm;
Ritor1
parents:
diff changeset
1527 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor)
Ritor1
parents:
diff changeset
1528 v6 = &pIndoor->dlv;
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1529 pPlayer->StealFromActor(uActorID, v4, v6->uReputation++);
0
Ritor1
parents:
diff changeset
1530 v8 = pPlayer->GetAttackRecoveryTime(0);
Ritor1
parents:
diff changeset
1531 if ( v8 < 30 )
Ritor1
parents:
diff changeset
1532 v8 = 30;
Ritor1
parents:
diff changeset
1533 if ( !pParty->bTurnBasedModeOn )
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1534 pPlayer->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * v8 * 2.133333333333333));
1448
5a5d0c713d47 some turn engine renaming
Gloval
parents: 1362
diff changeset
1535 pTurnEngine->ApplyPlayerAction();
0
Ritor1
parents:
diff changeset
1536 }
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1537 return;
0
Ritor1
parents:
diff changeset
1538 }
Ritor1
parents:
diff changeset
1539
Ritor1
parents:
diff changeset
1540 //----- (00403A60) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1541 void Actor::AI_SpellAttack2(unsigned int uActorID, signed int edx0, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1542 {
Ritor1
parents:
diff changeset
1543 Actor *v3; // ebx@1
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1544 int16_t v4; // esi@3
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1545 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1546 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1547 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1548 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1549 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1550 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1551 AIDirection v18; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1552 int v19; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1553 signed int a2; // [sp+48h] [bp-Ch]@1
Ritor1
parents:
diff changeset
1554 int v21; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1555 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1556
Ritor1
parents:
diff changeset
1557 v3 = &pActors[uActorID];
Ritor1
parents:
diff changeset
1558 a2 = edx0;
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1559 if ( PID_TYPE(edx0) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1560 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1561 v6 = PID_ID(edx0);
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1562 v4 = pActors[v6].vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1563 v5 = pActors[v6].vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1564 v21 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1565 }
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1566 else if ( PID_TYPE(edx0) == OBJECT_Player)
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1567 {
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1568 v4 = pParty->vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1569 v5 = pParty->vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1570 v21 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1571 }
Ritor1
parents:
diff changeset
1572 else
Ritor1
parents:
diff changeset
1573 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1574 Error("Should not get here");
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1575 return;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1576 }
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1577 v19 = v3->uActorHeight;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1578 v7.z = v3->vPosition.z - (int)(v19 * -0.75);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1579 v7.y = v3->vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1580 v7.x = v3->vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1581 if ( sub_407A1C(v4, v5, v21, v7) )
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1582 {
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1583 if ( pDir == nullptr)
0
Ritor1
parents:
diff changeset
1584 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1585 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), a2, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1586 v9 = &a3;
0
Ritor1
parents:
diff changeset
1587 }
Ritor1
parents:
diff changeset
1588 else
Ritor1
parents:
diff changeset
1589 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1590 v9 = pDir;
0
Ritor1
parents:
diff changeset
1591 }
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1592 v3->uYawAngle = LOWORD(v9->uYawAngle);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1593 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1594 v3->uCurrentActionLength = 8 * v13;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1595 v3->uCurrentActionTime = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1596 v3->uAIState = AttackingRanged4;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1597 Actor::PlaySound(uActorID, 0);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1598 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1599 if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
1600 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1601 pDira *= 2;
0
Ritor1
parents:
diff changeset
1602 }
Ritor1
parents:
diff changeset
1603 if ( pParty->bTurnBasedModeOn == 1 )
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1604 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1605 else
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1606 v3->pMonsterInfo.uRecoveryTime = v3->uCurrentActionLength + (int)(flt_6BE3A8_debug_recmod2 * pDira * 2.133333333333333);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1607 v3->vVelocity.z = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1608 v3->vVelocity.y = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1609 v3->vVelocity.x = 0;
2153
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
1610 if ( ShouldMonsterPlayAttackAnim(v3->pMonsterInfo.uSpell2ID) )
0
Ritor1
parents:
diff changeset
1611 {
Ritor1
parents:
diff changeset
1612 v3->uCurrentActionLength = 64;
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1613 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1614 v3->uAIState = Fidgeting;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1615 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1616 v3->uAIState = AttackingRanged4;
Ritor1
parents:
diff changeset
1617 }
Ritor1
parents:
diff changeset
1618 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1619 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1620 }
Ritor1
parents:
diff changeset
1621 else
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1622 Actor::AI_Pursue1(uActorID, a2, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1623 }
Ritor1
parents:
diff changeset
1624
Ritor1
parents:
diff changeset
1625 //----- (00403854) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1626 void Actor::AI_SpellAttack1(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1627 {
Ritor1
parents:
diff changeset
1628 Actor *v3; // ebx@1
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1629 int16_t v4; // esi@3
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1630 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1631 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1632 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1633 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1634 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1635 signed int v16; // ecx@17
Ritor1
parents:
diff changeset
1636 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1637 AIDirection v18; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1638 int v19; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1639 int v21; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1640 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1641
Ritor1
parents:
diff changeset
1642 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1643 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1644 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1645 v6 = PID_ID(sTargetPid);
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1646 v4 = pActors[v6].vPosition.x;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1647 v5 = pActors[v6].vPosition.y;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1648 v21 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1649 }
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1650 else if ( PID_TYPE(sTargetPid) == OBJECT_Player)
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1651 {
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1652 v4 = pParty->vPosition.x;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1653 v5 = pParty->vPosition.y;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1654 v21 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1655 }
Ritor1
parents:
diff changeset
1656 else
Ritor1
parents:
diff changeset
1657 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1658 Error("Should not get here");
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1659 return;
0
Ritor1
parents:
diff changeset
1660 }
Ritor1
parents:
diff changeset
1661 v19 = v3->uActorHeight;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1662 v7.z = v3->vPosition.z - (int)(v19 * -0.75);
0
Ritor1
parents:
diff changeset
1663 v7.y = v3->vPosition.y;
Ritor1
parents:
diff changeset
1664 v7.x = v3->vPosition.x;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1665 if ( sub_407A1C(v4, v5, v21, v7) )
0
Ritor1
parents:
diff changeset
1666 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1667 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
1668 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1669 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), sTargetPid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1670 v9 = &a3;
0
Ritor1
parents:
diff changeset
1671 }
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1672 else
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1673 {
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1674 v9 = pDir;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1675 }
0
Ritor1
parents:
diff changeset
1676 v3->uYawAngle = LOWORD(v9->uYawAngle);
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1677 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
0
Ritor1
parents:
diff changeset
1678 v3->uCurrentActionLength = 8 * v13;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1679 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1680 v3->uAIState = AttackingRanged3;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1681 Actor::PlaySound(uActorID, 0);
0
Ritor1
parents:
diff changeset
1682 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1683 if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
1684 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1685 pDira *= 2;
0
Ritor1
parents:
diff changeset
1686 }
Ritor1
parents:
diff changeset
1687 if ( pParty->bTurnBasedModeOn == 1 )
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1688 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1689 else
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1690 v3->pMonsterInfo.uRecoveryTime = v3->uCurrentActionLength + (int)(flt_6BE3A8_debug_recmod2 * pDira * 2.133333333333333);
0
Ritor1
parents:
diff changeset
1691 v16 = v3->pMonsterInfo.uSpell1ID;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1692 v3->vVelocity.z = 0;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1693 v3->vVelocity.y = 0;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1694 v3->vVelocity.x = 0;
2153
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
1695 if ( ShouldMonsterPlayAttackAnim(v3->pMonsterInfo.uSpell1ID) )
0
Ritor1
parents:
diff changeset
1696 {
Ritor1
parents:
diff changeset
1697 v3->uCurrentActionLength = 64;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1698 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1699 v3->uAIState = Fidgeting;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1700 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1701 v3->uAIState = AttackingRanged3;
Ritor1
parents:
diff changeset
1702 }
Ritor1
parents:
diff changeset
1703 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1704 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1705 }
Ritor1
parents:
diff changeset
1706 else
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1707 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1708 }
Ritor1
parents:
diff changeset
1709
Ritor1
parents:
diff changeset
1710 //----- (0040368B) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1711 void Actor::AI_MissileAttack2(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1712 {
Ritor1
parents:
diff changeset
1713 Actor *v3; // ebx@1
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1714 int16_t v4; // esi@3
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1715 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1716 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1717 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1718 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1719 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1720 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1721 AIDirection v17; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1722 int v18; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1723 int v20; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1724 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1725
Ritor1
parents:
diff changeset
1726 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1727 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1728 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1729 v6 = PID_ID(sTargetPid);
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1730 v4 = pActors[v6].vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1731 v5 = pActors[v6].vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1732 v20 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1733 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1734 else if ( PID_TYPE(sTargetPid) == OBJECT_Player)
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1735 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1736 v4 = pParty->vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1737 v5 = pParty->vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1738 v20 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1739 }
Ritor1
parents:
diff changeset
1740 else
Ritor1
parents:
diff changeset
1741 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1742 Error("Should not get here");
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1743 return;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1744 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1745 v18 = v3->uActorHeight;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1746 v7.z = v3->vPosition.z - (int)(v18 * -0.75);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1747 v7.y = v3->vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1748 v7.x = v3->vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1749 if ( sub_407A1C(v4, v5, v20, v7) )
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1750 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1751 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
1752 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1753 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), sTargetPid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1754 v9 = &a3;
0
Ritor1
parents:
diff changeset
1755 }
Ritor1
parents:
diff changeset
1756 else
Ritor1
parents:
diff changeset
1757 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1758 v9 = pDir;
0
Ritor1
parents:
diff changeset
1759 }
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1760 v3->uYawAngle = LOWORD(v9->uYawAngle);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1761 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1762 v3->uCurrentActionLength = 8 * v13;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1763 v3->uCurrentActionTime = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1764 v3->uAIState = AttackingRanged2;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1765 Actor::PlaySound(uActorID, 0);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1766 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1767 if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
1768 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1769 pDira *= 2;
0
Ritor1
parents:
diff changeset
1770 }
Ritor1
parents:
diff changeset
1771 if ( pParty->bTurnBasedModeOn != 1 )
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1772 v3->pMonsterInfo.uRecoveryTime = (int)(flt_6BE3A8_debug_recmod2 * pDira * 2.133333333333333);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1773 else
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1774 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1775 v3->pMonsterInfo.uRecoveryTime = pDira;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1776 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1777 v3->vVelocity.z = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1778 v3->vVelocity.y = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1779 v3->vVelocity.x = 0;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1780 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1781 }
Ritor1
parents:
diff changeset
1782 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1783 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1784 }
Ritor1
parents:
diff changeset
1785
Ritor1
parents:
diff changeset
1786 //----- (00403476) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1787 void Actor::AI_MissileAttack1(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1788 {
Ritor1
parents:
diff changeset
1789 Actor *v3; // ebx@1
Ritor1
parents:
diff changeset
1790 int v4; // esi@3
Ritor1
parents:
diff changeset
1791 int v5; // edi@3
Ritor1
parents:
diff changeset
1792 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1793 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1794 AIDirection *v10; // eax@9
Ritor1
parents:
diff changeset
1795 __int16 v14; // ax@11
Ritor1
parents:
diff changeset
1796 AIDirection a3; // [sp+Ch] [bp-48h]@10
Ritor1
parents:
diff changeset
1797 AIDirection v18; // [sp+28h] [bp-2Ch]@10
Ritor1
parents:
diff changeset
1798 int v19; // [sp+44h] [bp-10h]@6
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1799 //signed int a2; // [sp+48h] [bp-Ch]@1
0
Ritor1
parents:
diff changeset
1800 int v22; // [sp+50h] [bp-4h]@3
Ritor1
parents:
diff changeset
1801 unsigned int pDira; // [sp+5Ch] [bp+8h]@11
Ritor1
parents:
diff changeset
1802
Ritor1
parents:
diff changeset
1803 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1804 //a2 = edx0;
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1805 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1806 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1807 v6 = PID_ID(sTargetPid);
0
Ritor1
parents:
diff changeset
1808 v4 = pActors[v6].vPosition.x;
Ritor1
parents:
diff changeset
1809 v5 = pActors[v6].vPosition.y;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1810 v22 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
0
Ritor1
parents:
diff changeset
1811 }
Ritor1
parents:
diff changeset
1812 else
Ritor1
parents:
diff changeset
1813 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1814 if ( PID_TYPE(sTargetPid) == OBJECT_Player)
0
Ritor1
parents:
diff changeset
1815 {
Ritor1
parents:
diff changeset
1816 v4 = pParty->vPosition.x;
Ritor1
parents:
diff changeset
1817 v5 = pParty->vPosition.y;
Ritor1
parents:
diff changeset
1818 v22 = pParty->vPosition.z + pParty->sEyelevel;
Ritor1
parents:
diff changeset
1819 }
Ritor1
parents:
diff changeset
1820 else
Ritor1
parents:
diff changeset
1821 {
Ritor1
parents:
diff changeset
1822 v4 = (int)pDir;
Ritor1
parents:
diff changeset
1823 v5 = (int)pDir;
Ritor1
parents:
diff changeset
1824 }
Ritor1
parents:
diff changeset
1825 }
Ritor1
parents:
diff changeset
1826 v19 = v3->uActorHeight;
Ritor1
parents:
diff changeset
1827 v7.z = v3->vPosition.z - (unsigned int)(signed __int64)((double)v19 * -0.75);
Ritor1
parents:
diff changeset
1828 v7.y = v3->vPosition.y;
Ritor1
parents:
diff changeset
1829 v7.x = v3->vPosition.x;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1830 if ( sub_407A1C(v4, v5, v22, v7) || sub_407A1C(v7.x, v7.y, v7.z, Vec3_int_(v4, v5, v22)))
0
Ritor1
parents:
diff changeset
1831 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1832 if ( pDir == nullptr )
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1833 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1834 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), sTargetPid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1835 v10 = &a3;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1836 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1837 else
0
Ritor1
parents:
diff changeset
1838 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1839 v10 = pDir;
0
Ritor1
parents:
diff changeset
1840 }
Ritor1
parents:
diff changeset
1841 v3->uYawAngle = LOWORD(v10->uYawAngle);
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1842 v14 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
0
Ritor1
parents:
diff changeset
1843 v3->uCurrentActionLength = 8 * v14;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1844 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1845 v3->uAIState = AttackingRanged1;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1846 Actor::PlaySound(uActorID, 0);
0
Ritor1
parents:
diff changeset
1847 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1848 if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
1849 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1850 pDira *= 2;
0
Ritor1
parents:
diff changeset
1851 }
Ritor1
parents:
diff changeset
1852 if ( pParty->bTurnBasedModeOn == 1 )
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1853 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1854 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1855 v3->pMonsterInfo.uRecoveryTime = v3->uCurrentActionLength - (int)(flt_6BE3A8_debug_recmod2 * pDira * -2.133333333333333);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1856 v3->vVelocity.z = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1857 v3->vVelocity.y = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1858 v3->vVelocity.x = 0;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1859 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1860 }
Ritor1
parents:
diff changeset
1861 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1862 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1863 }
Ritor1
parents:
diff changeset
1864
Ritor1
parents:
diff changeset
1865 //----- (004032B2) --------------------------------------------------------
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1866 void Actor::AI_RandomMove( unsigned int uActor_id, unsigned int uTarget_id, int radius, int uActionLength )
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1867 {
0
Ritor1
parents:
diff changeset
1868 Actor *v5; // esi@1
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1869 int x; // ebx@1
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1870 int absy; // eax@1
0
Ritor1
parents:
diff changeset
1871 unsigned int v9; // ebx@11
Ritor1
parents:
diff changeset
1872 int v10; // ebx@13
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1873 AIDirection doNotInitializeBecauseShouldBeRandom; // [sp+Ch] [bp-30h]@7
0
Ritor1
parents:
diff changeset
1874 unsigned int v16; // [sp+2Ch] [bp-10h]@1
Ritor1
parents:
diff changeset
1875 int y; // [sp+30h] [bp-Ch]@1
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1876 int absx; // [sp+38h] [bp-4h]@1
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1877
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1878 v5 = &pActors[uActor_id];
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1879 v16 = uTarget_id;
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1880 x = v5->vInitialPosition.x - v5->vPosition.x;
0
Ritor1
parents:
diff changeset
1881 y = v5->vInitialPosition.y - v5->vPosition.y;
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1882 absx = abs(x);
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1883 absy = abs(y);
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1884 if ( absx <= absy )
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1885 absx = absy + (absx / 2 );
0
Ritor1
parents:
diff changeset
1886 else
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1887 absx = absx + absy / 2;
0
Ritor1
parents:
diff changeset
1888 if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
1889 {
Ritor1
parents:
diff changeset
1890 if ( !uActionLength )
Ritor1
parents:
diff changeset
1891 uActionLength = 256;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1892 Actor::AI_StandOrBored(uActor_id, OBJECT_Player, uActionLength, &doNotInitializeBecauseShouldBeRandom);
0
Ritor1
parents:
diff changeset
1893 return;
Ritor1
parents:
diff changeset
1894 }
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1895 if ( pActors[uActor_id].pMonsterInfo.uMovementType == 3 && absx < 128 )
0
Ritor1
parents:
diff changeset
1896 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1897 Actor::AI_Stand(uActor_id, uTarget_id, 256, &doNotInitializeBecauseShouldBeRandom);
0
Ritor1
parents:
diff changeset
1898 return;
Ritor1
parents:
diff changeset
1899 }
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1900 absx += ((rand() & 0xF) * radius) / 16;
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1901 v9 = (stru_5C6E00->uIntegerDoublePi - 1) & stru_5C6E00->Atan2(x, y);
0
Ritor1
parents:
diff changeset
1902 if ( rand() % 100 < 25 )
Ritor1
parents:
diff changeset
1903 {
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1904 Actor::StandAwhile(uActor_id);
0
Ritor1
parents:
diff changeset
1905 return;
Ritor1
parents:
diff changeset
1906 }
Ritor1
parents:
diff changeset
1907 v10 = v9 + rand() % 256 - 128;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1908 if ( abs(v10 - v5->uYawAngle) > 256 && !(v5->uAttributes & 0x200000) )
0
Ritor1
parents:
diff changeset
1909 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1910 Actor::AI_Stand(uActor_id, uTarget_id, 256, &doNotInitializeBecauseShouldBeRandom);
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
1911 return;
0
Ritor1
parents:
diff changeset
1912 }
Ritor1
parents:
diff changeset
1913 v5->uYawAngle = v10;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1914 if ( v5->uMovementSpeed)
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1915 v5->uCurrentActionLength = 32 * absx / v5->uMovementSpeed;
0
Ritor1
parents:
diff changeset
1916 else
Ritor1
parents:
diff changeset
1917 v5->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
1918 v5->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
1919 v5->uAIState = Tethered;
Ritor1
parents:
diff changeset
1920 if ( rand() % 100 < 2 )
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1921 Actor::PlaySound(uActor_id, 3u);
0
Ritor1
parents:
diff changeset
1922 v5->UpdateAnimation();
Ritor1
parents:
diff changeset
1923 }
Ritor1
parents:
diff changeset
1924
Ritor1
parents:
diff changeset
1925 //----- (004031C1) --------------------------------------------------------
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1926 char __fastcall Actor::_4031C1_update_job_never_gets_called(unsigned int uActorID, signed int a2, int a3) //attempted to implement something like jobs for actors, but apparently was never finished
0
Ritor1
parents:
diff changeset
1927 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1928 return 0;
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1929 /*unsigned int v3; // edi@1
0
Ritor1
parents:
diff changeset
1930 Actor *v4; // esi@1
Ritor1
parents:
diff changeset
1931 ActorJob *v5; // eax@1
Ritor1
parents:
diff changeset
1932 signed int v6; // edx@2
Ritor1
parents:
diff changeset
1933 ActorJob *v7; // eax@2
Ritor1
parents:
diff changeset
1934 signed int v8; // edi@2
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1935 ActorJob *v9; // ecx@2
0
Ritor1
parents:
diff changeset
1936 __int16 v10; // cx@15
Ritor1
parents:
diff changeset
1937 signed int v12; // [sp+8h] [bp-4h]@1
Ritor1
parents:
diff changeset
1938
Ritor1
parents:
diff changeset
1939 v3 = uActorID;
Ritor1
parents:
diff changeset
1940 v12 = a2;
Ritor1
parents:
diff changeset
1941 v4 = &pActors[uActorID];
Ritor1
parents:
diff changeset
1942 v5 = (ActorJob *)pActors[uActorID].CanAct();
Ritor1
parents:
diff changeset
1943 if ( v5 )
Ritor1
parents:
diff changeset
1944 {
Ritor1
parents:
diff changeset
1945 v6 = 65535;
Ritor1
parents:
diff changeset
1946 v7 = &v4->pScheduledJobs[v3];
Ritor1
parents:
diff changeset
1947 v8 = 7;
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1948 v9 = &v7[7];//(char *)&v7[7].uHour;
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1949 while ( !(v9->uAttributes & 1) || v9->uHour > v12 )
0
Ritor1
parents:
diff changeset
1950 {
Ritor1
parents:
diff changeset
1951 --v8;
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1952 --v9;
0
Ritor1
parents:
diff changeset
1953 if ( v8 < 0 )
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1954 break;
0
Ritor1
parents:
diff changeset
1955 }
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1956 if( v8 >= 0 )
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1957 v6 = v8;
0
Ritor1
parents:
diff changeset
1958 if ( !v8 && v6 == 65535 )
Ritor1
parents:
diff changeset
1959 v6 = 7;
Ritor1
parents:
diff changeset
1960 v5 = &v7[v6];
Ritor1
parents:
diff changeset
1961 if ( v4->vInitialPosition.x != v5->vPos.x
Ritor1
parents:
diff changeset
1962 || v4->vInitialPosition.y != v5->vPos.y
Ritor1
parents:
diff changeset
1963 || v4->vInitialPosition.z != v5->vPos.z
Ritor1
parents:
diff changeset
1964 || v4->pMonsterInfo.uMovementType != v5->uAction )
Ritor1
parents:
diff changeset
1965 {
Ritor1
parents:
diff changeset
1966 v4->vInitialPosition.x = v5->vPos.x;
Ritor1
parents:
diff changeset
1967 v4->vInitialPosition.y = v5->vPos.y;
Ritor1
parents:
diff changeset
1968 v10 = v5->vPos.z;
Ritor1
parents:
diff changeset
1969 v4->vInitialPosition.z = v10;
Ritor1
parents:
diff changeset
1970 LOBYTE(v5) = v5->uAction;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1971 v4->pMonsterInfo.uMovementType = MONSTER_MOVEMENT_TYPE_STAIONARY;
0
Ritor1
parents:
diff changeset
1972 if ( a3 == 1 )
Ritor1
parents:
diff changeset
1973 {
Ritor1
parents:
diff changeset
1974 v4->vPosition.x = v4->vInitialPosition.x;
Ritor1
parents:
diff changeset
1975 v4->vPosition.y = v4->vInitialPosition.y;
Ritor1
parents:
diff changeset
1976 LOBYTE(v5) = v10;
Ritor1
parents:
diff changeset
1977 v4->vPosition.z = v10;
Ritor1
parents:
diff changeset
1978 }
Ritor1
parents:
diff changeset
1979 }
Ritor1
parents:
diff changeset
1980 }
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1981 return (char)v5;*/
0
Ritor1
parents:
diff changeset
1982 }
Ritor1
parents:
diff changeset
1983
Ritor1
parents:
diff changeset
1984 //----- (004030AD) --------------------------------------------------------
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1985 void Actor::AI_Stun(unsigned int uActorID, signed int edx0, int stunRegardlessOfState)
0
Ritor1
parents:
diff changeset
1986 {
Ritor1
parents:
diff changeset
1987 Actor *v4; // ebx@1
Ritor1
parents:
diff changeset
1988 __int16 v7; // ax@16
Ritor1
parents:
diff changeset
1989 AIDirection a3; // [sp+Ch] [bp-40h]@16
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1990 AIDirection* v10; // [sp+28h] [bp-24h]@16
0
Ritor1
parents:
diff changeset
1991
Ritor1
parents:
diff changeset
1992 v4 = &pActors[uActorID];
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1993 if ( v4->uAIState == Fleeing )
0
Ritor1
parents:
diff changeset
1994 BYTE2(v4->uAttributes) |= 2u;
Ritor1
parents:
diff changeset
1995 if ( v4->pMonsterInfo.uHostilityType != 4 )
Ritor1
parents:
diff changeset
1996 {
Ritor1
parents:
diff changeset
1997 v4->uAttributes &= 0xFFFFFFFBu;
Ritor1
parents:
diff changeset
1998 v4->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
Ritor1
parents:
diff changeset
1999 }
1947
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
2000 if ( v4->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
2001 v4->pActorBuffs[ACTOR_BUFF_CHARM].Reset();
1950
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
2002 if ( v4->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0 )
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
2003 v4->pActorBuffs[ACTOR_BUFF_AFRAID].Reset();
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2004 if ( stunRegardlessOfState
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2005 || (v4->uAIState != Stunned
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2006 && v4->uAIState != AttackingRanged1
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2007 && v4->uAIState != AttackingRanged2
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2008 && v4->uAIState != AttackingRanged3
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2009 && v4->uAIState != AttackingRanged4
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2010 && v4->uAIState != AttackingMelee))
0
Ritor1
parents:
diff changeset
2011 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2012 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), edx0, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2013 v10 = &a3;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2014 v4->uYawAngle = LOWORD(v10->uYawAngle);
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2015 v7 = pSpriteFrameTable->pSpriteSFrames[v4->pSpriteIDs[ANIM_GotHit]].uAnimLength;
0
Ritor1
parents:
diff changeset
2016 v4->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2017 v4->uAIState = Stunned;
Ritor1
parents:
diff changeset
2018 v4->uCurrentActionLength = 8 * v7;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2019 Actor::PlaySound(uActorID, 2u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2020 v4->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2021 }
Ritor1
parents:
diff changeset
2022 }
Ritor1
parents:
diff changeset
2023
Ritor1
parents:
diff changeset
2024 //----- (00402F87) --------------------------------------------------------
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2025 void Actor::AI_Bored(unsigned int uActorID, unsigned int uObjID, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2026 {
Ritor1
parents:
diff changeset
2027 unsigned int v7; // eax@3
Ritor1
parents:
diff changeset
2028 unsigned int v9; // eax@3
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2029
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2030 Actor* actor = &pActors[uActorID];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2031
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2032 AIDirection a3; // [sp+Ch] [bp-5Ch]@2
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2033 if (!a4)
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2034 {
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2035 Actor::GetDirectionInfo(PID(OBJECT_Actor,uActorID), uObjID, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2036 a4 = &a3;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2037 }
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2038
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2039 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Bored]].uAnimLength;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2040
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2041 v7 = stru_5C6E00->Atan2(actor->vPosition.x - pGame->pIndoorCameraD3D->vPartyPos.x, actor->vPosition.y - pGame->pIndoorCameraD3D->vPartyPos.y);
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2042 v9 = stru_5C6E00->uIntegerPi + actor->uYawAngle + ((signed int)stru_5C6E00->uIntegerPi >> 3) - v7;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2043
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2044 if ( BYTE1(v9) & 7 ) // turned away - just stand
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2045 Actor::AI_Stand(uActorID, uObjID, actor->uCurrentActionLength, a4);
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2046 else // facing player - play bored anim
0
Ritor1
parents:
diff changeset
2047 {
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2048 actor->uAIState = Fidgeting;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2049 actor->uCurrentActionTime = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2050 actor->uYawAngle = a4->uYawAngle;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2051 actor->vVelocity.z = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2052 actor->vVelocity.y = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2053 actor->vVelocity.x = 0;
0
Ritor1
parents:
diff changeset
2054 if ( rand() % 100 < 5 )
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2055 Actor::PlaySound(uActorID, 3);
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2056 actor->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2057 }
Ritor1
parents:
diff changeset
2058 }
Ritor1
parents:
diff changeset
2059
Ritor1
parents:
diff changeset
2060 //----- (00402F27) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2061 void Actor::Resurrect(unsigned int uActorID)
0
Ritor1
parents:
diff changeset
2062 {
Ritor1
parents:
diff changeset
2063 Actor *pActor; // esi@1
Ritor1
parents:
diff changeset
2064
Ritor1
parents:
diff changeset
2065 pActor = &pActors[uActorID];
Ritor1
parents:
diff changeset
2066 pActor->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2067 pActor->uAIState = Resurrected;
Ritor1
parents:
diff changeset
2068 pActor->uCurrentActionAnimation = ANIM_Dying;
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2069 pActor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[pActor->pSpriteIDs[ANIM_Dying]].uAnimLength;
0
Ritor1
parents:
diff changeset
2070 pActor->sCurrentHP = LOWORD(pActor->pMonsterInfo.uHP);
Ritor1
parents:
diff changeset
2071 Actor::PlaySound(uActorID, 1u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2072 pActor->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2073 }
Ritor1
parents:
diff changeset
2074
Ritor1
parents:
diff changeset
2075 //----- (00402D6E) --------------------------------------------------------
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2076 void Actor::Die(unsigned int uActorID)
0
Ritor1
parents:
diff changeset
2077 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1974
diff changeset
2078 Actor* actor = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
2079
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2080 actor->uCurrentActionTime = 0;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2081 actor->uAIState = Dying;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2082 actor->uCurrentActionAnimation = ANIM_Dying;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2083 actor->sCurrentHP = 0;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2084 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength;
1946
aa3ca49a10f5 pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
Grumpy7
parents: 1945
diff changeset
2085 actor->pActorBuffs[ACTOR_BUFF_PARALYZED].Reset();
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
2086 actor->pActorBuffs[ACTOR_BUFF_STONED].Reset();
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2087 Actor::PlaySound(uActorID, 1);
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2088 actor->UpdateAnimation();
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2089
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2090 for (uint i = 0; i < 5; ++i)
1529
61458df2cb4f bountyHunting fix
Ritor1
parents: 1519
diff changeset
2091 if (pParty->monster_id_for_hunting[i] == actor->pMonsterInfo.uID)
61458df2cb4f bountyHunting fix
Ritor1
parents: 1519
diff changeset
2092 pParty->monster_for_hunting_killed[i] = true;
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2093
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2094 for (uint i = 0; i < 22; ++i)
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2095 actor->pActorBuffs[i].Reset();
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2096
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2097 ItemGen drop;
1012
9e823ad5eaa6 second msg_queue returned
Gloval
parents: 994
diff changeset
2098 drop.Reset();
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2099 switch (actor->pMonsterInfo.uID)
0
Ritor1
parents:
diff changeset
2100 {
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2101 case MONSTER_HARPY_1: case MONSTER_HARPY_2: case MONSTER_HARPY_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2102 drop.uItemID = ITEM_HARPY_FEATHER;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2103 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2104
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2105 case MONSTER_OOZE_1: case MONSTER_OOZE_2: case MONSTER_OOZE_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2106 drop.uItemID = ITEM_OOZE_ECTOPLASM_BOTTLE;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2107 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2108
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2109 case MONSTER_TROLL_1: case MONSTER_TROLL_2: case MONSTER_TROLL_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2110 drop.uItemID = ITEM_TROLL_BLOOD;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2111 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2112
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2113 case MONSTER_DEVIL_1: case MONSTER_DEVIL_2: case MONSTER_DEVIL_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2114 drop.uItemID = ITEM_DEVIL_ICHOR;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2115 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2116
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2117 case MONSTER_DRAGON_1: case MONSTER_DRAGON_2: case MONSTER_DRAGON_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2118 drop.uItemID = ITEM_DRAGON_EYE;
321
15decc249a94 quick fix to spells commit (wasnt compiling)
Nomad
parents: 319
diff changeset
2119 break;
0
Ritor1
parents:
diff changeset
2120 }
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2121
1759
845a6503f55c fixing some itemarray zero accesses
Grumpy7
parents: 1709
diff changeset
2122 if (rand() % 100 < 20 && drop.uItemID != 0)
0
Ritor1
parents:
diff changeset
2123 {
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2124 sub_42F7EB_DropItemAt(pItemsTable->pItems[drop.uItemID].uSpriteID,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2125 actor->vPosition.x,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2126 actor->vPosition.y,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2127 actor->vPosition.z + 16,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2128 rand() % 200 + 200,
0
Ritor1
parents:
diff changeset
2129 1,
Ritor1
parents:
diff changeset
2130 1,
Ritor1
parents:
diff changeset
2131 0,
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2132 &drop);
0
Ritor1
parents:
diff changeset
2133 }
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2134
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2135 if (actor->pMonsterInfo.uSpecialAbilityType == MONSTER_SPECIAL_ABILITY_EXPLODE)
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2136 Actor::Explode(uActorID);
0
Ritor1
parents:
diff changeset
2137 }
Ritor1
parents:
diff changeset
2138
Ritor1
parents:
diff changeset
2139 //----- (00402CED) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2140 void Actor::PlaySound(unsigned int uActorID, unsigned int uSoundID)
0
Ritor1
parents:
diff changeset
2141 {
Ritor1
parents:
diff changeset
2142 unsigned __int16 v3; // dx@1
Ritor1
parents:
diff changeset
2143
1408
204cce84300b FindSound
Ritor1
parents: 1384
diff changeset
2144 v3 = pActors[uActorID].pSoundSampleIDs[uSoundID];
0
Ritor1
parents:
diff changeset
2145 if ( v3 )
Ritor1
parents:
diff changeset
2146 {
1949
2f45768fcb7a pActorBuffs[3] to pActorBuffs[ACTOR_BUFF_SHRINK]
Grumpy7
parents: 1948
diff changeset
2147 if ( pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
2148 {
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2149 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
0
Ritor1
parents:
diff changeset
2150 }
Ritor1
parents:
diff changeset
2151 else
Ritor1
parents:
diff changeset
2152 {
1949
2f45768fcb7a pActorBuffs[3] to pActorBuffs[ACTOR_BUFF_SHRINK]
Grumpy7
parents: 1948
diff changeset
2153 switch(pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uPower)
0
Ritor1
parents:
diff changeset
2154 {
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2155 case 1:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2156 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2157 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2158 case 2:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2159 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2160 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2161 case 3:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2162 case 4:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2163 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2164 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2165 default:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2166 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2167 break;
0
Ritor1
parents:
diff changeset
2168 }
Ritor1
parents:
diff changeset
2169 }
Ritor1
parents:
diff changeset
2170 }
Ritor1
parents:
diff changeset
2171 }
Ritor1
parents:
diff changeset
2172
Ritor1
parents:
diff changeset
2173 //----- (00402AD7) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2174 void Actor::AI_Pursue1(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
2175 {
Ritor1
parents:
diff changeset
2176 int v6; // eax@1
Ritor1
parents:
diff changeset
2177 Actor *v7; // ebx@1
Ritor1
parents:
diff changeset
2178 unsigned int v8; // ecx@1
Ritor1
parents:
diff changeset
2179 AIDirection *v10; // esi@6
Ritor1
parents:
diff changeset
2180 AIDirection a3; // [sp+Ch] [bp-5Ch]@7
Ritor1
parents:
diff changeset
2181 unsigned int v18; // [sp+64h] [bp-4h]@1
Ritor1
parents:
diff changeset
2182
Ritor1
parents:
diff changeset
2183 v6 = 0;
Ritor1
parents:
diff changeset
2184 v7 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2185 v8 = PID(OBJECT_Actor,uActorID);
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2186 if ( v7->pMonsterInfo.uFlying != 0 && !pParty->bFlying ) //TODO: Does v6 have a point?
0
Ritor1
parents:
diff changeset
2187 {
Ritor1
parents:
diff changeset
2188 if ( v7->pMonsterInfo.uMissleAttack1Type )
Ritor1
parents:
diff changeset
2189 v6 = v7->uActorRadius + 512;
Ritor1
parents:
diff changeset
2190 else
Ritor1
parents:
diff changeset
2191 v6 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2192 }
1052
d48c762de563 -nomarg
Nomad
parents: 1036
diff changeset
2193
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2194 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
2195 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2196 Actor::GetDirectionInfo(v8, a2, &a3, v6);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2197 v10 = &a3;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2198 }
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2199 else
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2200 {
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2201 v10 = pDir;
0
Ritor1
parents:
diff changeset
2202 }
Ritor1
parents:
diff changeset
2203 if ( MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2204 {
Ritor1
parents:
diff changeset
2205 if ( !uActionLength )
Ritor1
parents:
diff changeset
2206 uActionLength = 256;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2207 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2208 return;
0
Ritor1
parents:
diff changeset
2209 }
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2210 if ( v10->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2211 {
Ritor1
parents:
diff changeset
2212 if ( !uActionLength )
Ritor1
parents:
diff changeset
2213 uActionLength = 256;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2214 Actor::AI_Stand(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2215 return;
0
Ritor1
parents:
diff changeset
2216 }
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2217 if ( v7->uMovementSpeed == 0 )
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2218 {
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2219 Actor::AI_Stand(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2220 return;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2221 }
0
Ritor1
parents:
diff changeset
2222 if ( arg0 % 2 )
Ritor1
parents:
diff changeset
2223 v18 = -16;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2224 else
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2225 v18 = 16;
1052
d48c762de563 -nomarg
Nomad
parents: 1036
diff changeset
2226
0
Ritor1
parents:
diff changeset
2227 v7->uYawAngle = stru_5C6E00->Atan2(
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2228 pParty->vPosition.x + (int)fixpoint_mul(stru_5C6E00->Cos(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.x,
2059
f9698295c0bd AttackerInfo, MerchandiseTest
Ritor1
parents: 2057
diff changeset
2229 pParty->vPosition.y + (int)fixpoint_mul(stru_5C6E00->Sin(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.y);
0
Ritor1
parents:
diff changeset
2230 if ( uActionLength )
Ritor1
parents:
diff changeset
2231 v7->uCurrentActionLength = uActionLength;
Ritor1
parents:
diff changeset
2232 else
Ritor1
parents:
diff changeset
2233 v7->uCurrentActionLength = 128;
Ritor1
parents:
diff changeset
2234 v7->uPitchAngle = LOWORD(v10->uPitchAngle);
Ritor1
parents:
diff changeset
2235 v7->uAIState = Pursuing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2236 v7->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2237 }
Ritor1
parents:
diff changeset
2238
Ritor1
parents:
diff changeset
2239 //----- (00402968) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2240 void Actor::AI_Flee(unsigned int uActorID, signed int sTargetPid, int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2241 {
Ritor1
parents:
diff changeset
2242 Actor *v5; // ebx@1
Ritor1
parents:
diff changeset
2243 int v7; // ecx@2
Ritor1
parents:
diff changeset
2244 unsigned __int16 v9; // ax@15
1909
18dacb49efe9 Actor::AI_Flee fixing crash
Grumpy7
parents: 1907
diff changeset
2245 AIDirection v10; // [sp+8h] [bp-7Ch]@4
18dacb49efe9 Actor::AI_Flee fixing crash
Grumpy7
parents: 1907
diff changeset
2246 AIDirection a3; // [sp+24h] [bp-60h]@3
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2247 AIDirection* v13; // [sp+5Ch] [bp-28h]@4
0
Ritor1
parents:
diff changeset
2248
Ritor1
parents:
diff changeset
2249 v5 = &pActors[uActorID];
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2250 if ( v5->CanAct() )
0
Ritor1
parents:
diff changeset
2251 {
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2252 v7 = PID(OBJECT_Actor,uActorID);
0
Ritor1
parents:
diff changeset
2253 if ( !a4 )
Ritor1
parents:
diff changeset
2254 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2255 Actor::GetDirectionInfo(v7, sTargetPid, &a3, v5->pMonsterInfo.uFlying);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2256 a4 = &a3;
0
Ritor1
parents:
diff changeset
2257 }
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2258 Actor::GetDirectionInfo(v7, 4u, &v10, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2259 v13 = &v10;
0
Ritor1
parents:
diff changeset
2260 if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT)
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2261 || PID_TYPE(sTargetPid) == OBJECT_Actor && v13->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2262 {
Ritor1
parents:
diff changeset
2263 if ( !uActionLength )
Ritor1
parents:
diff changeset
2264 uActionLength = 256;
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2265 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v13);
0
Ritor1
parents:
diff changeset
2266 }
Ritor1
parents:
diff changeset
2267 else
Ritor1
parents:
diff changeset
2268 {
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2269 if ( v5->uMovementSpeed )
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2270 v5->uCurrentActionLength = (signed int)(a4->uDistanceXZ << 7) / v5->uMovementSpeed;
0
Ritor1
parents:
diff changeset
2271 else
Ritor1
parents:
diff changeset
2272 v5->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2273 if ( v5->uCurrentActionLength > 256 )
Ritor1
parents:
diff changeset
2274 v5->uCurrentActionLength = 256;
Ritor1
parents:
diff changeset
2275 v5->uYawAngle = LOWORD(stru_5C6E00->uIntegerHalfPi) + LOWORD(a4->uYawAngle);
Ritor1
parents:
diff changeset
2276 v5->uYawAngle = LOWORD(stru_5C6E00->uDoublePiMask) & (v5->uYawAngle + rand() % (signed int)stru_5C6E00->uIntegerPi);
Ritor1
parents:
diff changeset
2277 v9 = LOWORD(a4->uPitchAngle);
Ritor1
parents:
diff changeset
2278 v5->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2279 v5->uPitchAngle = v9;
Ritor1
parents:
diff changeset
2280 v5->uAIState = Fleeing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2281 v5->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2282 }
Ritor1
parents:
diff changeset
2283 }
Ritor1
parents:
diff changeset
2284 }
Ritor1
parents:
diff changeset
2285
Ritor1
parents:
diff changeset
2286 //----- (0040281C) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2287 void Actor::AI_Pursue2(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *pDir, int a5)
0
Ritor1
parents:
diff changeset
2288 {
Ritor1
parents:
diff changeset
2289 int v6; // eax@1
Ritor1
parents:
diff changeset
2290 Actor *v7; // ebx@1
Ritor1
parents:
diff changeset
2291 unsigned int v8; // ecx@1
Ritor1
parents:
diff changeset
2292 AIDirection *v10; // esi@7
Ritor1
parents:
diff changeset
2293 signed __int16 v13; // cx@19
Ritor1
parents:
diff changeset
2294 unsigned __int16 v14; // ax@25
Ritor1
parents:
diff changeset
2295 AIDirection a3; // [sp+Ch] [bp-40h]@8
Ritor1
parents:
diff changeset
2296 AIDirection v18; // [sp+28h] [bp-24h]@8
Ritor1
parents:
diff changeset
2297
Ritor1
parents:
diff changeset
2298 v6 = 0;
Ritor1
parents:
diff changeset
2299 v7 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2300 v8 = PID(OBJECT_Actor,uActorID);
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2301 if ( v7->pMonsterInfo.uFlying != 0 && !pParty->bFlying )
0
Ritor1
parents:
diff changeset
2302 {
Ritor1
parents:
diff changeset
2303 if ( v7->pMonsterInfo.uMissleAttack1Type && uCurrentlyLoadedLevelType == LEVEL_Outdoor )
Ritor1
parents:
diff changeset
2304 v6 = v7->uActorRadius + 512;
Ritor1
parents:
diff changeset
2305 else
Ritor1
parents:
diff changeset
2306 v6 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2307 }
Ritor1
parents:
diff changeset
2308 v10 = pDir;
Ritor1
parents:
diff changeset
2309 if ( !pDir )
Ritor1
parents:
diff changeset
2310 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2311 Actor::GetDirectionInfo(v8, a2, &a3, v6);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2312 v10 = &a3;
0
Ritor1
parents:
diff changeset
2313 }
Ritor1
parents:
diff changeset
2314 if ( MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2315 {
Ritor1
parents:
diff changeset
2316 if ( !uActionLength )
Ritor1
parents:
diff changeset
2317 uActionLength = 256;
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2318 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2319 return;
0
Ritor1
parents:
diff changeset
2320 }
Ritor1
parents:
diff changeset
2321 if ( (signed int)v10->uDistance < a5 )
Ritor1
parents:
diff changeset
2322 {
Ritor1
parents:
diff changeset
2323 if ( !uActionLength )
Ritor1
parents:
diff changeset
2324 uActionLength = 256;
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2325 Actor::AI_StandOrBored(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2326 return;
0
Ritor1
parents:
diff changeset
2327 }
Ritor1
parents:
diff changeset
2328 if ( uActionLength )
Ritor1
parents:
diff changeset
2329 {
Ritor1
parents:
diff changeset
2330 v7->uCurrentActionLength = uActionLength;
Ritor1
parents:
diff changeset
2331 }
Ritor1
parents:
diff changeset
2332 else
Ritor1
parents:
diff changeset
2333 {
Ritor1
parents:
diff changeset
2334 v13 = v7->uMovementSpeed;
Ritor1
parents:
diff changeset
2335 if ( v13 )
Ritor1
parents:
diff changeset
2336 v7->uCurrentActionLength = (signed int)(v10->uDistanceXZ << 7) / v13;
Ritor1
parents:
diff changeset
2337 else
Ritor1
parents:
diff changeset
2338 v7->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2339 if ( v7->uCurrentActionLength > 32 )
Ritor1
parents:
diff changeset
2340 v7->uCurrentActionLength = 32;
Ritor1
parents:
diff changeset
2341 }
Ritor1
parents:
diff changeset
2342 v7->uYawAngle = LOWORD(v10->uYawAngle);
Ritor1
parents:
diff changeset
2343 v14 = LOWORD(v10->uPitchAngle);
Ritor1
parents:
diff changeset
2344 v7->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2345 v7->uPitchAngle = v14;
Ritor1
parents:
diff changeset
2346 v7->uAIState = Pursuing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2347 v7->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2348 }
Ritor1
parents:
diff changeset
2349
Ritor1
parents:
diff changeset
2350 //----- (00402686) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2351 void Actor::AI_Pursue3(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2352 {
Ritor1
parents:
diff changeset
2353 int v5; // eax@1
Ritor1
parents:
diff changeset
2354 Actor *v6; // ebx@1
Ritor1
parents:
diff changeset
2355 int v7; // ecx@1
Ritor1
parents:
diff changeset
2356 signed __int16 v12; // cx@19
Ritor1
parents:
diff changeset
2357 __int16 v14; // ax@25
Ritor1
parents:
diff changeset
2358 unsigned __int16 v16; // ax@28
Ritor1
parents:
diff changeset
2359 AIDirection a3; // [sp+Ch] [bp-40h]@8
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2360 AIDirection* v20; // [sp+28h] [bp-24h]@8
0
Ritor1
parents:
diff changeset
2361
Ritor1
parents:
diff changeset
2362 v5 = 0;
Ritor1
parents:
diff changeset
2363 v6 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2364 v7 = PID(OBJECT_Actor,uActorID);
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2365 if ( v6->pMonsterInfo.uFlying != 0 && !pParty->bFlying )
0
Ritor1
parents:
diff changeset
2366 {
Ritor1
parents:
diff changeset
2367 if ( v6->pMonsterInfo.uMissleAttack1Type && uCurrentlyLoadedLevelType == LEVEL_Outdoor )
Ritor1
parents:
diff changeset
2368 v5 = v6->uActorRadius + 512;
Ritor1
parents:
diff changeset
2369 else
Ritor1
parents:
diff changeset
2370 v5 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2371 }
Ritor1
parents:
diff changeset
2372 if ( !a4 )
Ritor1
parents:
diff changeset
2373 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2374 Actor::GetDirectionInfo(v7, a2, &a3, v5);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2375 v20 = &a3;
0
Ritor1
parents:
diff changeset
2376 }
Ritor1
parents:
diff changeset
2377 if ( MonsterStats::BelongsToSupertype(v6->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2378 {
Ritor1
parents:
diff changeset
2379 if ( !uActionLength )
Ritor1
parents:
diff changeset
2380 uActionLength = 256;
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2381 return Actor::AI_StandOrBored(uActorID, 4, uActionLength, a4);
0
Ritor1
parents:
diff changeset
2382 }
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2383 if ( a4->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2384 {
Ritor1
parents:
diff changeset
2385 if ( !uActionLength )
Ritor1
parents:
diff changeset
2386 uActionLength = 256;
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2387 return Actor::AI_StandOrBored(uActorID, a2, uActionLength, a4);
0
Ritor1
parents:
diff changeset
2388 }
Ritor1
parents:
diff changeset
2389 if ( uActionLength )
Ritor1
parents:
diff changeset
2390 {
Ritor1
parents:
diff changeset
2391 v6->uCurrentActionLength = uActionLength + rand() % uActionLength;
Ritor1
parents:
diff changeset
2392 }
Ritor1
parents:
diff changeset
2393 else
Ritor1
parents:
diff changeset
2394 {
Ritor1
parents:
diff changeset
2395 v12 = v6->uMovementSpeed;
Ritor1
parents:
diff changeset
2396 if ( v12 )
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2397 v6->uCurrentActionLength = (signed int)(a4->uDistanceXZ << 7) / v12;
0
Ritor1
parents:
diff changeset
2398 else
Ritor1
parents:
diff changeset
2399 v6->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2400 if ( v6->uCurrentActionLength > 128 )
Ritor1
parents:
diff changeset
2401 v6->uCurrentActionLength = 128;
Ritor1
parents:
diff changeset
2402 }
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2403 v14 = LOWORD(a4->uYawAngle);
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2404 if ( rand() % 2 )
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2405 v14 += 256;
0
Ritor1
parents:
diff changeset
2406 else
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2407 v14 -= 256;
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2408 v6->uYawAngle = v14;
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2409 v16 = LOWORD(a4->uPitchAngle);
0
Ritor1
parents:
diff changeset
2410 v6->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2411 v6->uPitchAngle = v16;
Ritor1
parents:
diff changeset
2412 v6->uAIState = Pursuing;
Ritor1
parents:
diff changeset
2413 if ( rand() % 100 < 2 )
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2414 Actor::PlaySound(uActorID, 2u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2415 v6->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2416 }
Ritor1
parents:
diff changeset
2417
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2418 //----- (00401221) --------------------------------------------------------
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2419 void Actor::_SelectTarget(unsigned int uActorID, int *a2, bool can_target_party)
0
Ritor1
parents:
diff changeset
2420 {
Ritor1
parents:
diff changeset
2421 int v5; // ecx@1
Ritor1
parents:
diff changeset
2422 signed int v10; // eax@13
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2423 uint v11; // ebx@16
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2424 uint v12; // eax@16
0
Ritor1
parents:
diff changeset
2425 signed int v14; // eax@31
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2426 uint v15; // edi@43
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2427 uint v16; // ebx@45
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2428 uint v17; // eax@45
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2429 signed int closestId; // [sp+14h] [bp-1Ch]@1
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2430 uint v23; // [sp+1Ch] [bp-14h]@16
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2431 unsigned int lowestRadius; // [sp+24h] [bp-Ch]@1
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2432 uint v27; // [sp+2Ch] [bp-4h]@16
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2433 uint v28; // [sp+2Ch] [bp-4h]@45
0
Ritor1
parents:
diff changeset
2434
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2435 lowestRadius = UINT_MAX;
0
Ritor1
parents:
diff changeset
2436 v5 = 0;
Ritor1
parents:
diff changeset
2437 *a2 = 0;
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2438 closestId = 0;
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2439 assert(uActorID < uNumActors);
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2440 Actor* thisActor = &pActors[uActorID];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2441
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2442 for (uint i = 0; i < uNumActors; ++i)
0
Ritor1
parents:
diff changeset
2443 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2444 Actor* actor = &pActors[i];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2445 if (actor->uAIState == Dead || actor->uAIState == Dying ||
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2446 actor->uAIState == Removed || actor->uAIState == Summoned || actor->uAIState == Disabled || uActorID == i )
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2447 continue;
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2448
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2449 if (thisActor->uLastCharacterIDToHit == 0 || PID(OBJECT_Actor,v5) != thisActor->uLastCharacterIDToHit )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2450 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2451 v10 = thisActor->GetActorsRelation(actor);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2452 if ( v10 == 0 )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2453 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2454 }
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2455 else if (thisActor->IsNotAlive())
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2456 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2457 thisActor->uLastCharacterIDToHit = 0;
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2458 v10 = thisActor->GetActorsRelation(actor);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2459 if ( v10 == 0 )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2460 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2461 }
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2462 else
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2463 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2464 if ( (actor->uGroup != 0 || thisActor->uGroup != 0) && actor->uGroup == thisActor->uGroup )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2465 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2466 v10 = 4;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2467 }
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2468 if ( thisActor->pMonsterInfo.uHostilityType )
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2469 v10 = pMonsterStats->pInfos[thisActor->pMonsterInfo.uID].uHostilityType;
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2470 v11 = _4DF380_hostilityRanges[v10];
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2471 v23 = abs(thisActor->vPosition.x - actor->vPosition.x);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2472 v27 = abs(thisActor->vPosition.y - actor->vPosition.y);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2473 v12 = abs(thisActor->vPosition.z - actor->vPosition.z);
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2474 if ( v23 <= v11
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2475 && v27 <= v11
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2476 && v12 <= v11
1493
9e9a12506d51 player detection partly working
zipi
parents: 1477
diff changeset
2477 && sub_4070EF_prolly_detect_player(PID(OBJECT_Actor, i), PID(OBJECT_Actor, uActorID))
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2478 && v23 * v23 + v27 * v27 + v12 * v12 < lowestRadius )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2479 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2480 lowestRadius = v23 * v23 + v27 * v27 + v12 * v12;
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2481 closestId = i;
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2482 }
0
Ritor1
parents:
diff changeset
2483 }
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2484
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2485 if ( lowestRadius != UINT_MAX )
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2486 {
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2487 *a2 = PID(OBJECT_Actor, closestId);
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2488 }
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2489
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2490 if (can_target_party && !pParty->Invisible())
0
Ritor1
parents:
diff changeset
2491 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2492 if ( thisActor->uAttributes & 0x80000
1956
542c13cd72e2 pActorBuffs[12] to pActorBuffs[ACTOR_BUFF_ENSLAVED]
Grumpy7
parents: 1955
diff changeset
2493 && thisActor->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0
1947
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
2494 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
1948
7fd4bfa175fd pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED]
Grumpy7
parents: 1947
diff changeset
2495 && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
2496 v14 = 4;
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2497 else
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2498 v14 = thisActor->GetActorsRelation(0);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2499 if ( v14 != 0 )
0
Ritor1
parents:
diff changeset
2500 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2501 if ( !thisActor->pMonsterInfo.uHostilityType )
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2502 v15 = _4DF380_hostilityRanges[v14];
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2503 else
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2504 v15 = _4DF380_hostilityRanges[4];
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2505 v16 = abs(thisActor->vPosition.x - pParty->vPosition.x);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2506 v28 = abs(thisActor->vPosition.y - pParty->vPosition.y);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2507 v17 = abs(thisActor->vPosition.z - pParty->vPosition.z);
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2508 if ( v16 <= v15 && v28 <= v15 && v17 <= v15 && (v16 * v16 + v28 * v28 + v17 * v17 < lowestRadius))
0
Ritor1
parents:
diff changeset
2509 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2510 *a2 = OBJECT_Player;
0
Ritor1
parents:
diff changeset
2511 }
Ritor1
parents:
diff changeset
2512 }
Ritor1
parents:
diff changeset
2513 }
Ritor1
parents:
diff changeset
2514 }
Ritor1
parents:
diff changeset
2515 // 4DF380: using guessed type int dword_4DF380[];
Ritor1
parents:
diff changeset
2516 // 4DF390: using guessed type int dword_4DF390;
Ritor1
parents:
diff changeset
2517
Ritor1
parents:
diff changeset
2518 //----- (0040104C) --------------------------------------------------------
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2519 signed int Actor::GetActorsRelation(Actor *otherActPtr)
0
Ritor1
parents:
diff changeset
2520 {
Ritor1
parents:
diff changeset
2521 unsigned int v5; // edx@15
Ritor1
parents:
diff changeset
2522 unsigned int v6; // eax@16
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2523 unsigned int thisGroup; // ebp@19
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2524 int otherGroup; // eax@22
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2525 unsigned int thisAlly; // edx@25
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2526 unsigned int otherAlly; // edx@33
0
Ritor1
parents:
diff changeset
2527
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2528 if ( otherActPtr)
1890
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2529 {
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2530 v5 = otherActPtr->uGroup;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2531 v6 = this->uGroup;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2532 if ( v5 != 0 && v6 != 0 && v5 == v6 )
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2533 return 0;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2534 }
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2535
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2536 if (this->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2537 return 4;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2538 thisAlly = this->uAlly;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2539 if ( this->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime > 0 || thisAlly == 9999)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2540 thisGroup = 0;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2541 else if ( thisAlly > 0 )
0
Ritor1
parents:
diff changeset
2542 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2543 thisGroup = thisAlly;
0
Ritor1
parents:
diff changeset
2544 }
Ritor1
parents:
diff changeset
2545 else
Ritor1
parents:
diff changeset
2546 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2547 thisGroup = (this->pMonsterInfo.uID - 1) / 3 + 1;
0
Ritor1
parents:
diff changeset
2548 }
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2549
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2550 if ( otherActPtr )
0
Ritor1
parents:
diff changeset
2551 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2552 if (otherActPtr->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
2553 return 4;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2554 otherAlly = otherActPtr->uAlly;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2555 if ( otherActPtr->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime > 0 || otherAlly == 9999)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2556 otherGroup = 0;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2557 else if ( otherAlly > 0 )
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2558 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2559 otherGroup = otherAlly;
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2560 }
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2561 else
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2562 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2563 otherGroup = (otherActPtr->pMonsterInfo.uID - 1) / 3 + 1;
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2564 }
0
Ritor1
parents:
diff changeset
2565 }
Ritor1
parents:
diff changeset
2566 else
Ritor1
parents:
diff changeset
2567 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2568 otherGroup = 0;
0
Ritor1
parents:
diff changeset
2569 }
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2570
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2571 if ( this->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 && !otherGroup
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2572 || otherActPtr && otherActPtr->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 && !thisGroup )
0
Ritor1
parents:
diff changeset
2573 return 0;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2574 if ( this->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0 && this->uAttributes & 0x80000 && !otherGroup )
0
Ritor1
parents:
diff changeset
2575 return 4;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2576 if (thisGroup >= 89 || otherGroup >= 89)
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2577 return 0;
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2578
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2579 if ( thisGroup == 0 )
0
Ritor1
parents:
diff changeset
2580 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2581 if ( (!otherActPtr || this->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime > 0 && !(otherActPtr->uAttributes & 0x80000)) && !pFactionTable->relations[otherGroup][0])
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2582 return pFactionTable->relations[0][otherGroup];
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2583 else
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2584 return 4;
0
Ritor1
parents:
diff changeset
2585 }
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2586 else
0
Ritor1
parents:
diff changeset
2587 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2588 return pFactionTable->relations[thisGroup][otherGroup];
0
Ritor1
parents:
diff changeset
2589 }
Ritor1
parents:
diff changeset
2590 }
Ritor1
parents:
diff changeset
2591
Ritor1
parents:
diff changeset
2592 //----- (0045976D) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2593 void Actor::UpdateAnimation()
0
Ritor1
parents:
diff changeset
2594 {
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2595 //AIState state; // edx@1
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2596 //unsigned int result; // eax@1
0
Ritor1
parents:
diff changeset
2597
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2598 //state = (AIState)this->;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2599 uAttributes &= 0xFFDFFFFF;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2600 //result = this->uAttributes;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2601 switch (uAIState)
0
Ritor1
parents:
diff changeset
2602 {
Ritor1
parents:
diff changeset
2603 case Tethered:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2604 uCurrentActionAnimation = ANIM_Walking;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2605 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2606
0
Ritor1
parents:
diff changeset
2607 case AttackingMelee:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2608 uCurrentActionAnimation = ANIM_AtkMelee;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2609 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2610 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2611
0
Ritor1
parents:
diff changeset
2612 case AttackingRanged1:
Ritor1
parents:
diff changeset
2613 case AttackingRanged2:
Ritor1
parents:
diff changeset
2614 case AttackingRanged3:
Ritor1
parents:
diff changeset
2615 case AttackingRanged4:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2616 uCurrentActionAnimation = ANIM_AtkRanged;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2617 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2618 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2619
0
Ritor1
parents:
diff changeset
2620 case Dying:
Ritor1
parents:
diff changeset
2621 case Resurrected:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2622 uCurrentActionAnimation = ANIM_Dying;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2623 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2624 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2625
0
Ritor1
parents:
diff changeset
2626 case Pursuing:
Ritor1
parents:
diff changeset
2627 case Fleeing:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2628 uCurrentActionAnimation = ANIM_Walking;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2629 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2630 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2631
0
Ritor1
parents:
diff changeset
2632 case Stunned:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2633 uCurrentActionAnimation = ANIM_GotHit;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2634 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2635 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2636
0
Ritor1
parents:
diff changeset
2637 case Fidgeting:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2638 uCurrentActionAnimation = ANIM_Bored;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2639 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2640 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2641
0
Ritor1
parents:
diff changeset
2642 case Standing:
Ritor1
parents:
diff changeset
2643 case Interacting:
Ritor1
parents:
diff changeset
2644 case Summoned:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2645 uCurrentActionAnimation = ANIM_Standing;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2646 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2647 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2648
0
Ritor1
parents:
diff changeset
2649 case Dead:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2650 if (pSpriteFrameTable->pSpriteSFrames[pSpriteIDs[ANIM_Dead]].pHwSpriteIDs[0] <= 0)
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2651 uAIState = Removed;
0
Ritor1
parents:
diff changeset
2652 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2653 uCurrentActionAnimation = ANIM_Dead;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2654 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2655
551
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2656 case Removed:
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 602
diff changeset
2657 case Disabled:
551
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2658 return;
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2659
0
Ritor1
parents:
diff changeset
2660 default:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2661 assert(false);
0
Ritor1
parents:
diff changeset
2662 }
Ritor1
parents:
diff changeset
2663 }
Ritor1
parents:
diff changeset
2664
Ritor1
parents:
diff changeset
2665 //----- (00459671) --------------------------------------------------------
Ritor1
parents:
diff changeset
2666 void Actor::Reset()
Ritor1
parents:
diff changeset
2667 {
Ritor1
parents:
diff changeset
2668 this->pActorName[0] = 0;
Ritor1
parents:
diff changeset
2669 this->word_000086_some_monster_id = 0;
602
628694cd5744 Margaret working
zipi
parents: 552
diff changeset
2670 this->sNPC_ID = 0;
0
Ritor1
parents:
diff changeset
2671 this->vPosition.z = 0;
Ritor1
parents:
diff changeset
2672 this->vPosition.y = 0;
Ritor1
parents:
diff changeset
2673 this->vPosition.x = 0;
Ritor1
parents:
diff changeset
2674 this->vVelocity.z = 0;
Ritor1
parents:
diff changeset
2675 this->vVelocity.y = 0;
Ritor1
parents:
diff changeset
2676 this->vVelocity.x = 0;
Ritor1
parents:
diff changeset
2677 this->uYawAngle = 0;
Ritor1
parents:
diff changeset
2678 this->uPitchAngle = 0;
Ritor1
parents:
diff changeset
2679 this->uAttributes = 0;
Ritor1
parents:
diff changeset
2680 this->uSectorID = 0;
Ritor1
parents:
diff changeset
2681 this->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2682 this->vInitialPosition.z = 0;
Ritor1
parents:
diff changeset
2683 this->vInitialPosition.y = 0;
Ritor1
parents:
diff changeset
2684 this->vInitialPosition.x = 0;
Ritor1
parents:
diff changeset
2685 this->vGuardingPosition.z = 0;
Ritor1
parents:
diff changeset
2686 this->vGuardingPosition.y = 0;
Ritor1
parents:
diff changeset
2687 this->vGuardingPosition.x = 0;
Ritor1
parents:
diff changeset
2688 this->uTetherDistance = 256;
Ritor1
parents:
diff changeset
2689 this->uActorRadius = 32;
Ritor1
parents:
diff changeset
2690 this->uActorHeight = 128;
Ritor1
parents:
diff changeset
2691 this->uAIState = Standing;
305
cc8e4dc397ec MonsterPopup_Draw crash fix
Nomad
parents: 303
diff changeset
2692 this->uCurrentActionAnimation = ANIM_Standing;
0
Ritor1
parents:
diff changeset
2693 this->uMovementSpeed = 200;
Ritor1
parents:
diff changeset
2694 this->uCarriedItemID = 0;
Ritor1
parents:
diff changeset
2695 this->uGroup = 0;
Ritor1
parents:
diff changeset
2696 this->uAlly = 0;
Ritor1
parents:
diff changeset
2697 this->uSummonerID = 0;
Ritor1
parents:
diff changeset
2698 this->uLastCharacterIDToHit = 0;
Ritor1
parents:
diff changeset
2699 this->dword_000334_unique_name = 0;
Ritor1
parents:
diff changeset
2700 memset(this->pSpriteIDs, 0, sizeof(pSpriteIDs));
Ritor1
parents:
diff changeset
2701 memset(this->pActorBuffs, 0, 0x160u);
Ritor1
parents:
diff changeset
2702 }
Ritor1
parents:
diff changeset
2703
Ritor1
parents:
diff changeset
2704 //----- (0045959A) --------------------------------------------------------
Ritor1
parents:
diff changeset
2705 void Actor::PrepareSprites(char load_sounds_if_bit1_set)
Ritor1
parents:
diff changeset
2706 {
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2707
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2708 MonsterDesc *v3; // esi@1
0
Ritor1
parents:
diff changeset
2709 MonsterInfo *v9; // [sp+84h] [bp-10h]@1
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2710
0
Ritor1
parents:
diff changeset
2711 v3 = &pMonsterList->pMonsters[pMonsterInfo.uID - 1];
Ritor1
parents:
diff changeset
2712 v9 = &pMonsterStats->pInfos[pMonsterInfo.uID - 1 + 1];
Ritor1
parents:
diff changeset
2713 //v12 = pSpriteIDs;
Ritor1
parents:
diff changeset
2714 //Source = (char *)v3->pSpriteNames;
Ritor1
parents:
diff changeset
2715 //do
Ritor1
parents:
diff changeset
2716 for (uint i = 0; i < 8; ++i)
Ritor1
parents:
diff changeset
2717 {
Ritor1
parents:
diff changeset
2718 //strcpy(pSpriteName, v3->pSpriteNames[i]);
Ritor1
parents:
diff changeset
2719 pSpriteIDs[i] = pSpriteFrameTable->FastFindSprite(v3->pSpriteNames[i]);
Ritor1
parents:
diff changeset
2720 pSpriteFrameTable->InitializeSprite(pSpriteIDs[i]);
Ritor1
parents:
diff changeset
2721 }
Ritor1
parents:
diff changeset
2722 uActorHeight = v3->uMonsterHeight;
Ritor1
parents:
diff changeset
2723 uActorRadius = v3->uMonsterRadius;
33
a9e9c6989d04 20.01.13
Ritor1
parents: 0
diff changeset
2724 uMovementSpeed = v9->uBaseSpeed;
0
Ritor1
parents:
diff changeset
2725 if ( !(load_sounds_if_bit1_set & 1) )
Ritor1
parents:
diff changeset
2726 {
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2727 for (int i=0;i<4;++i )
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2728 pSoundSampleIDs[i]=v3->pSoundSampleIDs[i];
0
Ritor1
parents:
diff changeset
2729 }
Ritor1
parents:
diff changeset
2730 }
Ritor1
parents:
diff changeset
2731
Ritor1
parents:
diff changeset
2732 //----- (00459667) --------------------------------------------------------
Ritor1
parents:
diff changeset
2733 void Actor::Remove()
Ritor1
parents:
diff changeset
2734 {
Ritor1
parents:
diff changeset
2735 this->uAIState = Removed;
Ritor1
parents:
diff changeset
2736 }
Ritor1
parents:
diff changeset
2737
Ritor1
parents:
diff changeset
2738 //----- (0044FD29) --------------------------------------------------------
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2739 void Actor::SummonMinion( int summonerId )
0
Ritor1
parents:
diff changeset
2740 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2741 unsigned __int8 extraSummonLevel; // al@1
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2742 int summonMonsterBaseType; // esi@1
0
Ritor1
parents:
diff changeset
2743 int v5; // edx@2
Ritor1
parents:
diff changeset
2744 int v7; // edi@10
Ritor1
parents:
diff changeset
2745 Actor *v8; // esi@10
Ritor1
parents:
diff changeset
2746 MonsterInfo *v9; // ebx@10
Ritor1
parents:
diff changeset
2747 MonsterDesc *v10; // edi@10
Ritor1
parents:
diff changeset
2748 int v13; // ebx@10
Ritor1
parents:
diff changeset
2749 int v15; // edi@10
Ritor1
parents:
diff changeset
2750 int v17; // ebx@10
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2751 unsigned int v19; // qax@10
0
Ritor1
parents:
diff changeset
2752 int result; // eax@13
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2753 unsigned int monsterId; // [sp+10h] [bp-18h]@8
0
Ritor1
parents:
diff changeset
2754 int v27; // [sp+18h] [bp-10h]@10
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2755 int actorSector; // [sp+1Ch] [bp-Ch]@8
0
Ritor1
parents:
diff changeset
2756
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2757
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2758 actorSector = 0;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2759 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2760 actorSector = pIndoor->GetSector(this->vPosition.x, this->vPosition.y, this->vPosition.z);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2761
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2762 v19 = this->uAlly;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2763 if ( !v19 )
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2764 {
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2765 monsterId = this->pMonsterInfo.uID - 1;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2766 v19 = (uint)(monsterId * 0.33333334);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2767 }
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2768 v27 = uCurrentlyLoadedLevelType == LEVEL_Outdoor ? 128 : 64;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2769 v13 = rand() % 2048;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2770 v15 = ((stru_5C6E00->Cos(v13) * (signed __int64)v27) >> 16) + this->vPosition.x;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2771 v17 = ((stru_5C6E00->Sin(v13) * (signed __int64)v27) >> 16) + this->vPosition.y;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2772
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2773 if (uCurrentlyLoadedLevelType != LEVEL_Outdoor)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2774 {
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2775 result = pIndoor->GetSector(v15, v17, this->vPosition.z);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2776 if (result != actorSector)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2777 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2778 result = BLV_GetFloorLevel(v15, v17, v27, result, &monsterId);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2779 if (result != -30000)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2780 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2781 if (abs(result - v27) > 1024)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2782 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2783 }
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2784
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2785 extraSummonLevel = this->pMonsterInfo.uSpecialAbilityDamageDiceRolls;
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2786 summonMonsterBaseType = this->pMonsterInfo.field_3C_some_special_attack;
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2787 if ( extraSummonLevel )
0
Ritor1
parents:
diff changeset
2788 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2789 if ( extraSummonLevel >= 1u && extraSummonLevel <= 3u )
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2790 summonMonsterBaseType = summonMonsterBaseType + extraSummonLevel - 1;
0
Ritor1
parents:
diff changeset
2791 }
Ritor1
parents:
diff changeset
2792 else
Ritor1
parents:
diff changeset
2793 {
Ritor1
parents:
diff changeset
2794 v5 = rand() % 100;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2795 if ( v5 >= 90 )
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2796 summonMonsterBaseType += 2;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2797 else if ( v5 >= 60 )
0
Ritor1
parents:
diff changeset
2798 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2799 summonMonsterBaseType += 1;
0
Ritor1
parents:
diff changeset
2800 }
Ritor1
parents:
diff changeset
2801 }
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2802 v7 = summonMonsterBaseType - 1;
0
Ritor1
parents:
diff changeset
2803 v8 = &pActors[uNumActors];
Ritor1
parents:
diff changeset
2804 v9 = &pMonsterStats->pInfos[v7 + 1];
Ritor1
parents:
diff changeset
2805 pActors[uNumActors].Reset();
Ritor1
parents:
diff changeset
2806 v10 = &pMonsterList->pMonsters[v7];
Ritor1
parents:
diff changeset
2807 strcpy(v8->pActorName, v9->pName);
Ritor1
parents:
diff changeset
2808 v8->sCurrentHP = LOWORD(v9->uHP);
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2809 memcpy(&v8->pMonsterInfo, v9, sizeof(v8->pMonsterInfo));
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2810 v8->word_000086_some_monster_id = summonMonsterBaseType;
0
Ritor1
parents:
diff changeset
2811 v8->uActorRadius = v10->uMonsterRadius;
Ritor1
parents:
diff changeset
2812 v8->uActorHeight = v10->uMonsterHeight;
Ritor1
parents:
diff changeset
2813 v8->pMonsterInfo.uTreasureDiceRolls = 0;
Ritor1
parents:
diff changeset
2814 v8->pMonsterInfo.uTreasureType = 0;
Ritor1
parents:
diff changeset
2815 v8->pMonsterInfo.uExp = 0;
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2816 v8->uMovementSpeed = v10->uMovementSpeed;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2817 v8->vInitialPosition.z = this->vPosition.z;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2818 v8->vPosition.z = this->vPosition.z;
0
Ritor1
parents:
diff changeset
2819 v8->vInitialPosition.x = v15;
Ritor1
parents:
diff changeset
2820 v8->vPosition.x = v15;
Ritor1
parents:
diff changeset
2821 v8->vInitialPosition.y = v17;
Ritor1
parents:
diff changeset
2822 v8->vPosition.y = v17;
Ritor1
parents:
diff changeset
2823 v8->uTetherDistance = 256;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2824 v8->uSectorID = actorSector;
0
Ritor1
parents:
diff changeset
2825 v8->PrepareSprites(0);
Ritor1
parents:
diff changeset
2826 v8->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
Ritor1
parents:
diff changeset
2827 v8->uAlly = v19;
Ritor1
parents:
diff changeset
2828 v8->uCurrentActionTime = 0;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2829 v8->uGroup = this->uGroup;
0
Ritor1
parents:
diff changeset
2830 v8->uAIState = Summoned;
Ritor1
parents:
diff changeset
2831 v8->uCurrentActionLength = 256;
Ritor1
parents:
diff changeset
2832 v8->UpdateAnimation();
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2833
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2834 ++uNumActors;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2835 ++this->pMonsterInfo.uSpecialAbilityDamageDiceBonus;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2836 if ( this->uAttributes & 0x80000 )
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2837 v8->uAttributes |= 0x80000u;
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2838 v8->uSummonerID = PID(OBJECT_Actor,summonerId);
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2839
781
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
2840 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2841 // 46DF1A: using guessed type int __fastcall 46DF1A_collide_against_actor(int, int);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2842 //----- (0046DF1A) --------------------------------------------------------
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2843 bool Actor::_46DF1A_collide_against_actor( int a1, int a2 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2844 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2845 Actor *v2; // edi@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2846 unsigned __int16 v3; // ax@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2847 int v4; // esi@6
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2848 int v8; // ecx@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2849 int v9; // eax@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2850 int v10; // ebx@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2851 int v11; // esi@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2852 int v12; // ebx@15
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2853 int v13; // ebx@17
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2854
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2855 v2 = &pActors[a1];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2856 v3 = v2->uAIState;
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2857 if ( v3 == Removed || v3 == Dying || v3 == Disabled || v3 == Dead || v3 == Summoned )
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2858 return 0;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2859 v4 = v2->uActorRadius;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2860 if ( a2 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2861 v4 = a2;
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2862
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2863 if (stru_721530.sMaxX > v2->vPosition.x + v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2864 stru_721530.sMinX < v2->vPosition.x - v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2865 stru_721530.sMaxY > v2->vPosition.y + v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2866 stru_721530.sMinY < v2->vPosition.y - v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2867 stru_721530.sMaxZ > v2->vPosition.z + v2->uActorHeight ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2868 stru_721530.sMinZ < v2->vPosition.z)
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2869 {
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2870 return false;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2871 }
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2872 v8 = v2->vPosition.x - stru_721530.normal.x;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2873 v9 = v2->vPosition.y - stru_721530.normal.y;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2874 v10 = stru_721530.prolly_normal_d + v4;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2875 v11 = (v8 * stru_721530.direction.y - v9 * stru_721530.direction.x) >> 16;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2876 v12 = (v8 * stru_721530.direction.x + v9 * stru_721530.direction.y) >> 16;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2877 if ( abs(v11) > v10 || v12 <= 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2878 {
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2879 return false;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2880 }
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2881 if (((stru_721530.direction.z * (signed __int64)v12) >> 16) + stru_721530.normal.z < v2->vPosition.z)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2882 {
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2883 return false;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2884 }
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2885
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2886 v13 = v12 - integer_sqrt(v10 * v10 - v11 * v11);
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2887 if ( v13 < 0 )
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2888 v13 = 0;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2889 if ( v13 < stru_721530.field_7C )
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2890 {
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2891 stru_721530.field_7C = v13;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2892 stru_721530.uFaceID = PID(OBJECT_Actor,a1);
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2893 }
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2894 return true;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2895 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2896 //----- (00401A91) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
2897 void UpdateActorAI()
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2898 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2899 signed int v4; // edi@10
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2900 signed int sDmg; // eax@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2901 Player *pPlayer; // ecx@21
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2902 Actor *pActor; // esi@34
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2903 unsigned __int16 v22; // ax@86
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2904 unsigned int v27; // ecx@123
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2905 unsigned int v28; // eax@123
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2906 int v33; // eax@144
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2907 int v34; // eax@147
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2908 char v35; // al@150
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2909 unsigned int v36; // edi@152
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2910 signed int v37; // eax@154
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2911 double v42; // st7@176
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2912 double v43; // st6@176
1450
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2913 int v45; // eax@192
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2914 unsigned __int8 v46; // cl@197
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2915 signed int v47; // st7@206
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2916 uint v58; // st7@246
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2917 unsigned int v65; // [sp-10h] [bp-C0h]@144
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2918 int v70; // [sp-10h] [bp-C0h]@213
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2919 AIDirection v72; // [sp+0h] [bp-B0h]@246
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2920 AIDirection a3; // [sp+1Ch] [bp-94h]@129
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2921 int target_pid_type; // [sp+70h] [bp-40h]@83
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2922 signed int a1; // [sp+74h] [bp-3Ch]@129
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2923 int v78; // [sp+78h] [bp-38h]@79
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2924 AIDirection* pDir; // [sp+7Ch] [bp-34h]@129
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2925 float radiusMultiplier; // [sp+98h] [bp-18h]@33
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2926 int v81; // [sp+9Ch] [bp-14h]@100
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2927 signed int target_pid; // [sp+ACh] [bp-4h]@83
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2928 AIState uAIState;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2929 uint v38;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2930
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2931 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2932 MakeActorAIList_ODM();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2933 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2934 MakeActorAIList_BLV();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2935
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2936 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor && pParty->armageddon_timer > 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2937 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2938 if ( pParty->armageddon_timer > 417 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2939 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2940 pParty->armageddon_timer = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2941 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2942 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2943 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2944 pParty->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (pParty->sRotationY + rand() % 16 - 8);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2945 pParty->sRotationX = pParty->sRotationX + rand() % 16 - 8;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2946 if ( pParty->sRotationX > 128)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2947 pParty->sRotationX = 128;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2948 else if ( pParty->sRotationX < -128 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2949 pParty->sRotationX = -128;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2950
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2951 pParty->uFlags |= 2u;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2952 pParty->armageddon_timer -= pMiscTimer->uTimeElapsed;
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2953 v4 = pParty->armageddonDamage + 50;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2954 if ( pParty->armageddon_timer <= 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2955 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2956 pParty->armageddon_timer = 0;
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2957 for(size_t i = 0; i < uNumActors; i++)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2958 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2959 pActor=&pActors[i];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2960 if ( pActor->CanAct() )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2961 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2962 sDmg = stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2963 pActor->sCurrentHP -= stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2964 if ( sDmg )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2965 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2966 if ( pActor->sCurrentHP >= 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2967 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2968 Actor::AI_Stun(i, 4, 0);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2969 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2970 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2971 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2972 Actor::Die(i);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2973 if ( pActor->pMonsterInfo.uExp )
1827
0c75c3e7e436 cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents: 1817
diff changeset
2974 pParty->GivePartyExp(pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uExp);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2975 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2976 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2977 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2978 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2979 for(int i = 1; i <= 4; i++)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2980 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2981 pPlayer = pPlayers[i];
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2982 if ( !pPlayer->pConditions[Condition_Dead] && !pPlayer->pConditions[Condition_Pertified] && !pPlayer->pConditions[Condition_Eradicated] )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
2983 pPlayer->ReceiveDamage(v4, DMGT_MAGICAL);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2984 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2985 }
1450
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2986 if (pTurnEngine->pending_actions)
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2987 --pTurnEngine->pending_actions;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2988 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2989 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2990
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2991 if (pParty->bTurnBasedModeOn)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2992 {
1448
5a5d0c713d47 some turn engine renaming
Gloval
parents: 1362
diff changeset
2993 pTurnEngine->AITurnBasedAction();
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2994 return;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2995 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2996
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2997
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2998 for (uint i = 0; i < uNumActors; ++i)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2999 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3000 pActor = &pActors[i];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3001 ai_near_actors_targets_pid[i] = OBJECT_Player;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3002 if (pActor->uAIState == Dead || pActor->uAIState == Removed || pActor->uAIState == Disabled || pActor->uAttributes & 0x0400)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3003 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3004
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3005 if (!pActor->sCurrentHP && pActor->uAIState != Dying)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3006 Actor::Die(i);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3007
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3008 for (uint j = 0; j < 22; ++j)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3009 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3010 if (j != 10)
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1336
diff changeset
3011 pActor->pActorBuffs[j].IsBuffExpiredToTime(pParty->uTimePlayed);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3012 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3013 if (pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3014 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3015 if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3016 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1918
c77935190b51 fixing monsters not attacking unless attacked
Grumpy7
parents: 1912
diff changeset
3017 else if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3018 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3019
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3020 if (pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 ||
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3021 pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0)
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3022 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3023
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3024 pActor->pMonsterInfo.uRecoveryTime = max(pActor->pMonsterInfo.uRecoveryTime - pMiscTimer->uTimeElapsed, 0);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3025
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3026 pActor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3027 if (pActor->uCurrentActionTime < pActor->uCurrentActionLength)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3028 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3029
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3030 if (pActor->uAIState == Dying)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3031 pActor->uAIState = Dead;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3032 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3033 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3034 if (pActor->uAIState != Summoned)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3035 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3036 Actor::AI_StandOrBored(i, OBJECT_Player, 256, nullptr);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3037 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3038 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3039 pActor->uAIState = Standing;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3040 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3041
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3042 pActor->uCurrentActionTime = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3043 pActor->uCurrentActionLength = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3044 pActor->UpdateAnimation();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3045 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3046
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3047
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3048 for(v78 = 0; v78 < ai_arrays_size; ++v78)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3049 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3050 uint actor_id = ai_near_actors_ids[v78];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3051 assert(actor_id < uNumActors);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3052
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3053 pActor = &pActors[actor_id];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3054
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3055 v47 = (signed int)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3056
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3057 Actor::_SelectTarget(actor_id, &ai_near_actors_targets_pid[actor_id], true);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3058 if (pActor->pMonsterInfo.uHostilityType && !ai_near_actors_targets_pid[actor_id])
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3059 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3060 target_pid = ai_near_actors_targets_pid[actor_id];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3061 target_pid_type = PID_TYPE(target_pid);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3062 if ( target_pid_type == OBJECT_Actor)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3063 radiusMultiplier = 0.5;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3064 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3065 radiusMultiplier = 1.0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3066 v22 = pActor->uAIState;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3067 if ( v22 == Dying || v22 == Dead || v22 == Removed || v22 == Disabled || v22 == Summoned)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3068 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3069 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3070 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3071 if ( !pActor->sCurrentHP )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3072 Actor::Die(actor_id);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3073 for(int i=0;i<22;i++)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3074 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3075 if ( i != 10 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3076 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3077 pActor->pActorBuffs[i].IsBuffExpiredToTime(pParty->uTimePlayed);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3078 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3079 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3080 if ( pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3081 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3082 if ( pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3083 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3084 // not sure
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3085 else if ( pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3086 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
1948
7fd4bfa175fd pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED]
Grumpy7
parents: 1947
diff changeset
3087 if ( pActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime < 0 )
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3088 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3089 pActor->uAIState = Removed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3090 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3091 }
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
3092 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0
1946
aa3ca49a10f5 pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
Grumpy7
parents: 1945
diff changeset
3093 || (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0)
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3094 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3095 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3096 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3097 v27 = pMiscTimer->uTimeElapsed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3098 v28 = pActor->pMonsterInfo.uRecoveryTime;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3099 pActor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3100 if ( (signed int)v28 > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3101 pActor->pMonsterInfo.uRecoveryTime = v28 - v27;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3102 if ( pActor->pMonsterInfo.uRecoveryTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3103 pActor->pMonsterInfo.uRecoveryTime = 0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3104 if ( !(pActor->uAttributes & 0x8000) )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3105 pActor->uAttributes |= 0x8000;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3106 a1 = PID(OBJECT_Actor,actor_id);
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3107 Actor::GetDirectionInfo(PID(OBJECT_Actor,actor_id), target_pid, &a3, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3108 pDir = &a3;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3109 uAIState = pActor->uAIState;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3110 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3111 || (signed int)pActor->pMonsterInfo.uRecoveryTime > 0
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3112 || radiusMultiplier * 307.2 < pDir->uDistance
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3113 || uAIState != Pursuing && uAIState != Standing && uAIState != Tethered && uAIState != Fidgeting
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3114 && !pActor->pMonsterInfo.uMissleAttack1Type || uAIState != Stunned )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3115 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3116 if ( (signed int)pActor->uCurrentActionTime < pActor->uCurrentActionLength )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3117 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3118 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3119 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3120 else if ( pActor->uAIState == AttackingMelee )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3121 {
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
3122 v35 = pActor->special_ability_use_check(actor_id);
2059
f9698295c0bd AttackerInfo, MerchandiseTest
Ritor1
parents: 2057
diff changeset
3123 AttackerInfo.Add(
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3124 a1,
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3125 5120,
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3126 pActor->vPosition.x,
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3127 pActor->vPosition.y,
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3128 pActor->vPosition.z + ((signed int)pActor->uActorHeight >> 1),
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3129 v35,
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3130 1
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3131 );
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3132 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3133 else if ( pActor->uAIState == AttackingRanged1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3134 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3135 v34 = pActor->pMonsterInfo.uMissleAttack1Type;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3136 Actor::AI_RangedAttack(actor_id, pDir, v34, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3137 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3138 else if ( pActor->uAIState == AttackingRanged2 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3139 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3140 v34 = pActor->pMonsterInfo.uMissleAttack2Type;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3141 Actor::AI_RangedAttack(actor_id, pDir, v34, 1);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3142 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3143 else if ( pActor->uAIState == AttackingRanged3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3144 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3145 v65 = pActor->pMonsterInfo.uSpellSkillAndMastery1;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3146 v33 = pActor->pMonsterInfo.uSpell1ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3147 Actor::AI_SpellAttack(actor_id, pDir, v33, 2, v65);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3148 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3149 else if ( pActor->uAIState == AttackingRanged4 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3150 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3151 v65 = pActor->pMonsterInfo.uSpellSkillAndMastery2;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3152 v33 = pActor->pMonsterInfo.uSpell2ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3153 Actor::AI_SpellAttack(actor_id, pDir, v33, 3, v65);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3154 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3155 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3156
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3157 v36 = pDir->uDistance;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3158 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3159 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3160 if ( target_pid_type == OBJECT_Actor )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3161 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3162 v36 = pDir->uDistance;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3163 v37 =pFactionTable->relations[(pActor->pMonsterInfo.uID-1) / 3 + 1][(pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3 + 1];
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3164 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3165 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3166 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3167 v37 = 4;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3168 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3169 v38=0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3170 if ( v37 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3171 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3172 v38 = 1024;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3173 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3174 else if ( v37 == 3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3175 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3176 v38 = 2560;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3177 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3178 else if ( v37 == 4 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3179 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3180 v38 = 5120;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3181 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3182 if ( v37 >= 1 && v37 <= 4 && v36 < v38 || v37 == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3183 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3184 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3185
1950
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
3186 if (pActor->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0)
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3187 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3188 if ( (signed int)v36 >= 10240 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3189 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3190 Actor::AI_RandomMove(actor_id, target_pid, 1024, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3191 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3192 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3193 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3194 //peasents after attacked
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3195 //guard after attacked
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3196 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3197 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3198 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3199 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3200
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3201 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Long && target_pid )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3202 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3203
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3204 if ( pActor->pMonsterInfo.uAIType == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3205 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3206 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3207 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3208 Actor::AI_Stand(actor_id, target_pid, (uint)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333), pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3209 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3210 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3211 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3212 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3213 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3214 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3215
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3216 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3217 if ( !(pActor->uAttributes & 0x020000) )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3218 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3219 if ( pActor->pMonsterInfo.uAIType == 2 || pActor->pMonsterInfo.uAIType == 3)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3220 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3221 if ( pActor->pMonsterInfo.uAIType == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3222 v43 = (double)(signed int)pActor->pMonsterInfo.uHP * 0.2;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3223 if ( pActor->pMonsterInfo.uAIType == 3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3224 v43 = (double)(signed int)pActor->pMonsterInfo.uHP * 0.1;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3225 v42 = (double)pActor->sCurrentHP;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3226 if ( v43 > v42 && (signed int)v36 < 10240 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3227 {
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3228 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3229 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3230 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3231 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3232 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3233
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3234 v81 = v36 - pActor->uActorRadius;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3235 if ( target_pid_type == OBJECT_Actor )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3236 v81 -= pActors[PID_ID(target_pid)].uActorRadius;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3237 if ( v81 < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3238 v81 = 0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3239 rand();
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3240 pActor->uAttributes &= 0xFFFBFFFF;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3241 if ( v81 < 5120 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3242 {
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
3243 v45 = pActor->special_ability_use_check(actor_id);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3244 if ( v45 == 0 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3245 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3246 if ( pActor->pMonsterInfo.uMissleAttack1Type )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3247 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3248 if ( (signed int)pActor->pMonsterInfo.uRecoveryTime <= 0 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3249 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3250 Actor::AI_MissileAttack1(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3251 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3252 else if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3253 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3254 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3255 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3256 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3257 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3258 if ( radiusMultiplier * 307.2 > (double)v81 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3259 {
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3260 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3261 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3262 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3263 {
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3264 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3265 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3266 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3267 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3268 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3269 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3270 if ( (double)v81 >= radiusMultiplier * 307.2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3271 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3272 if (pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3273 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3274 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3275 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3276 else if ( v81 >= 1024 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3277 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3278 //monsters
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3279 Actor::AI_Pursue3(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3280 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3281 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3282 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3283 v70 = (signed int)(radiusMultiplier * 307.2);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3284 //monsters
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3285 //guard after player runs away
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3286 // follow player
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3287 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3288 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3289 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3290 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3291 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3292 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3293 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3294 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3295 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3296 //monsters
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3297 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3298 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3299 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3300 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3301 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3302 else if ( v45 == 2 || v45 == 3 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3303 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3304 if ( v45 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3305 v46 = pActor->pMonsterInfo.uSpell1ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3306 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3307 v46 = pActor->pMonsterInfo.uSpell2ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3308 if ( v46 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3309 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3310 if ( (signed int)pActor->pMonsterInfo.uRecoveryTime <= 0 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3311 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3312 if ( v45 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3313 Actor::AI_SpellAttack1(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3314 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3315 Actor::AI_SpellAttack2(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3316 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3317 else if ( radiusMultiplier * 307.2 > (double)v81 || pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3318 {
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3319 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3320 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3321 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3322 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3323 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3324 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3325 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3326 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3327 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3328 if ( (double)v81 >= radiusMultiplier * 307.2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3329 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3330 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3331 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3332 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3333 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3334 else if ( v81 >= 1024 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3335 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3336 Actor::AI_Pursue3(actor_id, target_pid, 256, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3337 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3338 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3339 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3340 v70 = (signed int)(radiusMultiplier * 307.2);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3341 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3342 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3343 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3344 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3345 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3346 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3347 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3348 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3349 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3350 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3351 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3352 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3353 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3354 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3355 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3356 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3357
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3358 if ( pActor->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long || !target_pid || v81 >= 5120 || v45 != 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3359 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3360 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_SHORT )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3361 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3362 Actor::AI_RandomMove(actor_id, 4, 1024, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3363 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3364 else if ( pActor->pMonsterInfo.uMovementType == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3365 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3366 Actor::AI_RandomMove(actor_id, 4, 2560, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3367 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3368 else if ( pActor->pMonsterInfo.uMovementType == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3369 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3370 Actor::AI_RandomMove(actor_id, 4, 5120, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3371 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3372 else if ( pActor->pMonsterInfo.uMovementType == 4 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3373 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3374 Actor::AI_RandomMove(actor_id, 4, 10240, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3375 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3376 else if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3377 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3378 Actor::GetDirectionInfo(a1, 4u, &v72, 0);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3379 v58 = (uint)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333);
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3380 Actor::AI_Stand(actor_id, 4, v58, &v72);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3381 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3382 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3383 else if ( !pActor->pMonsterInfo.uMissleAttack2Type )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3384 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3385 if ( (double)v81 >= radiusMultiplier * 307.2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3386 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3387 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3388 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3389 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3390 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3391 else if ( v81 >= 1024 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3392 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3393 Actor::AI_Pursue3(actor_id, target_pid, 256, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3394 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3395 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3396 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3397 v70 = (int)(radiusMultiplier * 307.2);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3398 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3399 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3400 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3401 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3402 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3403 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3404 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3405 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3406 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3407 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3408 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3409 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3410 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3411 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3412 if ( radiusMultiplier * 307.2 > (double)v81 || pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3413 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3414 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3415 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3416 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3417 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3418 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3419 Actor::AI_MissileAttack2(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3420 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3421 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3422 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3423 //----- (0044665D) --------------------------------------------------------
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3424 // uType: 0 -> any monster
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3425 // 1 -> uParam is GroupID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3426 // 2 -> uParam is MonsterID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3427 // 3 -> uParam is ActorID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3428 // uNumAlive: 0 -> all must be alive
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3429 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3430 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3431 unsigned int uAliveActors; // eax@6
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3432 unsigned int uTotalActors; // [sp+0h] [bp-4h]@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3433
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3434 uTotalActors = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3435 if ( uType )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3436 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3437 if ( uType == 1 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3438 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3439 uAliveActors = SearchActorByGroup(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3440 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3441 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3442 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3443 if ( uType == 2 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3444 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3445 uAliveActors = SearchActorByMonsterID(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3446 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3447 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3448 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3449 if ( uType != 3 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3450 return 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3451 uAliveActors = SearchActorByID(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3452 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3453 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3454 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3455 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3456 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3457 uAliveActors = SearchAliveActors(&uTotalActors);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3458 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3459
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3460 if (uNumAlive)
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3461 return uAliveActors >= uNumAlive;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3462 else
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3463 return uTotalActors == uAliveActors;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3464 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3465 //----- (00408B54) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3466 unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3467 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3468 int v4; // eax@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3469 unsigned int v5; // ebx@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3470
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3471 v4 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3472 *pTotalActors = 0;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3473 if ( (pActors[a2].uAttributes & 0x100000) == GetAlertStatus() )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3474 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3475 *pTotalActors = 1;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3476 if ( pActors[a2].IsNotAlive() == 1 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3477 v5 = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3478 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3479 return v5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3480 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3481 //----- (00408AE7) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3482 unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3483 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3484 int v8; // [sp+Ch] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3485 unsigned int v9; // [sp+10h] [bp-4h]@1
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3486 Actor* v4;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3487
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3488 v8 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3489 *pTotalActors = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3490 v9 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3491 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3492 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3493 v4 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3494 if ( (v4->uAttributes & 0x100000) == v8 && v4->uGroup == uGroup)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3495 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3496 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3497 if ( v4->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3498 ++v9;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3499 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3500 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3501 return v9;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3502 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3503 //----- (00408A7E) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3504 unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3505 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3506 Actor *v4; // edi@2
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3507 int v8; // [sp+Ch] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3508 unsigned int v9; // [sp+10h] [bp-4h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3509
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3510 v8 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3511 *pTotalActors = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3512 v9 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3513 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3514 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3515 v4 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3516 if ( (v4->uAttributes & 0x100000) == v8 && v4->pMonsterInfo.field_33 == uMonsterID)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3517 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3518 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3519 if ( v4->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3520 ++v9;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3521 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3522 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3523 return v9;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3524 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3525 //----- (00408A27) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3526 unsigned int SearchAliveActors(unsigned int *pTotalActors)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3527 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3528 int v2; // eax@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3529 unsigned int v3; // ebp@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3530 Actor *v5; // edi@2
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3531
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3532 v2 = GetAlertStatus();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3533 v3 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3534 *pTotalActors = 0;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3535 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3536 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3537 v5 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3538 if ( (v5->uAttributes & 0x100000) == v2 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3539 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3540 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3541 if ( v5->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3542 ++v3;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3543 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3544 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3545 return v3;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3546 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3547 //----- (00408768) --------------------------------------------------------
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3548 void InitializeActors()
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3549 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3550 signed int v5; // [sp+Ch] [bp-10h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3551 signed int v6; // [sp+10h] [bp-Ch]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3552 signed int v7; // [sp+14h] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3553 signed int v8; // [sp+18h] [bp-4h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3554
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3555 v8 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3556 v6 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3557 v7 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3558 v5 = 0;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
3559 if ( !_stricmp(pCurrentMapName, "d25.blv") )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3560 v8 = 1;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
3561 if ( !_stricmp(pCurrentMapName, "d26.blv") )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3562 v6 = 1;
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
3563 if (pParty->IsPartyGood())
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3564 v7 = 1;
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
3565 if (pParty->IsPartyEvil())
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3566 v5 = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3567
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3568 Log::Warning(L"%S %S %u", __FILE__, __FUNCTION__, __LINE__); // ai_near_actors_targets_pid[i] for AI_Stand seems always 0; original code behaviour is identical
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3569 for (uint i = 0; i < uNumActors; ++i)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3570 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1974
diff changeset
3571 Actor* actor = &pActors[i];
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3572
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3573 if (actor->CanAct() || actor->uAIState == Disabled)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3574 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3575 actor->vPosition.x = actor->vInitialPosition.x;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3576 actor->vPosition.y = actor->vInitialPosition.y;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3577 actor->vPosition.z = actor->vInitialPosition.z;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3578 actor->sCurrentHP = actor->pMonsterInfo.uHP;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3579 if (actor->uAIState != Disabled)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3580 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3581 Actor::AI_Stand(i, ai_near_actors_targets_pid[i], actor->pMonsterInfo.uRecoveryTime, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3582 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3583 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3584
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3585 actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3586
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3587 if (!v8 || v7)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3588 if (!v6 || v5)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3589 if (actor->IsPeasant())
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3590 BYTE2(actor->uAttributes) &= 0xF7u;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3591
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3592 BYTE2(actor->uAttributes) &= 0x7Fu;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3593 if (BYTE2(actor->uAttributes) & 0x40)
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
3594 Actor::_4031C1_update_job_never_gets_called(i, pParty->uCurrentHour, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3595 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3596 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3597 //----- (00439474) --------------------------------------------------------
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3598 void DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, Vec3_int_ *pVelocity)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3599 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3600 SpriteObject *projectileSprite; // ebx@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3601 Actor *pMonster; // esi@7
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3602 unsigned __int16 v16; // cx@25
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3603 int v33; // eax@100
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3604 int v40; // ebx@107
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3605 int extraRecoveryTime; // qax@125
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3606 unsigned __int16 v43; // ax@132
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3607 unsigned __int16 v45; // ax@132
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3608 unsigned __int64 v46; // [sp+Ch] [bp-60h]@6
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3609 char *pPlayerName; // [sp+18h] [bp-54h]@12
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3610 char *pMonsterName; // [sp+1Ch] [bp-50h]@6
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3611 signed int a4; // [sp+44h] [bp-28h]@1
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3612 bool IsAdditionalDamagePossible; // [sp+50h] [bp-1Ch]@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3613 int v61; // [sp+58h] [bp-14h]@1
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3614 bool isLifeStealing; // [sp+5Ch] [bp-10h]@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3615 int uDamageAmount; // [sp+60h] [bp-Ch]@1
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3616 DAMAGE_TYPE attackElement; // [sp+64h] [bp-8h]@27
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3617
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3618 projectileSprite = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3619 uDamageAmount = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3620 a4 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3621 v61 = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3622 IsAdditionalDamagePossible = false;
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3623 isLifeStealing = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3624 if ( PID_TYPE(a1) == OBJECT_Item)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3625 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3626 projectileSprite = &pSpriteObjects[PID_ID(a1)];
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3627 v61 = projectileSprite->field_60_distance_related_prolly_lod;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3628 a1 = projectileSprite->spell_caster_pid;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3629 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3630 if (PID_TYPE(a1) != OBJECT_Player)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3631 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3632
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3633 assert(PID_ID(abs(a1)) < 4);
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3634 Player* player = &pParty->pPlayers[PID_ID(a1)];
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3635 pMonster = &pActors[uActorID_Monster];
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3636 if (pMonster->IsNotAlive())
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3637 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3638
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3639 pMonster->uAttributes |= 0xC000;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3640 if ( pMonster->uAIState == Fleeing )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3641 pMonster->uAttributes |= 0x20000u;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3642 bool hit_will_stun = false,
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3643 hit_will_paralyze = false;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3644 if ( !projectileSprite )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3645 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3646 int main_hand_idx = player->pEquipment.uMainHand;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3647 IsAdditionalDamagePossible = true;
1989
33787c8938a5 Single and Two-handed ENUM
zipi
parents: 1988
diff changeset
3648 if ( player->HasItemEquipped(EQUIP_TWO_HANDED) )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3649 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3650 uint main_hand_skill = player->GetMainHandItem()->GetPlayerSkillType();
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3651 uint main_hand_mastery = SkillToMastery(player->pActiveSkills[main_hand_skill]);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3652 switch (main_hand_skill)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3653 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3654 case PLAYER_SKILL_STAFF:
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3655 if (main_hand_mastery >= 3)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3656 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3657 if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_STAFF) & 0x3F)) // stun chance when mastery >= 3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3658 hit_will_stun = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3659 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3660 break;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3661
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3662 case PLAYER_SKILL_MACE:
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3663 if (main_hand_mastery >= 3)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3664 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3665 if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3666 hit_will_stun = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3667 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3668 if (main_hand_mastery >= 4)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3669 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3670 if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3671 hit_will_paralyze = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3672 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3673 break;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3674 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3675 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3676 attackElement = DMGT_PHISYCAL;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3677 uDamageAmount = player->CalculateMeleeDamageTo(false, false, pMonster->pMonsterInfo.uID);
1928
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3678 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3679 {
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3680 player->PlaySound(SPEECH_52, 0);
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3681 return;
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3682 }
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3683 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3684 else
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3685 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3686 v61 = projectileSprite->field_60_distance_related_prolly_lod;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3687 if ( projectileSprite->spell_id != SPELL_DARK_SOULDRINKER )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3688 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3689 std::array<int, 3> distances;
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3690 distances[0] = abs(pParty->vPosition.x - projectileSprite->vPosition.x);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3691 distances[1] = abs(pParty->vPosition.y - projectileSprite->vPosition.y);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3692 distances[2] = abs(pParty->vPosition.z - projectileSprite->vPosition.z);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3693 std::sort(distances.begin(), distances.end());
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3694 v61 = ((unsigned int)(11 * distances[1]) >> 5) + (distances[0] >> 2) + distances[2];
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3695
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3696 if ( v61 >= 5120 && !(BYTE1(pMonster->uAttributes) & 4) )
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3697 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3698 return;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3699 }
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3700 else if ( v61 >= 2560 )
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3701 {
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3702 v61 = 2;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3703 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3704 else
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3705 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3706 v61 = 1;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3707 }
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3708 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3709
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3710 switch (projectileSprite->spell_id)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3711 {
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3712 case SPELL_LASER_PROJECTILE:
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3713 v16 = player->pActiveSkills[PLAYER_SKILL_BLASTER];
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3714 v61 = 1;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3715 if ( (signed int)SkillToMastery(v16) >= 3 )
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3716 a4 = player->pActiveSkills[PLAYER_SKILL_BLASTER] & 0x3F;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3717 attackElement = DMGT_PHISYCAL;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3718 uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3719 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3720 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3721 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3722 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3723 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3724 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3725 case SPELL_101:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3726 attackElement = DMGT_FIRE;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3727 uDamageAmount = player->CalculateRangedDamageTo(0);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3728 if ( pMonster->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime > 0 )
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3729 uDamageAmount >>= 1;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3730 IsAdditionalDamagePossible = true;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3731 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3732 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3733 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3734 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3735 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3736 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3737 case SPELL_EARTH_BLADES:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3738 a4 = 5 * projectileSprite->spell_level;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3739 attackElement = (DAMAGE_TYPE)player->GetSpellSchool(SPELL_EARTH_BLADES);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3740 uDamageAmount = _43AFE3_calc_spell_damage(39, projectileSprite->spell_level, projectileSprite->spell_skill, pMonster->sCurrentHP);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3741 if ( pMonster->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime > 0 )
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3742 uDamageAmount >>= 1;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3743 IsAdditionalDamagePossible = false;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3744 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3745 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3746 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3747 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3748 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3749 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3750 case SPELL_EARTH_STUN:
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3751 uDamageAmount = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3752 attackElement = DMGT_PHISYCAL;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3753 hit_will_stun = 1;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3754 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3755 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3756 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3757 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3758 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3759 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3760 case SPELL_BOW_ARROW:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3761 attackElement = DMGT_PHISYCAL;
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3762 uDamageAmount = player->CalculateRangedDamageTo(pMonster->word_000086_some_monster_id);
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3763 if ( pMonster->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime > 0 )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3764 uDamageAmount /= 2;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3765 IsAdditionalDamagePossible = true;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3766 if ( projectileSprite->stru_24.uItemID != 0 && projectileSprite->stru_24.uSpecEnchantmentType == 3 ) //of carnage
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3767 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3768 attackElement = DMGT_FIRE;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3769 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3770 else if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3771 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3772 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3773 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3774 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3775 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3776
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3777 default:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3778 attackElement = (DAMAGE_TYPE)player->GetSpellSchool(projectileSprite->spell_id);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3779 IsAdditionalDamagePossible = false;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3780 uDamageAmount = _43AFE3_calc_spell_damage(projectileSprite->spell_id, projectileSprite->spell_level, projectileSprite->spell_skill, pMonster->sCurrentHP);
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3781 break;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3782 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3783 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3784
1362
d6cf8ead9242 Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents: 1359
diff changeset
3785 if (player->IsWeak())
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3786 uDamageAmount /= 2;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3787 if ( pMonster->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3788 uDamageAmount = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3789 v61 = stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, uDamageAmount);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3790 if ( !projectileSprite && player->IsUnarmed() && player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uExpireTime > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3791 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3792 v61 += stru_50C198.CalcMagicalDamageToActor(pMonster, 8, player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uPower);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3793 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3794 uDamageAmount = v61;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3795 if ( IsAdditionalDamagePossible )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3796 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3797 if ( projectileSprite )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3798 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3799 a4 = projectileSprite->stru_24._439DF3_get_additional_damage((int*)&attackElement, &isLifeStealing);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3800 if ( isLifeStealing && pMonster->sCurrentHP > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3801 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3802 player->sHealth += v61 / 5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3803 if ( player->sHealth > player->GetMaxHealth() )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3804 player->sHealth = player->GetMaxHealth();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3805 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3806 uDamageAmount += stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, a4);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3807 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3808 else
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3809 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3810 for (int i = 0; i < 2; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3811 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3812 if ( player->HasItemEquipped((ITEM_EQUIP_TYPE)i) )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3813 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3814 ItemGen* item;
1992
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3815 if (i == 0)
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3816 item = player->GetOffHandItem();
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3817 else
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3818 item = player->GetMainHandItem();
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3819 a4 = item->_439DF3_get_additional_damage((int*)&attackElement, &isLifeStealing);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3820 if ( isLifeStealing && pMonster->sCurrentHP > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3821 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3822 player->sHealth += v61 / 5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3823 if ( player->sHealth > player->GetMaxHealth() )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3824 player->sHealth = player->GetMaxHealth();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3825 }
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3826 uDamageAmount += stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, a4);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3827 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3828 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3829 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3830 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3831 pMonster->sCurrentHP -= uDamageAmount;
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3832 if ( uDamageAmount == 0 && !hit_will_stun )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3833 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3834 player->PlaySound(SPEECH_52, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3835 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3836 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3837 if ( pMonster->sCurrentHP > 0 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3838 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3839 Actor::AI_Stun(uActorID_Monster, a1, 0);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3840 Actor::AggroSurroundingPeasants(uActorID_Monster, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3841 if ( bShowDamage )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3842 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3843 if ( projectileSprite )
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3844 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[189], player->pName, pMonster->pActorName, uDamageAmount);// "%s shoots %s for %lu points"
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3845 else
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3846 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[164], player->pName, pMonster->pActorName, uDamageAmount);// "%s hits %s for %lu damage"
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3847 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3848 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3849 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3850 else
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3851 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3852 if ( pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].bQuestMonster & 1 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3853 {
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
3854 if ( /*pRenderer->pRenderD3D &&*/ pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3855 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
3856 v33 = byte_4D864C && pGame->uFlags & 0x80000 ? 10 * pMonster->uActorRadius : pMonster->uActorRadius;
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3857 pDecalBuilder->AddBloodsplat((float)pMonster->vPosition.x, (float)pMonster->vPosition.y, (float)pMonster->vPosition.z, 1.0, 0.0, 0.0, (float)v33, 0, 0);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3858 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3859 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3860 Actor::Die(uActorID_Monster);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3861 Actor::ApplyFineForKillingPeasant(uActorID_Monster);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3862 Actor::AggroSurroundingPeasants(uActorID_Monster, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3863 if ( pMonster->pMonsterInfo.uExp )
1827
0c75c3e7e436 cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents: 1817
diff changeset
3864 pParty->GivePartyExp(pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].uExp);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3865 v40 = SPEECH_51;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3866 if ( rand() % 100 < 20 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3867 v40 = ((signed int)pMonster->pMonsterInfo.uHP >= 100) + 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3868 player->PlaySound((PlayerSpeech)v40, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3869 if ( bShowDamage )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3870 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3871 pMonsterName = (char *)uDamageAmount;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3872 pPlayerName = player->pName; // "%s inflicts %lu points killing %s"
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3873 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[175], player->pName, uDamageAmount, pMonster);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3874 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3875 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3876 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3877 if ( pMonster->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].uExpireTime > 0
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3878 && uDamageAmount != 0 )
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3879 player->ReceiveDamage(uDamageAmount, attackElement);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3880 int knockbackValue = 20 * v61 / (signed int)pMonster->pMonsterInfo.uHP;
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3881 if ( (player->GetSpecialItemBonus(24) || hit_will_stun) && stru_50C198.GetMagicalResistance(pMonster, DMGT_EARTH) )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3882 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3883 extraRecoveryTime = 20;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3884 knockbackValue = 10;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3885 if ( !pParty->bTurnBasedModeOn )
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3886 extraRecoveryTime = (int)(flt_6BE3A8_debug_recmod2 * 42.66666666666666);
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3887 pMonster->pMonsterInfo.uRecoveryTime += extraRecoveryTime;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3888 if ( bShowDamage )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3889 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3890 pMonsterName = player->pName; // "%s stuns %s"
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3891 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[635], player->pName, pMonster);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3892 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3893 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3894 }
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3895 if ( hit_will_paralyze && pMonster->CanAct() && stru_50C198.GetMagicalResistance(pMonster, DMGT_EARTH))
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3896 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3897 v43 = player->GetActualSkillLevel(PLAYER_SKILL_MACE);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3898 v45 = SkillToMastery(v43);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3899 v46 = pParty->uTimePlayed + (signed int)(signed __int64)((double)(signed int)(7680 * (v43 & 0x3F)) * 0.033333335);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3900 pMonster->pActorBuffs[ACTOR_BUFF_PARALYZED].Apply(v46, v45, 0, 0, 0);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3901 if ( bShowDamage )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3902 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3903 pMonsterName = player->pName; // "%s paralyzes %s"
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3904 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[636], player->pName, pMonster);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3905 ShowStatusBarString(pTmpBuf.data(), 2u);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3906 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3907 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3908 if ( knockbackValue > 10 )
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3909 knockbackValue = 10;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3910 if ( !MonsterStats::BelongsToSupertype(pMonster->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3911 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3912 pVelocity->x = (unsigned __int64)(knockbackValue * (signed __int64)pVelocity->x) >> 16;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3913 pVelocity->y = (unsigned __int64)(knockbackValue * (signed __int64)pVelocity->y) >> 16;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3914 pVelocity->z = (unsigned __int64)(knockbackValue * (signed __int64)pVelocity->z) >> 16;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3915 pMonster->vVelocity.x = 50 * LOWORD(pVelocity->x);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3916 pMonster->vVelocity.y = 50 * LOWORD(pVelocity->y);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3917 pMonster->vVelocity.z = 50 * LOWORD(pVelocity->z);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3918 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3919 Actor::AddBloodsplatOnDamageOverlay(uActorID_Monster, 1, v61);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3920 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3921 //----- (004BBF61) --------------------------------------------------------
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3922 void Actor::_4BBF61_summon_actor( int a1, __int16 x, int y, int z )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3923 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3924 Actor *v7; // esi@5
2135
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3925 //MonsterInfo *v9; // edi@5
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3926 //MonsterDesc *v10; // ebx@5
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3927 int v12; // ebx@7
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3928 int v13; // eax@8
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3929 __int16 v16; // [sp+10h] [bp-4h]@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3930
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1554
diff changeset
3931 if (uNumActors < 500)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3932 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3933 v16 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3934 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3935 v16 = pIndoor->GetSector(x, y, z);
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3936 v7 = &pActors[uNumActors];
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3937 v7->Reset();
2135
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3938 //v9 = &pMonsterStats->pInfos[a1];
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3939 //v10 = &pMonsterList->pMonsters[a1 - 1];
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3940 strcpy(v7->pActorName, pMonsterStats->pInfos[a1].pName);
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3941 v7->sCurrentHP = LOWORD(pMonsterStats->pInfos[a1].uHP);
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3942 memcpy(&v7->pMonsterInfo, &pMonsterStats->pInfos[a1], 0x58u);
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3943 v7->word_000086_some_monster_id = a1;
2135
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3944 v7->uActorRadius = pMonsterList->pMonsters[a1 - 1].uMonsterRadius;
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3945 v7->uActorHeight = pMonsterList->pMonsters[a1 - 1].uMonsterHeight;
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3946 v7->uMovementSpeed = pMonsterList->pMonsters[a1 - 1].uMovementSpeed;
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3947 v7->vInitialPosition.x = x;
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3948 v7->vPosition.x = x;
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3949 v7->uAttributes |= 80000;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3950 v7->pMonsterInfo.uTreasureType = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3951 v7->pMonsterInfo.uTreasureLevel = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3952 v7->pMonsterInfo.uTreasureDiceSides = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3953 v7->pMonsterInfo.uTreasureDiceRolls = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3954 v7->pMonsterInfo.uTreasureDropChance = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3955 v7->vInitialPosition.y = y;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3956 v7->vPosition.y = y;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3957 v7->vInitialPosition.z = z;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3958 v7->vPosition.z = z;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3959 v7->uTetherDistance = 256;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3960 v7->uSectorID = v16;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3961 v7->uGroup = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3962 v7->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3963 v7->PrepareSprites(0);
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3964 for ( int i = 0; i < 4; i++)
2135
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3965 pSoundList->LoadSound(pMonsterList->pMonsters[a1 - 1].pSoundSampleIDs[i], 0);
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3966 //v12 = 0;
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3967 //do//áåñêîíå÷íûé öèêë
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3968 //{
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3969 //LOWORD(v13) = pSoundList->LoadSound(v12 + word_4EE088_sound_ids[pMonsterStats->pInfos[a1].uSpell1ID], 1);
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3970 //v12++;
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3971 //}
e99081a3a66a Arena works
Ritor1
parents: 2114
diff changeset
3972 //while ( v13 );
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3973 ++uNumActors;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3974 }
1911
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3975 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3976 //----- (00426E10) --------------------------------------------------------
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3977 int stru319::which_player_to_attack(Actor *pActor)
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3978 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3979 signed int v2; // ebx@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3980 bool flag; // edi@37
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3981 int v22; // [sp+8h] [bp-140h]@3
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3982 int Victims_list[60]; // [sp+48h] [bp-100h]@48
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3983 int for_sex; // [sp+13Ch] [bp-Ch]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3984 int for_race; // [sp+140h] [bp-8h]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3985 int for_class; // [sp+144h] [bp-4h]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3986
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3987 for_class = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3988 for_race = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3989 for_sex = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3990 v2 = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3991 if ( pActor->pMonsterInfo.uAttackPreference )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3992 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3993 for ( uint i = 0; i < 16; i++ )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3994 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3995 v22 = pActor->pMonsterInfo.uAttackPreference & (1 << i);
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3996 if ( v22 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3997 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3998 switch ( v22 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3999 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4000 case 1:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4001 for_class = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4002 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4003 case 2:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4004 for_class = 12;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4005 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4006 case 4:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4007 for_class = 16;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4008 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4009 case 8:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4010 for_class = 28;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4011 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4012 case 16:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4013 for_class = 24;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4014 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4015 case 32:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4016 for_class = 32;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4017 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4018 case 64:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4019 for_class = 20;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4020 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4021 case 128:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4022 for_class = 4;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4023 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4024 case 256:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4025 for_class = 8;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4026 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4027 case 512:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4028 for_sex = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4029 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4030 case 1024:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4031 for_sex = 1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4032 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4033 case 2048:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4034 for_race = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4035 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4036 case 4096:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4037 for_race = 1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4038 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4039 case 8192:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4040 for_race = 3;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4041 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4042 case 16384:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4043 for_race = 2;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4044 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4045 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4046 v2 = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4047 for ( uint j = 0; j < 4; ++j )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4048 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4049 flag = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4050 if ( for_class != -1 && for_class == pPlayers[j + 1]->classType )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4051 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4052 if ( for_sex != -1 && for_sex == pPlayers[j + 1]->uSex )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4053 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4054 if ( for_race != -1 && for_race == pPlayers[j + 1]->GetRace() )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4055 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4056 if ( flag == true )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4057 {
2057
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
4058 if ( !(pPlayers[j + 1]->pConditions[Condition_Paralyzed] | pPlayers[j + 1]->pConditions[Condition_Unconcious]
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
4059 | pPlayers[j + 1]->pConditions[Condition_Dead] | pPlayers[j + 1]->pConditions[Condition_Pertified] | pPlayers[j + 1]->pConditions[Condition_Eradicated]) )
1911
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4060 Victims_list[v2++] = j;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4061 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4062 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4063 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4064 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4065 if ( v2 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4066 return Victims_list[rand() % v2];
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4067 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4068 for ( uint i = 0; i < 4; ++i )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4069 {
2057
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
4070 if ( !(pPlayers[i + 1]->pConditions[Condition_Paralyzed] | pPlayers[i + 1]->pConditions[Condition_Unconcious]
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
4071 | pPlayers[i + 1]->pConditions[Condition_Dead] | pPlayers[i + 1]->pConditions[Condition_Pertified] | pPlayers[i + 1]->pConditions[Condition_Eradicated]) )
1911
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4072 Victims_list[v2++] = i;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4073 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4074 if ( v2 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4075 return Victims_list[rand() % v2];
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4076 else
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4077 return 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
4078 }
1936
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4079 //----- (0042F4DA) --------------------------------------------------------
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4080 bool CheckActors_proximity()
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4081 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4082 signed int distance; // edi@1
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4083 int for_x; // ebx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4084 int for_y; // [sp+Ch] [bp-10h]@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4085 int for_z; // [sp+10h] [bp-Ch]@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4086 int v3; // eax@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4087 int v4; // ebx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4088 unsigned int v5; // ecx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4089 int v6; // edx@6
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4090 unsigned int v7; // edx@8
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4091 unsigned int v8; // edx@10
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4092
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4093
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4094 distance = 5120;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4095 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4096 distance = 2560;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4097
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4098 if ( (signed int)uNumActors <= 0 )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4099 return false;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4100 for ( uint i = 0; i < (signed int)uNumActors; ++i )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4101 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4102 for_x = abs(pActors[i].vInitialPosition.x - pParty->vPosition.x);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4103 for_y = abs(pActors[i].vInitialPosition.y - pParty->vPosition.y);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4104 for_z = abs(pActors[i].vInitialPosition.z - pParty->vPosition.z);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4105 v3 = for_x;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4106 v4 = for_y;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4107 v5 = for_z;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4108 if ( v3 < for_y )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4109 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4110 v6 = v3;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4111 v3 = for_y;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4112 v4 = v6;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4113 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4114 if ( v3 < for_z )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4115 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4116 v7 = v3;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4117 v3 = for_z;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4118 v5 = v7;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4119 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4120 if ( v4 < (signed int)v5 )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4121 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4122 v8 = v5;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4123 v5 = v4;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4124 v4 = v8;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4125 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4126 if ( (signed int)(((unsigned int)(11 * v4) >> 5) + (v5 >> 2) + v3) < distance )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4127 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4128 if ( pActors[i].uAIState != Dead )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4129 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4130 if ( pActors[i].uAIState != Dying && pActors[i].uAIState != Removed
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4131 && pActors[i].uAIState != Disabled && pActors[i].uAIState != Summoned
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4132 && (BYTE2(pActors[i].uAttributes) & 8 || pActors[i].GetActorsRelation(0) ) )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4133 return true;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4134 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4135 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4136 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4137 return false;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4138 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4139
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4140
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4141 //----- (00426A5A) --------------------------------------------------------
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4142 void Actor::LootActor()
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4143 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4144 signed int v2; // edi@1
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4145 unsigned __int8 v7; // al@30
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4146 char *v9; // [sp-4h] [bp-3Ch]@10
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4147 char *v10; // [sp-4h] [bp-3Ch]@31
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4148 char *v11; // [sp-4h] [bp-3Ch]@38
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4149 ItemGen Dst; // [sp+Ch] [bp-2Ch]@1
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4150 bool itemFound; // [sp+30h] [bp-8h]@1
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4151 int v14; // [sp+34h] [bp-4h]@1
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4152
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4153 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4154 Dst.Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4155 v2 = 0;
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4156 itemFound = false;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4157 v14 = 0;
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4158 if ( !( this->uAttributes & 0x800000 ) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4159 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4160 for (uchar i = 0; i < this->pMonsterInfo.uTreasureDiceRolls; i++ )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4161 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4162 v14 += rand() % this->pMonsterInfo.uTreasureDiceSides + 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4163 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4164 if ( v14 != 0 )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4165 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4166 pParty->PartyFindsGold(v14, 0);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4167 viewparams->bRedrawGameUI = 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4168 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4169 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4170 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4171 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4172 if ( this->array_000234[3].uItemID != 0 && this->array_000234[3].GetItemEquipType() == EQUIP_GOLD )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4173 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4174 v14 = this->array_000234[3].uSpecEnchantmentType;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4175 this->array_000234[3].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4176 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4177 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4178 pParty->PartyFindsGold(v14, 0);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4179 viewparams->bRedrawGameUI = 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4180 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4181 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4182 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4183 if ( this->uCarriedItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4184 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4185 Dst.Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4186 Dst.uItemID = this->uCarriedItemID;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4187 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4188 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4189 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[490], v14, v9);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4190 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4191 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v9);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4192 ShowStatusBarString(pTmpBuf2.data(), 2u);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4193 if ( Dst.GetItemEquipType() == 12 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4194 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4195 Dst.uNumCharges = rand() % 6 + Dst.GetDamageMod() + 1;
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4196 Dst.uMaxCharges = Dst.uNumCharges;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4197 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4198 if ( pItemsTable->pItems[Dst.uItemID].uEquipType == 14 && Dst.uItemID != 220 )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4199 Dst.uEnchantmentType = 2 * rand() % 4 + 2;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4200 pItemsTable->SetSpecialBonus(&Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4201 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4202 pParty->SetHoldingItem(&Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4203 this->uCarriedItemID = 0;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4204 if ( this->array_000234[0].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4205 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4206 if ( !pParty->AddItemToParty(this->array_000234) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4207 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4208 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4209 pParty->SetHoldingItem(this->array_000234);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4210 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4211 this->array_000234[0].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4212 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4213 if ( this->array_000234[1].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4214 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4215 if ( !pParty->AddItemToParty(&this->array_000234[1]) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4216 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4217 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4218 pParty->SetHoldingItem(&this->array_000234[1]);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4219 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4220 this->array_000234[1].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4221 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4222 this->Remove();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4223 return;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4224 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4225 if ( ( this->uAttributes & 0x800000 ) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4226 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4227 if ( this->array_000234[3].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4228 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4229 memcpy(&Dst, &this->array_000234[3], sizeof(Dst));
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4230 this->array_000234[3].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4231 v11 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4232 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4233 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[490], v14, v11);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4234 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4235 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v11);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4236 ShowStatusBarString(pTmpBuf2.data(), 2u);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4237 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4238 pParty->SetHoldingItem(&Dst);
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4239 itemFound = true;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4240 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4241 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4242 else
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4243 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4244 if ( rand() % 100 < this->pMonsterInfo.uTreasureDropChance && (v7 = this->pMonsterInfo.uTreasureLevel) != 0 )
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4245 {
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4246 pItemsTable->GenerateItem(v7, this->pMonsterInfo.uTreasureType, &Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4247 v10 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4248 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4249 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[490], v14, v10);//Âû íàøëè ^I[%d] çîëîò^L[îé;ûõ;ûõ] è ïðåäìåò (%s)!
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4250 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4251 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v10);//Âû íàøëè ^Pv[%s]!
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4252 ShowStatusBarString(pTmpBuf2.data(), 2);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4253 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4254 pParty->SetHoldingItem(&Dst);
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4255 itemFound = true;
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4256 }
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4257 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4258 if ( this->array_000234[0].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4259 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4260 if ( !pParty->AddItemToParty(this->array_000234) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4261 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4262 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4263 pParty->SetHoldingItem(this->array_000234);
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4264 itemFound = true;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4265 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4266 this->array_000234[0].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4267 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4268 if ( this->array_000234[1].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4269 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4270 if ( !pParty->AddItemToParty(&this->array_000234[1]) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4271 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4272 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4273 pParty->SetHoldingItem(&this->array_000234[1]);
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4274 itemFound = true;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4275 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4276 this->array_000234[1].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4277 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4278 if ( !itemFound || rand() % 100 < 90 )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4279 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4280 this->Remove();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4281 }
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4282 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4283
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4284
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4285 //----- (00427102) --------------------------------------------------------
1971
e45c277da9f1 Actor::_427102 to Actor::_427102_IsOkToCastSpell
Grumpy7
parents: 1970
diff changeset
4286 bool Actor::_427102_IsOkToCastSpell( signed int a2 )
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4287 {
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4288 switch(a2)
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4289 {
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4290 case SPELL_BODY_POWER_CURE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4291 {
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4292 if ( this->sCurrentHP >= (signed int)this->pMonsterInfo.uHP )
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4293 return false;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4294 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4295 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4296 case SPELL_LIGHT_DISPEL_MAGIC:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4297 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4298 for (int i = 0; i < 20; i++)
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4299 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4300 if (pParty->pPartyBuffs[i].uExpireTime > 0)
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4301 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4302 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4303 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4304 }
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4305 for ( int i = 1; i <= 4; i++ )
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4306 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4307 for ( int j = 0; j < 22; j++ )
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4308 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4309 if (pPlayers[i]->pPlayerBuffs[j].uExpireTime > 0)
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4310 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4311 return true;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4312 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4313 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4314 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4315 return false;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4316 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4317 case SPELL_LIGHT_DAY_OF_PROTECTION:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4318 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4319 return this->pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4320 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4321 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4322 case SPELL_LIGHT_HOUR_OF_POWER:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4323 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4324 return this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4325 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4326 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4327 case SPELL_DARK_PAIN_REFLECTION:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4328 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4329 return this->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4330 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4331 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4332 case SPELL_BODY_HAMMERHANDS:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4333 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4334 return this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4335 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4336 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4337 case SPELL_FIRE_HASTE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4338 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4339 return this->pActorBuffs[ACTOR_BUFF_HASTE].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4340 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4341 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4342 case SPELL_AIR_SHIELD:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4343 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4344 return this->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4345 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4346 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4347 case SPELL_EARTH_STONESKIN:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4348 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4349 return this->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime <= 0;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4350 break;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4351 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4352 case SPELL_SPIRIT_BLESS:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4353 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4354 return this->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4355 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4356 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4357 case SPELL_SPIRIT_FATE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4358 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4359 return this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4360 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4361 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4362 case SPELL_SPIRIT_HEROISM:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4363 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4364 return this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4365 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4366 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4367 default:
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4368 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4369 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4370 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4371 }
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4372 }
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4373
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4374
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4375 //----- (0042704B) --------------------------------------------------------
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4376 ABILITY_INDEX Actor::special_ability_use_check( int a2 )
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4377 {
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4378 signed int okToCastSpell1; // ebx@5
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4379 signed int okToCastSpell2; // edi@5
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4380
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4381 if ( this->pMonsterInfo.uSpecialAbilityType == 2
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4382 && this->pMonsterInfo.uSpecialAbilityDamageDiceBonus < 3u
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4383 && rand() % 100 < 5 )
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4384 this->SummonMinion(a2);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4385 okToCastSpell1 = this->_427102_IsOkToCastSpell(this->pMonsterInfo.uSpell1ID);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4386 okToCastSpell2 = this->_427102_IsOkToCastSpell(this->pMonsterInfo.uSpell2ID);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4387 if ( okToCastSpell1 && this->pMonsterInfo.uSpell1UseChance && rand() % 100 < this->pMonsterInfo.uSpell1UseChance )
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4388 return ABILITY_SPELL1;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4389 if ( okToCastSpell2 && this->pMonsterInfo.uSpell2UseChance && rand() % 100 < this->pMonsterInfo.uSpell2UseChance )
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4390 return ABILITY_SPELL2;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4391 if (this->pMonsterInfo.uAttack2Chance && rand() % 100 < this->pMonsterInfo.uAttack2Chance)
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4392 return ABILITY_ATTACK2;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4393 return ABILITY_ATTACK1;
1974
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4394 }
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4395
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4396
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4397
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4398 //----- (004273BB) --------------------------------------------------------
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4399 bool Actor::_4273BB_DoesHitOtherActor( Actor *defender, int a3, int a4 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4400 {
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4401 signed int v6; // ebx@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4402 signed int v7; // esi@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4403 int armorSum; // ebx@10
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4404 signed int a2a; // [sp+18h] [bp+Ch]@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4405
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4406 v6 = defender->pMonsterInfo.uAC;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4407 v7 = 0;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4408 a2a = 0;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4409 if ( defender->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4410 v6 /= 2;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4411 if ( defender->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4412 v7 = defender->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4413 if ( defender->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && defender->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > v7 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4414 v7 = defender->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4415 armorSum = v7 + v6;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4416 if ( this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4417 a2a = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4418 if ( this->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime > 0 && this->pActorBuffs[ACTOR_BUFF_BLESS].uPower > a2a )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4419 a2a = this->pActorBuffs[ACTOR_BUFF_BLESS].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4420 if ( this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4421 {
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4422 a2a += this->pActorBuffs[ACTOR_BUFF_FATE].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4423 this->pActorBuffs[ACTOR_BUFF_FATE].Reset();
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4424 }
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4425 return rand() % (armorSum + 2 * this->pMonsterInfo.uLevel + 10) + a2a + 1 > armorSum + 5;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4426 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4427
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4428 //----- (00448A98) --------------------------------------------------------
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4429 void __fastcall ToggleActorGroupFlag(unsigned int uGroupID, unsigned int uFlag, unsigned int bToggle)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4430 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4431 if ( uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4432 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4433 if ( bToggle )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4434 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4435 for ( uint i = 0; i < (unsigned int)uNumActors; ++i )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4436 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4437 if ( pActors[i].uGroup == uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4438 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4439 pActors[i].uAttributes |= uFlag;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4440 if ( uFlag == 0x10000 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4441 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4442 pActors[i].uAIState = Disabled;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4443 pActors[i].UpdateAnimation();
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4444 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4445 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4446 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4447 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4448 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4449 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4450 for ( uint i = 0; i < (unsigned int)uNumActors; ++i )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4451 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4452 if ( pActors[i].uGroup == uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4453 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4454 if ( uFlag == 0x10000 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4455 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4456 if ( pActors[i].uAIState != Dead )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4457 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4458 if ( pActors[i].uAIState != 4 && pActors[i].uAIState != 11 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4459 pActors[i].uAIState = Standing;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4460 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4461 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4462 LODWORD(pActors[i].uAttributes) &= ~uFlag;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4463 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4464 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4465 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4466 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4467 }