Mercurial > mm7

annotate Actor.cpp @ 2228:b65e71eadd1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add this->field_0 = 0; in OtherOverlay::Reset()
author Ritor1
date Fri, 21 Feb 2014 18:02:20 +0600
parents e18200fcfb50
children 6ab7d7c112bb
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 )
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1390 pOtherOverlayList->_4418B6(904, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1391 return;
0
Ritor1
parents:
diff changeset
1392 case 2:
Ritor1
parents:
diff changeset
1393 if ( a3 )
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1394 pOtherOverlayList->_4418B6(905, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1395 return;
0
Ritor1
parents:
diff changeset
1396 case 3:
Ritor1
parents:
diff changeset
1397 if ( a3 )
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1398 pOtherOverlayList->_4418B6(906, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1399 return;
0
Ritor1
parents:
diff changeset
1400 case 4:
Ritor1
parents:
diff changeset
1401 if ( a3 )
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1402 pOtherOverlayList->_4418B6(907, v4, 0, (int)(sub_43AE12(a3) * 65536.0), 0);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1403 return;
0
Ritor1
parents:
diff changeset
1404 case 5:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1405 pOtherOverlayList->_4418B6(901, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1406 return;
0
Ritor1
parents:
diff changeset
1407 case 6:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1408 pOtherOverlayList->_4418B6(902, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1409 return;
0
Ritor1
parents:
diff changeset
1410 case 7:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1411 pOtherOverlayList->_4418B6(903, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1412 return;
0
Ritor1
parents:
diff changeset
1413 case 8:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1414 pOtherOverlayList->_4418B6(900, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1415 return;
0
Ritor1
parents:
diff changeset
1416 case 9:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1417 pOtherOverlayList->_4418B6(909, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1418 return;
0
Ritor1
parents:
diff changeset
1419 case 10:
1874
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1420 pOtherOverlayList->_4418B6(908, v4, 0, PID(OBJECT_Actor,uActorID), 0);
a6276dda8804 Actor::AddBloodsplatOnDamageOverlay cleaned up
Grumpy7
parents: 1873
diff changeset
1421 return;
0
Ritor1
parents:
diff changeset
1422 default:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1423 return;
0
Ritor1
parents:
diff changeset
1424 }
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1425 return;
0
Ritor1
parents:
diff changeset
1426 }
Ritor1
parents:
diff changeset
1427
Ritor1
parents:
diff changeset
1428 //----- (0043B3E0) --------------------------------------------------------
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1429 int Actor::_43B3E0_CalcDamage( signed int dmgSource )
0
Ritor1
parents:
diff changeset
1430 {
Ritor1
parents:
diff changeset
1431 signed int v2; // ebp@1
Ritor1
parents:
diff changeset
1432 int v3; // eax@9
Ritor1
parents:
diff changeset
1433 signed int v4; // edi@9
Ritor1
parents:
diff changeset
1434 int v5; // esi@9
Ritor1
parents:
diff changeset
1435 unsigned __int16 v8; // si@21
Ritor1
parents:
diff changeset
1436 int v9; // edi@21
Ritor1
parents:
diff changeset
1437 signed int v10; // eax@23
Ritor1
parents:
diff changeset
1438 int v11; // [sp+10h] [bp-4h]@1
Ritor1
parents:
diff changeset
1439
Ritor1
parents:
diff changeset
1440 v2 = 0;
Ritor1
parents:
diff changeset
1441 v11 = 0;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1442
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1443 switch( dmgSource )
0
Ritor1
parents:
diff changeset
1444 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1445 case 0:
1958
95095c2a5e19 pActorBuffs[14] to pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER]
Grumpy7
parents: 1957
diff changeset
1446 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
1447 v2 = this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
1962
39a68477ead3 pActorBuffs[18] to pActorBuffs[ACTOR_BUFF_HEROISM]
Grumpy7
parents: 1961
diff changeset
1448 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
1449 v2 = this->pActorBuffs[ACTOR_BUFF_HEROISM].uPower;
1965
182d49f28170 pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
Grumpy7
parents: 1964
diff changeset
1450 if ( this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime > 0 )
182d49f28170 pActorBuffs[21] to pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS]
Grumpy7
parents: 1964
diff changeset
1451 v2 += this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uPower;
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1452 v3 = this->pMonsterInfo.uAttack1DamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1453 v4 = this->pMonsterInfo.uAttack1DamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1454 v5 = this->pMonsterInfo.uAttack1DamageBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1455 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1456 case 1:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1457 v3 = this->pMonsterInfo.uAttack2DamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1458 v4 = this->pMonsterInfo.uAttack2DamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1459 v5 = this->pMonsterInfo.uAttack2DamageBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1460 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1461 case 2:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1462 v8 = this->pMonsterInfo.uSpellSkillAndMastery1;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1463 v9 = this->pMonsterInfo.uSpell1ID;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1464 v10 = SkillToMastery(v8);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1465 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
1466 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1467 case 3:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1468 v8 = this->pMonsterInfo.uSpellSkillAndMastery2;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1469 v9 = this->pMonsterInfo.uSpell2ID;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1470 v10 = SkillToMastery(v8);
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1471 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
1472 break;
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1473 case 4:
1876
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1474 v3 = this->pMonsterInfo.uSpecialAbilityDamageDiceRolls;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1475 v4 = this->pMonsterInfo.uSpecialAbilityDamageDiceSides;
2070d01ccfae Actor::_43B3E0_CalcDamage changed to non-static
Grumpy7
parents: 1875
diff changeset
1476 v5 = this->pMonsterInfo.uSpecialAbilityDamageDiceBonus;
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1477 default:
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1478 return 0;
0
Ritor1
parents:
diff changeset
1479 }
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1480 for ( int i = 0; i < v3; i++)
0
Ritor1
parents:
diff changeset
1481 {
1875
1d9e4b50bc7c Actor::_43B3E0_CalcDamage cleaned up, fixed actor buff enums and added 2 values
Grumpy7
parents: 1874
diff changeset
1482 v11 += rand() % v4 + 1;
0
Ritor1
parents:
diff changeset
1483 }
Ritor1
parents:
diff changeset
1484 return v11 + v5 + v2;
Ritor1
parents:
diff changeset
1485 }
Ritor1
parents:
diff changeset
1486
Ritor1
parents:
diff changeset
1487 //----- (00438B9B) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1488 bool Actor::IsPeasant()
0
Ritor1
parents:
diff changeset
1489 {
Ritor1
parents:
diff changeset
1490 unsigned int v1; // eax@1
Ritor1
parents:
diff changeset
1491
Ritor1
parents:
diff changeset
1492 v1 = this->uAlly;
Ritor1
parents:
diff changeset
1493 if ( !v1 )
Ritor1
parents:
diff changeset
1494 v1 = (this->pMonsterInfo.uID - 1) / 3 + 1;
Ritor1
parents:
diff changeset
1495 return (signed int)v1 >= 39 && (signed int)v1 <= 44
Ritor1
parents:
diff changeset
1496 || (signed int)v1 >= 45 && (signed int)v1 <= 50
Ritor1
parents:
diff changeset
1497 || (signed int)v1 >= 51 && (signed int)v1 <= 62
Ritor1
parents:
diff changeset
1498 || (signed int)v1 >= 78 && (signed int)v1 <= 83;
Ritor1
parents:
diff changeset
1499 }
Ritor1
parents:
diff changeset
1500
Ritor1
parents:
diff changeset
1501 //----- (0042EBEE) --------------------------------------------------------
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1502 void Actor::StealFrom( unsigned int uActorID )
0
Ritor1
parents:
diff changeset
1503 {
Ritor1
parents:
diff changeset
1504 Player *pPlayer; // edi@1
Ritor1
parents:
diff changeset
1505 int v4; // ebx@2
Ritor1
parents:
diff changeset
1506 unsigned int v5; // eax@2
Ritor1
parents:
diff changeset
1507 DDM_DLV_Header *v6; // esi@4
Ritor1
parents:
diff changeset
1508 int v8; // [sp+8h] [bp-4h]@6
Ritor1
parents:
diff changeset
1509
243
a6a8fa73b4ec cleaning
zipi
parents: 188
diff changeset
1510 pPlayer = &pParty->pPlayers[uActiveCharacter-1];
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1511 if ( pPlayer->CanAct() )
0
Ritor1
parents:
diff changeset
1512 {
1517
c3da3c2985b8 Clean CastSpellInfo. (1)
yoctozepto
parents: 1503
diff changeset
1513 CastSpellInfoHelpers::_427D48();
0
Ritor1
parents:
diff changeset
1514 v4 = 0;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1515 v5 = pMapStats->GetMapInfo(pCurrentMapName);
0
Ritor1
parents:
diff changeset
1516 if ( v5 )
Ritor1
parents:
diff changeset
1517 v4 = pMapStats->pInfos[v5]._steal_perm;
Ritor1
parents:
diff changeset
1518 v6 = &pOutdoor->ddm;
Ritor1
parents:
diff changeset
1519 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor)
Ritor1
parents:
diff changeset
1520 v6 = &pIndoor->dlv;
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1521 pPlayer->StealFromActor(uActorID, v4, v6->uReputation++);
0
Ritor1
parents:
diff changeset
1522 v8 = pPlayer->GetAttackRecoveryTime(0);
Ritor1
parents:
diff changeset
1523 if ( v8 < 30 )
Ritor1
parents:
diff changeset
1524 v8 = 30;
Ritor1
parents:
diff changeset
1525 if ( !pParty->bTurnBasedModeOn )
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1526 pPlayer->SetRecoveryTime((int)(flt_6BE3A4_debug_recmod1 * v8 * 2.133333333333333));
1448
5a5d0c713d47 some turn engine renaming
Gloval
parents: 1362
diff changeset
1527 pTurnEngine->ApplyPlayerAction();
0
Ritor1
parents:
diff changeset
1528 }
1877
bed4532cfe59 Actor::StealFrom changed signature to void, minor cleanup
Grumpy7
parents: 1876
diff changeset
1529 return;
0
Ritor1
parents:
diff changeset
1530 }
Ritor1
parents:
diff changeset
1531
Ritor1
parents:
diff changeset
1532 //----- (00403A60) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1533 void Actor::AI_SpellAttack2(unsigned int uActorID, signed int edx0, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1534 {
Ritor1
parents:
diff changeset
1535 Actor *v3; // ebx@1
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1536 int16_t v4; // esi@3
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1537 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1538 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1539 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1540 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1541 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1542 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1543 AIDirection v18; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1544 int v19; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1545 signed int a2; // [sp+48h] [bp-Ch]@1
Ritor1
parents:
diff changeset
1546 int v21; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1547 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1548
Ritor1
parents:
diff changeset
1549 v3 = &pActors[uActorID];
Ritor1
parents:
diff changeset
1550 a2 = edx0;
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1551 if ( PID_TYPE(edx0) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1552 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1553 v6 = PID_ID(edx0);
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1554 v4 = pActors[v6].vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1555 v5 = pActors[v6].vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1556 v21 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1557 }
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1558 else if ( PID_TYPE(edx0) == OBJECT_Player)
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1559 {
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1560 v4 = pParty->vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1561 v5 = pParty->vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1562 v21 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1563 }
Ritor1
parents:
diff changeset
1564 else
Ritor1
parents:
diff changeset
1565 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1566 Error("Should not get here");
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1567 return;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1568 }
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1569 v19 = v3->uActorHeight;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1570 v7.z = v3->vPosition.z - (int)(v19 * -0.75);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1571 v7.y = v3->vPosition.y;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1572 v7.x = v3->vPosition.x;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1573 if ( sub_407A1C(v4, v5, v21, v7) )
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1574 {
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1575 if ( pDir == nullptr)
0
Ritor1
parents:
diff changeset
1576 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1577 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
1578 v9 = &a3;
0
Ritor1
parents:
diff changeset
1579 }
Ritor1
parents:
diff changeset
1580 else
Ritor1
parents:
diff changeset
1581 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1582 v9 = pDir;
0
Ritor1
parents:
diff changeset
1583 }
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1584 v3->uYawAngle = LOWORD(v9->uYawAngle);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1585 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1586 v3->uCurrentActionLength = 8 * v13;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1587 v3->uCurrentActionTime = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1588 v3->uAIState = AttackingRanged4;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1589 Actor::PlaySound(uActorID, 0);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1590 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1591 if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
1592 {
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1593 pDira *= 2;
0
Ritor1
parents:
diff changeset
1594 }
Ritor1
parents:
diff changeset
1595 if ( pParty->bTurnBasedModeOn == 1 )
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1596 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1597 else
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1598 v3->pMonsterInfo.uRecoveryTime = v3->uCurrentActionLength + (int)(flt_6BE3A8_debug_recmod2 * pDira * 2.133333333333333);
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1599 v3->vVelocity.z = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1600 v3->vVelocity.y = 0;
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1601 v3->vVelocity.x = 0;
2153
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
1602 if ( ShouldMonsterPlayAttackAnim(v3->pMonsterInfo.uSpell2ID) )
0
Ritor1
parents:
diff changeset
1603 {
Ritor1
parents:
diff changeset
1604 v3->uCurrentActionLength = 64;
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1605 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1606 v3->uAIState = Fidgeting;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1607 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1608 v3->uAIState = AttackingRanged4;
Ritor1
parents:
diff changeset
1609 }
Ritor1
parents:
diff changeset
1610 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1611 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1612 }
Ritor1
parents:
diff changeset
1613 else
1878
6ffa3228eaf7 Actor::AI_SpellAttack2 cleaned up
Grumpy7
parents: 1877
diff changeset
1614 Actor::AI_Pursue1(uActorID, a2, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1615 }
Ritor1
parents:
diff changeset
1616
Ritor1
parents:
diff changeset
1617 //----- (00403854) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1618 void Actor::AI_SpellAttack1(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1619 {
Ritor1
parents:
diff changeset
1620 Actor *v3; // ebx@1
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1621 int16_t v4; // esi@3
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1622 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1623 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1624 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1625 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1626 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1627 signed int v16; // ecx@17
Ritor1
parents:
diff changeset
1628 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1629 AIDirection v18; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1630 int v19; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1631 int v21; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1632 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1633
Ritor1
parents:
diff changeset
1634 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1635 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1636 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1637 v6 = PID_ID(sTargetPid);
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1638 v4 = pActors[v6].vPosition.x;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1639 v5 = pActors[v6].vPosition.y;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1640 v21 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1641 }
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1642 else if ( PID_TYPE(sTargetPid) == OBJECT_Player)
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1643 {
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1644 v4 = pParty->vPosition.x;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1645 v5 = pParty->vPosition.y;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1646 v21 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1647 }
Ritor1
parents:
diff changeset
1648 else
Ritor1
parents:
diff changeset
1649 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1650 Error("Should not get here");
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1651 return;
0
Ritor1
parents:
diff changeset
1652 }
Ritor1
parents:
diff changeset
1653 v19 = v3->uActorHeight;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1654 v7.z = v3->vPosition.z - (int)(v19 * -0.75);
0
Ritor1
parents:
diff changeset
1655 v7.y = v3->vPosition.y;
Ritor1
parents:
diff changeset
1656 v7.x = v3->vPosition.x;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1657 if ( sub_407A1C(v4, v5, v21, v7) )
0
Ritor1
parents:
diff changeset
1658 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1659 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
1660 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1661 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
1662 v9 = &a3;
0
Ritor1
parents:
diff changeset
1663 }
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1664 else
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1665 {
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1666 v9 = pDir;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1667 }
0
Ritor1
parents:
diff changeset
1668 v3->uYawAngle = LOWORD(v9->uYawAngle);
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1669 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
0
Ritor1
parents:
diff changeset
1670 v3->uCurrentActionLength = 8 * v13;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1671 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1672 v3->uAIState = AttackingRanged3;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1673 Actor::PlaySound(uActorID, 0);
0
Ritor1
parents:
diff changeset
1674 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1675 if (v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
1676 {
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1677 pDira *= 2;
0
Ritor1
parents:
diff changeset
1678 }
Ritor1
parents:
diff changeset
1679 if ( pParty->bTurnBasedModeOn == 1 )
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1680 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1681 else
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1682 v3->pMonsterInfo.uRecoveryTime = v3->uCurrentActionLength + (int)(flt_6BE3A8_debug_recmod2 * pDira * 2.133333333333333);
0
Ritor1
parents:
diff changeset
1683 v16 = v3->pMonsterInfo.uSpell1ID;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1684 v3->vVelocity.z = 0;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1685 v3->vVelocity.y = 0;
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1686 v3->vVelocity.x = 0;
2153
d28d3c006077 Some Render decoupling.
Nomad
parents: 2135
diff changeset
1687 if ( ShouldMonsterPlayAttackAnim(v3->pMonsterInfo.uSpell1ID) )
0
Ritor1
parents:
diff changeset
1688 {
Ritor1
parents:
diff changeset
1689 v3->uCurrentActionLength = 64;
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1690 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1691 v3->uAIState = Fidgeting;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1692 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1693 v3->uAIState = AttackingRanged3;
Ritor1
parents:
diff changeset
1694 }
Ritor1
parents:
diff changeset
1695 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1696 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1697 }
Ritor1
parents:
diff changeset
1698 else
1879
7efa09ddb8b4 Actor::AI_SpellAttack1 cleaned up
Grumpy7
parents: 1878
diff changeset
1699 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1700 }
Ritor1
parents:
diff changeset
1701
Ritor1
parents:
diff changeset
1702 //----- (0040368B) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1703 void Actor::AI_MissileAttack2(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1704 {
Ritor1
parents:
diff changeset
1705 Actor *v3; // ebx@1
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1706 int16_t v4; // esi@3
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1707 int16_t v5; // edi@3
0
Ritor1
parents:
diff changeset
1708 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1709 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1710 AIDirection *v9; // eax@8
Ritor1
parents:
diff changeset
1711 __int16 v13; // ax@10
Ritor1
parents:
diff changeset
1712 AIDirection a3; // [sp+Ch] [bp-48h]@9
Ritor1
parents:
diff changeset
1713 AIDirection v17; // [sp+28h] [bp-2Ch]@9
Ritor1
parents:
diff changeset
1714 int v18; // [sp+44h] [bp-10h]@6
Ritor1
parents:
diff changeset
1715 int v20; // [sp+4Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1716 unsigned int pDira; // [sp+5Ch] [bp+8h]@10
Ritor1
parents:
diff changeset
1717
Ritor1
parents:
diff changeset
1718 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1719 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1720 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1721 v6 = PID_ID(sTargetPid);
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1722 v4 = pActors[v6].vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1723 v5 = pActors[v6].vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1724 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
1725 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1726 else if ( PID_TYPE(sTargetPid) == OBJECT_Player)
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1727 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1728 v4 = pParty->vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1729 v5 = pParty->vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1730 v20 = pParty->vPosition.z + pParty->sEyelevel;
0
Ritor1
parents:
diff changeset
1731 }
Ritor1
parents:
diff changeset
1732 else
Ritor1
parents:
diff changeset
1733 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1734 Error("Should not get here");
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1735 return;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1736 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1737 v18 = v3->uActorHeight;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1738 v7.z = v3->vPosition.z - (int)(v18 * -0.75);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1739 v7.y = v3->vPosition.y;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1740 v7.x = v3->vPosition.x;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1741 if ( sub_407A1C(v4, v5, v20, v7) )
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1742 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1743 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
1744 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1745 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
1746 v9 = &a3;
0
Ritor1
parents:
diff changeset
1747 }
Ritor1
parents:
diff changeset
1748 else
Ritor1
parents:
diff changeset
1749 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1750 v9 = pDir;
0
Ritor1
parents:
diff changeset
1751 }
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1752 v3->uYawAngle = LOWORD(v9->uYawAngle);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1753 v13 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1754 v3->uCurrentActionLength = 8 * v13;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1755 v3->uCurrentActionTime = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1756 v3->uAIState = AttackingRanged2;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1757 Actor::PlaySound(uActorID, 0);
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1758 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1759 if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
1760 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1761 pDira *= 2;
0
Ritor1
parents:
diff changeset
1762 }
Ritor1
parents:
diff changeset
1763 if ( pParty->bTurnBasedModeOn != 1 )
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1764 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
1765 else
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1766 {
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1767 v3->pMonsterInfo.uRecoveryTime = pDira;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1768 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1769 v3->vVelocity.z = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1770 v3->vVelocity.y = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1771 v3->vVelocity.x = 0;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1772 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1773 }
Ritor1
parents:
diff changeset
1774 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1775 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1776 }
Ritor1
parents:
diff changeset
1777
Ritor1
parents:
diff changeset
1778 //----- (00403476) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
1779 void Actor::AI_MissileAttack1(unsigned int uActorID, signed int sTargetPid, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
1780 {
Ritor1
parents:
diff changeset
1781 Actor *v3; // ebx@1
Ritor1
parents:
diff changeset
1782 int v4; // esi@3
Ritor1
parents:
diff changeset
1783 int v5; // edi@3
Ritor1
parents:
diff changeset
1784 signed int v6; // eax@4
Ritor1
parents:
diff changeset
1785 Vec3_int_ v7; // ST04_12@6
Ritor1
parents:
diff changeset
1786 AIDirection *v10; // eax@9
Ritor1
parents:
diff changeset
1787 __int16 v14; // ax@11
Ritor1
parents:
diff changeset
1788 AIDirection a3; // [sp+Ch] [bp-48h]@10
Ritor1
parents:
diff changeset
1789 AIDirection v18; // [sp+28h] [bp-2Ch]@10
Ritor1
parents:
diff changeset
1790 int v19; // [sp+44h] [bp-10h]@6
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1791 //signed int a2; // [sp+48h] [bp-Ch]@1
0
Ritor1
parents:
diff changeset
1792 int v22; // [sp+50h] [bp-4h]@3
Ritor1
parents:
diff changeset
1793 unsigned int pDira; // [sp+5Ch] [bp+8h]@11
Ritor1
parents:
diff changeset
1794
Ritor1
parents:
diff changeset
1795 v3 = &pActors[uActorID];
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1796 //a2 = edx0;
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1797 if ( PID_TYPE(sTargetPid) == OBJECT_Actor)
0
Ritor1
parents:
diff changeset
1798 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1799 v6 = PID_ID(sTargetPid);
0
Ritor1
parents:
diff changeset
1800 v4 = pActors[v6].vPosition.x;
Ritor1
parents:
diff changeset
1801 v5 = pActors[v6].vPosition.y;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1802 v22 = (int)(pActors[v6].uActorHeight * 0.75 + pActors[v6].vPosition.z);
0
Ritor1
parents:
diff changeset
1803 }
Ritor1
parents:
diff changeset
1804 else
Ritor1
parents:
diff changeset
1805 {
848
ceef50611567 * AI fixed (temporary)
zipi
parents: 832
diff changeset
1806 if ( PID_TYPE(sTargetPid) == OBJECT_Player)
0
Ritor1
parents:
diff changeset
1807 {
Ritor1
parents:
diff changeset
1808 v4 = pParty->vPosition.x;
Ritor1
parents:
diff changeset
1809 v5 = pParty->vPosition.y;
Ritor1
parents:
diff changeset
1810 v22 = pParty->vPosition.z + pParty->sEyelevel;
Ritor1
parents:
diff changeset
1811 }
Ritor1
parents:
diff changeset
1812 else
Ritor1
parents:
diff changeset
1813 {
Ritor1
parents:
diff changeset
1814 v4 = (int)pDir;
Ritor1
parents:
diff changeset
1815 v5 = (int)pDir;
Ritor1
parents:
diff changeset
1816 }
Ritor1
parents:
diff changeset
1817 }
Ritor1
parents:
diff changeset
1818 v19 = v3->uActorHeight;
Ritor1
parents:
diff changeset
1819 v7.z = v3->vPosition.z - (unsigned int)(signed __int64)((double)v19 * -0.75);
Ritor1
parents:
diff changeset
1820 v7.y = v3->vPosition.y;
Ritor1
parents:
diff changeset
1821 v7.x = v3->vPosition.x;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1822 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
1823 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1824 if ( pDir == nullptr )
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1825 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
1826 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
1827 v10 = &a3;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1828 }
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1829 else
0
Ritor1
parents:
diff changeset
1830 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1831 v10 = pDir;
0
Ritor1
parents:
diff changeset
1832 }
Ritor1
parents:
diff changeset
1833 v3->uYawAngle = LOWORD(v10->uYawAngle);
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1834 v14 = pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[ANIM_AtkRanged]].uAnimLength;
0
Ritor1
parents:
diff changeset
1835 v3->uCurrentActionLength = 8 * v14;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1836 v3->uCurrentActionTime = 0;
0
Ritor1
parents:
diff changeset
1837 v3->uAIState = AttackingRanged1;
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1838 Actor::PlaySound(uActorID, 0);
0
Ritor1
parents:
diff changeset
1839 pDira = pMonsterStats->pInfos[v3->pMonsterInfo.uID].uRecoveryTime;
1951
524fe0810f32 pActorBuffs[7] to pActorBuffs[ACTOR_BUFF_SLOWED]
Grumpy7
parents: 1950
diff changeset
1840 if ( v3->pActorBuffs[ACTOR_BUFF_SLOWED].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
1841 {
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1842 pDira *= 2;
0
Ritor1
parents:
diff changeset
1843 }
Ritor1
parents:
diff changeset
1844 if ( pParty->bTurnBasedModeOn == 1 )
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1845 v3->pMonsterInfo.uRecoveryTime = pDira;
0
Ritor1
parents:
diff changeset
1846 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1847 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
1848 v3->vVelocity.z = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1849 v3->vVelocity.y = 0;
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1850 v3->vVelocity.x = 0;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
1851 v3->UpdateAnimation();
0
Ritor1
parents:
diff changeset
1852 }
Ritor1
parents:
diff changeset
1853 else
1880
52e98d25cd64 Actor::AI_MissileAttack1 and Actor::AI_MissileAttack2 cleaned up
Grumpy7
parents: 1879
diff changeset
1854 Actor::AI_Pursue1(uActorID, sTargetPid, uActorID, 64, pDir);
0
Ritor1
parents:
diff changeset
1855 }
Ritor1
parents:
diff changeset
1856
Ritor1
parents:
diff changeset
1857 //----- (004032B2) --------------------------------------------------------
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1858 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
1859 {
0
Ritor1
parents:
diff changeset
1860 Actor *v5; // esi@1
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1861 int x; // ebx@1
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1862 int absy; // eax@1
0
Ritor1
parents:
diff changeset
1863 unsigned int v9; // ebx@11
Ritor1
parents:
diff changeset
1864 int v10; // ebx@13
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1865 AIDirection doNotInitializeBecauseShouldBeRandom; // [sp+Ch] [bp-30h]@7
0
Ritor1
parents:
diff changeset
1866 unsigned int v16; // [sp+2Ch] [bp-10h]@1
Ritor1
parents:
diff changeset
1867 int y; // [sp+30h] [bp-Ch]@1
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1868 int absx; // [sp+38h] [bp-4h]@1
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1869
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1870 v5 = &pActors[uActor_id];
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1871 v16 = uTarget_id;
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1872 x = v5->vInitialPosition.x - v5->vPosition.x;
0
Ritor1
parents:
diff changeset
1873 y = v5->vInitialPosition.y - v5->vPosition.y;
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1874 absx = abs(x);
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1875 absy = abs(y);
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1876 if ( absx <= absy )
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1877 absx = absy + (absx / 2 );
0
Ritor1
parents:
diff changeset
1878 else
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1879 absx = absx + absy / 2;
0
Ritor1
parents:
diff changeset
1880 if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
1881 {
Ritor1
parents:
diff changeset
1882 if ( !uActionLength )
Ritor1
parents:
diff changeset
1883 uActionLength = 256;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1884 Actor::AI_StandOrBored(uActor_id, OBJECT_Player, uActionLength, &doNotInitializeBecauseShouldBeRandom);
0
Ritor1
parents:
diff changeset
1885 return;
Ritor1
parents:
diff changeset
1886 }
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1887 if ( pActors[uActor_id].pMonsterInfo.uMovementType == 3 && absx < 128 )
0
Ritor1
parents:
diff changeset
1888 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1889 Actor::AI_Stand(uActor_id, uTarget_id, 256, &doNotInitializeBecauseShouldBeRandom);
0
Ritor1
parents:
diff changeset
1890 return;
Ritor1
parents:
diff changeset
1891 }
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1892 absx += ((rand() & 0xF) * radius) / 16;
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1893 v9 = (stru_5C6E00->uIntegerDoublePi - 1) & stru_5C6E00->Atan2(x, y);
0
Ritor1
parents:
diff changeset
1894 if ( rand() % 100 < 25 )
Ritor1
parents:
diff changeset
1895 {
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1896 Actor::StandAwhile(uActor_id);
0
Ritor1
parents:
diff changeset
1897 return;
Ritor1
parents:
diff changeset
1898 }
Ritor1
parents:
diff changeset
1899 v10 = v9 + rand() % 256 - 128;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1900 if ( abs(v10 - v5->uYawAngle) > 256 && !(v5->uAttributes & 0x200000) )
0
Ritor1
parents:
diff changeset
1901 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1902 Actor::AI_Stand(uActor_id, uTarget_id, 256, &doNotInitializeBecauseShouldBeRandom);
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
1903 return;
0
Ritor1
parents:
diff changeset
1904 }
Ritor1
parents:
diff changeset
1905 v5->uYawAngle = v10;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1906 if ( v5->uMovementSpeed)
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1907 v5->uCurrentActionLength = 32 * absx / v5->uMovementSpeed;
0
Ritor1
parents:
diff changeset
1908 else
Ritor1
parents:
diff changeset
1909 v5->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
1910 v5->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
1911 v5->uAIState = Tethered;
Ritor1
parents:
diff changeset
1912 if ( rand() % 100 < 2 )
1881
fa3d4b400b8d Actor::AI_RandomMove minor cleanup
Grumpy7
parents: 1880
diff changeset
1913 Actor::PlaySound(uActor_id, 3u);
0
Ritor1
parents:
diff changeset
1914 v5->UpdateAnimation();
Ritor1
parents:
diff changeset
1915 }
Ritor1
parents:
diff changeset
1916
Ritor1
parents:
diff changeset
1917 //----- (004031C1) --------------------------------------------------------
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1918 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
1919 {
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1920 return 0;
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1921 /*unsigned int v3; // edi@1
0
Ritor1
parents:
diff changeset
1922 Actor *v4; // esi@1
Ritor1
parents:
diff changeset
1923 ActorJob *v5; // eax@1
Ritor1
parents:
diff changeset
1924 signed int v6; // edx@2
Ritor1
parents:
diff changeset
1925 ActorJob *v7; // eax@2
Ritor1
parents:
diff changeset
1926 signed int v8; // edi@2
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1927 ActorJob *v9; // ecx@2
0
Ritor1
parents:
diff changeset
1928 __int16 v10; // cx@15
Ritor1
parents:
diff changeset
1929 signed int v12; // [sp+8h] [bp-4h]@1
Ritor1
parents:
diff changeset
1930
Ritor1
parents:
diff changeset
1931 v3 = uActorID;
Ritor1
parents:
diff changeset
1932 v12 = a2;
Ritor1
parents:
diff changeset
1933 v4 = &pActors[uActorID];
Ritor1
parents:
diff changeset
1934 v5 = (ActorJob *)pActors[uActorID].CanAct();
Ritor1
parents:
diff changeset
1935 if ( v5 )
Ritor1
parents:
diff changeset
1936 {
Ritor1
parents:
diff changeset
1937 v6 = 65535;
Ritor1
parents:
diff changeset
1938 v7 = &v4->pScheduledJobs[v3];
Ritor1
parents:
diff changeset
1939 v8 = 7;
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1940 v9 = &v7[7];//(char *)&v7[7].uHour;
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1941 while ( !(v9->uAttributes & 1) || v9->uHour > v12 )
0
Ritor1
parents:
diff changeset
1942 {
Ritor1
parents:
diff changeset
1943 --v8;
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1944 --v9;
0
Ritor1
parents:
diff changeset
1945 if ( v8 < 0 )
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1946 break;
0
Ritor1
parents:
diff changeset
1947 }
82
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1948 if( v8 >= 0 )
1faa29fd4c2d many type, memory, boundary fixes
zipi
parents: 42
diff changeset
1949 v6 = v8;
0
Ritor1
parents:
diff changeset
1950 if ( !v8 && v6 == 65535 )
Ritor1
parents:
diff changeset
1951 v6 = 7;
Ritor1
parents:
diff changeset
1952 v5 = &v7[v6];
Ritor1
parents:
diff changeset
1953 if ( v4->vInitialPosition.x != v5->vPos.x
Ritor1
parents:
diff changeset
1954 || v4->vInitialPosition.y != v5->vPos.y
Ritor1
parents:
diff changeset
1955 || v4->vInitialPosition.z != v5->vPos.z
Ritor1
parents:
diff changeset
1956 || v4->pMonsterInfo.uMovementType != v5->uAction )
Ritor1
parents:
diff changeset
1957 {
Ritor1
parents:
diff changeset
1958 v4->vInitialPosition.x = v5->vPos.x;
Ritor1
parents:
diff changeset
1959 v4->vInitialPosition.y = v5->vPos.y;
Ritor1
parents:
diff changeset
1960 v10 = v5->vPos.z;
Ritor1
parents:
diff changeset
1961 v4->vInitialPosition.z = v10;
Ritor1
parents:
diff changeset
1962 LOBYTE(v5) = v5->uAction;
1456
5c95f2246c2a TE mostly working
Gloval
parents: 1450
diff changeset
1963 v4->pMonsterInfo.uMovementType = MONSTER_MOVEMENT_TYPE_STAIONARY;
0
Ritor1
parents:
diff changeset
1964 if ( a3 == 1 )
Ritor1
parents:
diff changeset
1965 {
Ritor1
parents:
diff changeset
1966 v4->vPosition.x = v4->vInitialPosition.x;
Ritor1
parents:
diff changeset
1967 v4->vPosition.y = v4->vInitialPosition.y;
Ritor1
parents:
diff changeset
1968 LOBYTE(v5) = v10;
Ritor1
parents:
diff changeset
1969 v4->vPosition.z = v10;
Ritor1
parents:
diff changeset
1970 }
Ritor1
parents:
diff changeset
1971 }
Ritor1
parents:
diff changeset
1972 }
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1973 return (char)v5;*/
0
Ritor1
parents:
diff changeset
1974 }
Ritor1
parents:
diff changeset
1975
Ritor1
parents:
diff changeset
1976 //----- (004030AD) --------------------------------------------------------
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1977 void Actor::AI_Stun(unsigned int uActorID, signed int edx0, int stunRegardlessOfState)
0
Ritor1
parents:
diff changeset
1978 {
Ritor1
parents:
diff changeset
1979 Actor *v4; // ebx@1
Ritor1
parents:
diff changeset
1980 __int16 v7; // ax@16
Ritor1
parents:
diff changeset
1981 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
1982 AIDirection* v10; // [sp+28h] [bp-24h]@16
0
Ritor1
parents:
diff changeset
1983
Ritor1
parents:
diff changeset
1984 v4 = &pActors[uActorID];
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1985 if ( v4->uAIState == Fleeing )
0
Ritor1
parents:
diff changeset
1986 BYTE2(v4->uAttributes) |= 2u;
Ritor1
parents:
diff changeset
1987 if ( v4->pMonsterInfo.uHostilityType != 4 )
Ritor1
parents:
diff changeset
1988 {
Ritor1
parents:
diff changeset
1989 v4->uAttributes &= 0xFFFFFFFBu;
Ritor1
parents:
diff changeset
1990 v4->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
Ritor1
parents:
diff changeset
1991 }
1947
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
1992 if ( v4->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
1993 v4->pActorBuffs[ACTOR_BUFF_CHARM].Reset();
1950
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
1994 if ( v4->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0 )
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
1995 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
1996 if ( stunRegardlessOfState
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1997 || (v4->uAIState != Stunned
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1998 && v4->uAIState != AttackingRanged1
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
1999 && v4->uAIState != AttackingRanged2
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2000 && v4->uAIState != AttackingRanged3
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2001 && v4->uAIState != AttackingRanged4
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2002 && v4->uAIState != AttackingMelee))
0
Ritor1
parents:
diff changeset
2003 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2004 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
2005 v10 = &a3;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2006 v4->uYawAngle = LOWORD(v10->uYawAngle);
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2007 v7 = pSpriteFrameTable->pSpriteSFrames[v4->pSpriteIDs[ANIM_GotHit]].uAnimLength;
0
Ritor1
parents:
diff changeset
2008 v4->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2009 v4->uAIState = Stunned;
Ritor1
parents:
diff changeset
2010 v4->uCurrentActionLength = 8 * v7;
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
2011 Actor::PlaySound(uActorID, 2u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2012 v4->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2013 }
Ritor1
parents:
diff changeset
2014 }
Ritor1
parents:
diff changeset
2015
Ritor1
parents:
diff changeset
2016 //----- (00402F87) --------------------------------------------------------
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2017 void Actor::AI_Bored(unsigned int uActorID, unsigned int uObjID, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2018 {
Ritor1
parents:
diff changeset
2019 unsigned int v7; // eax@3
Ritor1
parents:
diff changeset
2020 unsigned int v9; // eax@3
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2021
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2022 Actor* actor = &pActors[uActorID];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2023
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2024 AIDirection a3; // [sp+Ch] [bp-5Ch]@2
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2025 if (!a4)
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2026 {
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2027 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
2028 a4 = &a3;
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2029 }
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2030
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2031 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Bored]].uAnimLength;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2032
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
2033 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
2034 v9 = stru_5C6E00->uIntegerPi + actor->uYawAngle + ((signed int)stru_5C6E00->uIntegerPi >> 3) - v7;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2035
2212
e18200fcfb50 LoadTextureFromLOD
Ritor1
parents: 2203
diff changeset
2036 if ( v9 & 0x700 ) // turned away - just stand
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2037 Actor::AI_Stand(uActorID, uObjID, actor->uCurrentActionLength, a4);
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2038 else // facing player - play bored anim
0
Ritor1
parents:
diff changeset
2039 {
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2040 actor->uAIState = Fidgeting;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2041 actor->uCurrentActionTime = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2042 actor->uYawAngle = a4->uYawAngle;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2043 actor->vVelocity.z = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2044 actor->vVelocity.y = 0;
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2045 actor->vVelocity.x = 0;
0
Ritor1
parents:
diff changeset
2046 if ( rand() % 100 < 5 )
414
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2047 Actor::PlaySound(uActorID, 3);
d8b3056df4e2 AI_Bored
Nomad
parents: 413
diff changeset
2048 actor->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2049 }
Ritor1
parents:
diff changeset
2050 }
Ritor1
parents:
diff changeset
2051
Ritor1
parents:
diff changeset
2052 //----- (00402F27) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2053 void Actor::Resurrect(unsigned int uActorID)
0
Ritor1
parents:
diff changeset
2054 {
Ritor1
parents:
diff changeset
2055 Actor *pActor; // esi@1
Ritor1
parents:
diff changeset
2056
Ritor1
parents:
diff changeset
2057 pActor = &pActors[uActorID];
Ritor1
parents:
diff changeset
2058 pActor->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2059 pActor->uAIState = Resurrected;
Ritor1
parents:
diff changeset
2060 pActor->uCurrentActionAnimation = ANIM_Dying;
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2061 pActor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[pActor->pSpriteIDs[ANIM_Dying]].uAnimLength;
0
Ritor1
parents:
diff changeset
2062 pActor->sCurrentHP = LOWORD(pActor->pMonsterInfo.uHP);
Ritor1
parents:
diff changeset
2063 Actor::PlaySound(uActorID, 1u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2064 pActor->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2065 }
Ritor1
parents:
diff changeset
2066
Ritor1
parents:
diff changeset
2067 //----- (00402D6E) --------------------------------------------------------
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2068 void Actor::Die(unsigned int uActorID)
0
Ritor1
parents:
diff changeset
2069 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1974
diff changeset
2070 Actor* actor = &pActors[uActorID];
0
Ritor1
parents:
diff changeset
2071
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2072 actor->uCurrentActionTime = 0;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2073 actor->uAIState = Dying;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2074 actor->uCurrentActionAnimation = ANIM_Dying;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2075 actor->sCurrentHP = 0;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2076 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength;
1946
aa3ca49a10f5 pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
Grumpy7
parents: 1945
diff changeset
2077 actor->pActorBuffs[ACTOR_BUFF_PARALYZED].Reset();
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
2078 actor->pActorBuffs[ACTOR_BUFF_STONED].Reset();
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2079 Actor::PlaySound(uActorID, 1);
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2080 actor->UpdateAnimation();
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2081
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2082 for (uint i = 0; i < 5; ++i)
1529
61458df2cb4f bountyHunting fix
Ritor1
parents: 1519
diff changeset
2083 if (pParty->monster_id_for_hunting[i] == actor->pMonsterInfo.uID)
61458df2cb4f bountyHunting fix
Ritor1
parents: 1519
diff changeset
2084 pParty->monster_for_hunting_killed[i] = true;
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2085
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2086 for (uint i = 0; i < 22; ++i)
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2087 actor->pActorBuffs[i].Reset();
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2088
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2089 ItemGen drop;
1012
9e823ad5eaa6 second msg_queue returned
Gloval
parents: 994
diff changeset
2090 drop.Reset();
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2091 switch (actor->pMonsterInfo.uID)
0
Ritor1
parents:
diff changeset
2092 {
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2093 case MONSTER_HARPY_1: case MONSTER_HARPY_2: case MONSTER_HARPY_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2094 drop.uItemID = ITEM_HARPY_FEATHER;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2095 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2096
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2097 case MONSTER_OOZE_1: case MONSTER_OOZE_2: case MONSTER_OOZE_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2098 drop.uItemID = ITEM_OOZE_ECTOPLASM_BOTTLE;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2099 break;
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2100
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2101 case MONSTER_TROLL_1: case MONSTER_TROLL_2: case MONSTER_TROLL_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2102 drop.uItemID = ITEM_TROLL_BLOOD;
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_DEVIL_1: case MONSTER_DEVIL_2: case MONSTER_DEVIL_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2106 drop.uItemID = ITEM_DEVIL_ICHOR;
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_DRAGON_1: case MONSTER_DRAGON_2: case MONSTER_DRAGON_3:
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2110 drop.uItemID = ITEM_DRAGON_EYE;
321
15decc249a94 quick fix to spells commit (wasnt compiling)
Nomad
parents: 319
diff changeset
2111 break;
0
Ritor1
parents:
diff changeset
2112 }
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2113
1759
845a6503f55c fixing some itemarray zero accesses
Grumpy7
parents: 1709
diff changeset
2114 if (rand() % 100 < 20 && drop.uItemID != 0)
0
Ritor1
parents:
diff changeset
2115 {
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2116 sub_42F7EB_DropItemAt(pItemsTable->pItems[drop.uItemID].uSpriteID,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2117 actor->vPosition.x,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2118 actor->vPosition.y,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2119 actor->vPosition.z + 16,
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2120 rand() % 200 + 200,
0
Ritor1
parents:
diff changeset
2121 1,
Ritor1
parents:
diff changeset
2122 1,
Ritor1
parents:
diff changeset
2123 0,
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2124 &drop);
0
Ritor1
parents:
diff changeset
2125 }
319
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2126
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2127 if (actor->pMonsterInfo.uSpecialAbilityType == MONSTER_SPECIAL_ABILITY_EXPLODE)
5a66be213cff Actor::Die
Nomad
parents: 308
diff changeset
2128 Actor::Explode(uActorID);
0
Ritor1
parents:
diff changeset
2129 }
Ritor1
parents:
diff changeset
2130
Ritor1
parents:
diff changeset
2131 //----- (00402CED) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2132 void Actor::PlaySound(unsigned int uActorID, unsigned int uSoundID)
0
Ritor1
parents:
diff changeset
2133 {
Ritor1
parents:
diff changeset
2134 unsigned __int16 v3; // dx@1
Ritor1
parents:
diff changeset
2135
1408
204cce84300b FindSound
Ritor1
parents: 1384
diff changeset
2136 v3 = pActors[uActorID].pSoundSampleIDs[uSoundID];
0
Ritor1
parents:
diff changeset
2137 if ( v3 )
Ritor1
parents:
diff changeset
2138 {
1949
2f45768fcb7a pActorBuffs[3] to pActorBuffs[ACTOR_BUFF_SHRINK]
Grumpy7
parents: 1948
diff changeset
2139 if ( pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
2140 {
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2141 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
0
Ritor1
parents:
diff changeset
2142 }
Ritor1
parents:
diff changeset
2143 else
Ritor1
parents:
diff changeset
2144 {
1949
2f45768fcb7a pActorBuffs[3] to pActorBuffs[ACTOR_BUFF_SHRINK]
Grumpy7
parents: 1948
diff changeset
2145 switch(pActors[uActorID].pActorBuffs[ACTOR_BUFF_SHRINK].uPower)
0
Ritor1
parents:
diff changeset
2146 {
1883
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2147 case 1:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2148 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2149 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2150 case 2:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2151 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2152 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2153 case 3:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2154 case 4:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2155 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, 0, 0, 0, 0, 33075);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2156 break;
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2157 default:
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2158 pAudioPlayer->PlaySound((SoundID)v3, PID(OBJECT_Actor, uActorID), 0, -1, 0, 0, 0, 0);
7d334cc596e0 Actor::PlaySound cleaned up
Grumpy7
parents: 1882
diff changeset
2159 break;
0
Ritor1
parents:
diff changeset
2160 }
Ritor1
parents:
diff changeset
2161 }
Ritor1
parents:
diff changeset
2162 }
Ritor1
parents:
diff changeset
2163 }
Ritor1
parents:
diff changeset
2164
Ritor1
parents:
diff changeset
2165 //----- (00402AD7) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2166 void Actor::AI_Pursue1(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir)
0
Ritor1
parents:
diff changeset
2167 {
Ritor1
parents:
diff changeset
2168 int v6; // eax@1
Ritor1
parents:
diff changeset
2169 Actor *v7; // ebx@1
Ritor1
parents:
diff changeset
2170 unsigned int v8; // ecx@1
Ritor1
parents:
diff changeset
2171 AIDirection *v10; // esi@6
Ritor1
parents:
diff changeset
2172 AIDirection a3; // [sp+Ch] [bp-5Ch]@7
Ritor1
parents:
diff changeset
2173 unsigned int v18; // [sp+64h] [bp-4h]@1
Ritor1
parents:
diff changeset
2174
Ritor1
parents:
diff changeset
2175 v6 = 0;
Ritor1
parents:
diff changeset
2176 v7 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2177 v8 = PID(OBJECT_Actor,uActorID);
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2178 if ( v7->pMonsterInfo.uFlying != 0 && !pParty->bFlying ) //TODO: Does v6 have a point?
0
Ritor1
parents:
diff changeset
2179 {
Ritor1
parents:
diff changeset
2180 if ( v7->pMonsterInfo.uMissleAttack1Type )
Ritor1
parents:
diff changeset
2181 v6 = v7->uActorRadius + 512;
Ritor1
parents:
diff changeset
2182 else
Ritor1
parents:
diff changeset
2183 v6 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2184 }
1052
d48c762de563 -nomarg
Nomad
parents: 1036
diff changeset
2185
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2186 if ( pDir == nullptr )
0
Ritor1
parents:
diff changeset
2187 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2188 Actor::GetDirectionInfo(v8, a2, &a3, v6);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2189 v10 = &a3;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2190 }
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2191 else
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2192 {
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2193 v10 = pDir;
0
Ritor1
parents:
diff changeset
2194 }
Ritor1
parents:
diff changeset
2195 if ( MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2196 {
Ritor1
parents:
diff changeset
2197 if ( !uActionLength )
Ritor1
parents:
diff changeset
2198 uActionLength = 256;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2199 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2200 return;
0
Ritor1
parents:
diff changeset
2201 }
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2202 if ( v10->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2203 {
Ritor1
parents:
diff changeset
2204 if ( !uActionLength )
Ritor1
parents:
diff changeset
2205 uActionLength = 256;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2206 Actor::AI_Stand(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2207 return;
0
Ritor1
parents:
diff changeset
2208 }
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2209 if ( v7->uMovementSpeed == 0 )
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2210 {
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2211 Actor::AI_Stand(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2212 return;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2213 }
0
Ritor1
parents:
diff changeset
2214 if ( arg0 % 2 )
Ritor1
parents:
diff changeset
2215 v18 = -16;
1884
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2216 else
c77de46b31b1 Actor::AI_Pursue1 cleaned up
Grumpy7
parents: 1883
diff changeset
2217 v18 = 16;
1052
d48c762de563 -nomarg
Nomad
parents: 1036
diff changeset
2218
0
Ritor1
parents:
diff changeset
2219 v7->uYawAngle = stru_5C6E00->Atan2(
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2220 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
2221 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
2222 if ( uActionLength )
Ritor1
parents:
diff changeset
2223 v7->uCurrentActionLength = uActionLength;
Ritor1
parents:
diff changeset
2224 else
Ritor1
parents:
diff changeset
2225 v7->uCurrentActionLength = 128;
Ritor1
parents:
diff changeset
2226 v7->uPitchAngle = LOWORD(v10->uPitchAngle);
Ritor1
parents:
diff changeset
2227 v7->uAIState = Pursuing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2228 v7->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2229 }
Ritor1
parents:
diff changeset
2230
Ritor1
parents:
diff changeset
2231 //----- (00402968) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2232 void Actor::AI_Flee(unsigned int uActorID, signed int sTargetPid, int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2233 {
Ritor1
parents:
diff changeset
2234 Actor *v5; // ebx@1
Ritor1
parents:
diff changeset
2235 int v7; // ecx@2
Ritor1
parents:
diff changeset
2236 unsigned __int16 v9; // ax@15
1909
18dacb49efe9 Actor::AI_Flee fixing crash
Grumpy7
parents: 1907
diff changeset
2237 AIDirection v10; // [sp+8h] [bp-7Ch]@4
18dacb49efe9 Actor::AI_Flee fixing crash
Grumpy7
parents: 1907
diff changeset
2238 AIDirection a3; // [sp+24h] [bp-60h]@3
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2239 AIDirection* v13; // [sp+5Ch] [bp-28h]@4
0
Ritor1
parents:
diff changeset
2240
Ritor1
parents:
diff changeset
2241 v5 = &pActors[uActorID];
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2242 if ( v5->CanAct() )
0
Ritor1
parents:
diff changeset
2243 {
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2244 v7 = PID(OBJECT_Actor,uActorID);
0
Ritor1
parents:
diff changeset
2245 if ( !a4 )
Ritor1
parents:
diff changeset
2246 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2247 Actor::GetDirectionInfo(v7, sTargetPid, &a3, v5->pMonsterInfo.uFlying);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2248 a4 = &a3;
0
Ritor1
parents:
diff changeset
2249 }
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2250 Actor::GetDirectionInfo(v7, 4u, &v10, 0);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2251 v13 = &v10;
0
Ritor1
parents:
diff changeset
2252 if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT)
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2253 || PID_TYPE(sTargetPid) == OBJECT_Actor && v13->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2254 {
Ritor1
parents:
diff changeset
2255 if ( !uActionLength )
Ritor1
parents:
diff changeset
2256 uActionLength = 256;
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2257 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v13);
0
Ritor1
parents:
diff changeset
2258 }
Ritor1
parents:
diff changeset
2259 else
Ritor1
parents:
diff changeset
2260 {
1885
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2261 if ( v5->uMovementSpeed )
70719fa68500 Actor::AI_Flee cleaned up
Grumpy7
parents: 1884
diff changeset
2262 v5->uCurrentActionLength = (signed int)(a4->uDistanceXZ << 7) / v5->uMovementSpeed;
0
Ritor1
parents:
diff changeset
2263 else
Ritor1
parents:
diff changeset
2264 v5->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2265 if ( v5->uCurrentActionLength > 256 )
Ritor1
parents:
diff changeset
2266 v5->uCurrentActionLength = 256;
Ritor1
parents:
diff changeset
2267 v5->uYawAngle = LOWORD(stru_5C6E00->uIntegerHalfPi) + LOWORD(a4->uYawAngle);
Ritor1
parents:
diff changeset
2268 v5->uYawAngle = LOWORD(stru_5C6E00->uDoublePiMask) & (v5->uYawAngle + rand() % (signed int)stru_5C6E00->uIntegerPi);
Ritor1
parents:
diff changeset
2269 v9 = LOWORD(a4->uPitchAngle);
Ritor1
parents:
diff changeset
2270 v5->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2271 v5->uPitchAngle = v9;
Ritor1
parents:
diff changeset
2272 v5->uAIState = Fleeing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2273 v5->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2274 }
Ritor1
parents:
diff changeset
2275 }
Ritor1
parents:
diff changeset
2276 }
Ritor1
parents:
diff changeset
2277
Ritor1
parents:
diff changeset
2278 //----- (0040281C) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2279 void Actor::AI_Pursue2(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *pDir, int a5)
0
Ritor1
parents:
diff changeset
2280 {
Ritor1
parents:
diff changeset
2281 int v6; // eax@1
Ritor1
parents:
diff changeset
2282 Actor *v7; // ebx@1
Ritor1
parents:
diff changeset
2283 unsigned int v8; // ecx@1
Ritor1
parents:
diff changeset
2284 AIDirection *v10; // esi@7
Ritor1
parents:
diff changeset
2285 signed __int16 v13; // cx@19
Ritor1
parents:
diff changeset
2286 unsigned __int16 v14; // ax@25
Ritor1
parents:
diff changeset
2287 AIDirection a3; // [sp+Ch] [bp-40h]@8
Ritor1
parents:
diff changeset
2288 AIDirection v18; // [sp+28h] [bp-24h]@8
Ritor1
parents:
diff changeset
2289
Ritor1
parents:
diff changeset
2290 v6 = 0;
Ritor1
parents:
diff changeset
2291 v7 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2292 v8 = PID(OBJECT_Actor,uActorID);
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2293 if ( v7->pMonsterInfo.uFlying != 0 && !pParty->bFlying )
0
Ritor1
parents:
diff changeset
2294 {
Ritor1
parents:
diff changeset
2295 if ( v7->pMonsterInfo.uMissleAttack1Type && uCurrentlyLoadedLevelType == LEVEL_Outdoor )
Ritor1
parents:
diff changeset
2296 v6 = v7->uActorRadius + 512;
Ritor1
parents:
diff changeset
2297 else
Ritor1
parents:
diff changeset
2298 v6 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2299 }
Ritor1
parents:
diff changeset
2300 v10 = pDir;
Ritor1
parents:
diff changeset
2301 if ( !pDir )
Ritor1
parents:
diff changeset
2302 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2303 Actor::GetDirectionInfo(v8, a2, &a3, v6);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2304 v10 = &a3;
0
Ritor1
parents:
diff changeset
2305 }
Ritor1
parents:
diff changeset
2306 if ( MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2307 {
Ritor1
parents:
diff changeset
2308 if ( !uActionLength )
Ritor1
parents:
diff changeset
2309 uActionLength = 256;
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2310 Actor::AI_StandOrBored(uActorID, 4, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2311 return;
0
Ritor1
parents:
diff changeset
2312 }
Ritor1
parents:
diff changeset
2313 if ( (signed int)v10->uDistance < a5 )
Ritor1
parents:
diff changeset
2314 {
Ritor1
parents:
diff changeset
2315 if ( !uActionLength )
Ritor1
parents:
diff changeset
2316 uActionLength = 256;
1886
df873a01767a Actor::AI_Pursue2 cleaned up
Grumpy7
parents: 1885
diff changeset
2317 Actor::AI_StandOrBored(uActorID, a2, uActionLength, v10);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2318 return;
0
Ritor1
parents:
diff changeset
2319 }
Ritor1
parents:
diff changeset
2320 if ( uActionLength )
Ritor1
parents:
diff changeset
2321 {
Ritor1
parents:
diff changeset
2322 v7->uCurrentActionLength = uActionLength;
Ritor1
parents:
diff changeset
2323 }
Ritor1
parents:
diff changeset
2324 else
Ritor1
parents:
diff changeset
2325 {
Ritor1
parents:
diff changeset
2326 v13 = v7->uMovementSpeed;
Ritor1
parents:
diff changeset
2327 if ( v13 )
Ritor1
parents:
diff changeset
2328 v7->uCurrentActionLength = (signed int)(v10->uDistanceXZ << 7) / v13;
Ritor1
parents:
diff changeset
2329 else
Ritor1
parents:
diff changeset
2330 v7->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2331 if ( v7->uCurrentActionLength > 32 )
Ritor1
parents:
diff changeset
2332 v7->uCurrentActionLength = 32;
Ritor1
parents:
diff changeset
2333 }
Ritor1
parents:
diff changeset
2334 v7->uYawAngle = LOWORD(v10->uYawAngle);
Ritor1
parents:
diff changeset
2335 v14 = LOWORD(v10->uPitchAngle);
Ritor1
parents:
diff changeset
2336 v7->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2337 v7->uPitchAngle = v14;
Ritor1
parents:
diff changeset
2338 v7->uAIState = Pursuing;
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2339 v7->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2340 }
Ritor1
parents:
diff changeset
2341
Ritor1
parents:
diff changeset
2342 //----- (00402686) --------------------------------------------------------
1060
b79139c3b5c8 some AI cleaning
zipi
parents: 1052
diff changeset
2343 void Actor::AI_Pursue3(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *a4)
0
Ritor1
parents:
diff changeset
2344 {
Ritor1
parents:
diff changeset
2345 int v5; // eax@1
Ritor1
parents:
diff changeset
2346 Actor *v6; // ebx@1
Ritor1
parents:
diff changeset
2347 int v7; // ecx@1
Ritor1
parents:
diff changeset
2348 signed __int16 v12; // cx@19
Ritor1
parents:
diff changeset
2349 __int16 v14; // ax@25
Ritor1
parents:
diff changeset
2350 unsigned __int16 v16; // ax@28
Ritor1
parents:
diff changeset
2351 AIDirection a3; // [sp+Ch] [bp-40h]@8
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2352 AIDirection* v20; // [sp+28h] [bp-24h]@8
0
Ritor1
parents:
diff changeset
2353
Ritor1
parents:
diff changeset
2354 v5 = 0;
Ritor1
parents:
diff changeset
2355 v6 = &pActors[uActorID];
862
f4394e320312 * PID mistake fixed
zipi
parents: 861
diff changeset
2356 v7 = PID(OBJECT_Actor,uActorID);
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2357 if ( v6->pMonsterInfo.uFlying != 0 && !pParty->bFlying )
0
Ritor1
parents:
diff changeset
2358 {
Ritor1
parents:
diff changeset
2359 if ( v6->pMonsterInfo.uMissleAttack1Type && uCurrentlyLoadedLevelType == LEVEL_Outdoor )
Ritor1
parents:
diff changeset
2360 v5 = v6->uActorRadius + 512;
Ritor1
parents:
diff changeset
2361 else
Ritor1
parents:
diff changeset
2362 v5 = pParty->uPartyHeight;
Ritor1
parents:
diff changeset
2363 }
Ritor1
parents:
diff changeset
2364 if ( !a4 )
Ritor1
parents:
diff changeset
2365 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2366 Actor::GetDirectionInfo(v7, a2, &a3, v5);
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
2367 v20 = &a3;
0
Ritor1
parents:
diff changeset
2368 }
Ritor1
parents:
diff changeset
2369 if ( MonsterStats::BelongsToSupertype(v6->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
Ritor1
parents:
diff changeset
2370 {
Ritor1
parents:
diff changeset
2371 if ( !uActionLength )
Ritor1
parents:
diff changeset
2372 uActionLength = 256;
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2373 return Actor::AI_StandOrBored(uActorID, 4, uActionLength, a4);
0
Ritor1
parents:
diff changeset
2374 }
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2375 if ( a4->uDistance < 307.2 )
0
Ritor1
parents:
diff changeset
2376 {
Ritor1
parents:
diff changeset
2377 if ( !uActionLength )
Ritor1
parents:
diff changeset
2378 uActionLength = 256;
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2379 return Actor::AI_StandOrBored(uActorID, a2, uActionLength, a4);
0
Ritor1
parents:
diff changeset
2380 }
Ritor1
parents:
diff changeset
2381 if ( uActionLength )
Ritor1
parents:
diff changeset
2382 {
Ritor1
parents:
diff changeset
2383 v6->uCurrentActionLength = uActionLength + rand() % uActionLength;
Ritor1
parents:
diff changeset
2384 }
Ritor1
parents:
diff changeset
2385 else
Ritor1
parents:
diff changeset
2386 {
Ritor1
parents:
diff changeset
2387 v12 = v6->uMovementSpeed;
Ritor1
parents:
diff changeset
2388 if ( v12 )
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2389 v6->uCurrentActionLength = (signed int)(a4->uDistanceXZ << 7) / v12;
0
Ritor1
parents:
diff changeset
2390 else
Ritor1
parents:
diff changeset
2391 v6->uCurrentActionLength = 0;
Ritor1
parents:
diff changeset
2392 if ( v6->uCurrentActionLength > 128 )
Ritor1
parents:
diff changeset
2393 v6->uCurrentActionLength = 128;
Ritor1
parents:
diff changeset
2394 }
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2395 v14 = LOWORD(a4->uYawAngle);
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2396 if ( rand() % 2 )
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2397 v14 += 256;
0
Ritor1
parents:
diff changeset
2398 else
1887
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2399 v14 -= 256;
25655815623a Actor::AI_Pursue3 cleaned up
Grumpy7
parents: 1886
diff changeset
2400 v6->uYawAngle = v14;
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2401 v16 = LOWORD(a4->uPitchAngle);
0
Ritor1
parents:
diff changeset
2402 v6->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2403 v6->uPitchAngle = v16;
Ritor1
parents:
diff changeset
2404 v6->uAIState = Pursuing;
Ritor1
parents:
diff changeset
2405 if ( rand() % 100 < 2 )
860
8fc2f035abc0 * AI function renames
zipi
parents: 859
diff changeset
2406 Actor::PlaySound(uActorID, 2u);
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2407 v6->UpdateAnimation();
0
Ritor1
parents:
diff changeset
2408 }
Ritor1
parents:
diff changeset
2409
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2410 //----- (00401221) --------------------------------------------------------
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2411 void Actor::_SelectTarget(unsigned int uActorID, int *a2, bool can_target_party)
0
Ritor1
parents:
diff changeset
2412 {
Ritor1
parents:
diff changeset
2413 int v5; // ecx@1
Ritor1
parents:
diff changeset
2414 signed int v10; // eax@13
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2415 uint v11; // ebx@16
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2416 uint v12; // eax@16
0
Ritor1
parents:
diff changeset
2417 signed int v14; // eax@31
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2418 uint v15; // edi@43
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2419 uint v16; // ebx@45
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2420 uint v17; // eax@45
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2421 signed int closestId; // [sp+14h] [bp-1Ch]@1
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2422 uint v23; // [sp+1Ch] [bp-14h]@16
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2423 unsigned int lowestRadius; // [sp+24h] [bp-Ch]@1
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2424 uint v27; // [sp+2Ch] [bp-4h]@16
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2425 uint v28; // [sp+2Ch] [bp-4h]@45
0
Ritor1
parents:
diff changeset
2426
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2427 lowestRadius = UINT_MAX;
0
Ritor1
parents:
diff changeset
2428 v5 = 0;
Ritor1
parents:
diff changeset
2429 *a2 = 0;
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2430 closestId = 0;
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2431 assert(uActorID < uNumActors);
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2432 Actor* thisActor = &pActors[uActorID];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2433
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2434 for (uint i = 0; i < uNumActors; ++i)
0
Ritor1
parents:
diff changeset
2435 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2436 Actor* actor = &pActors[i];
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2437 if (actor->uAIState == Dead || actor->uAIState == Dying ||
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2438 actor->uAIState == Removed || actor->uAIState == Summoned || actor->uAIState == Disabled || uActorID == i )
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2439 continue;
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2440
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2441 if (thisActor->uLastCharacterIDToHit == 0 || PID(OBJECT_Actor,v5) != thisActor->uLastCharacterIDToHit )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2442 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2443 v10 = thisActor->GetActorsRelation(actor);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2444 if ( v10 == 0 )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2445 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2446 }
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2447 else if (thisActor->IsNotAlive())
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2448 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2449 thisActor->uLastCharacterIDToHit = 0;
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2450 v10 = thisActor->GetActorsRelation(actor);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2451 if ( v10 == 0 )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2452 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2453 }
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2454 else
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2455 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2456 if ( (actor->uGroup != 0 || thisActor->uGroup != 0) && actor->uGroup == thisActor->uGroup )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2457 continue;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2458 v10 = 4;
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2459 }
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2460 if ( thisActor->pMonsterInfo.uHostilityType )
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2461 v10 = pMonsterStats->pInfos[thisActor->pMonsterInfo.uID].uHostilityType;
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2462 v11 = _4DF380_hostilityRanges[v10];
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2463 v23 = abs(thisActor->vPosition.x - actor->vPosition.x);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2464 v27 = abs(thisActor->vPosition.y - actor->vPosition.y);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2465 v12 = abs(thisActor->vPosition.z - actor->vPosition.z);
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2466 if ( v23 <= v11
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2467 && v27 <= v11
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2468 && v12 <= v11
1493
9e9a12506d51 player detection partly working
zipi
parents: 1477
diff changeset
2469 && sub_4070EF_prolly_detect_player(PID(OBJECT_Actor, i), PID(OBJECT_Actor, uActorID))
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2470 && v23 * v23 + v27 * v27 + v12 * v12 < lowestRadius )
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2471 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2472 lowestRadius = v23 * v23 + v27 * v27 + v12 * v12;
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2473 closestId = i;
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
2474 }
0
Ritor1
parents:
diff changeset
2475 }
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2476
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2477 if ( lowestRadius != UINT_MAX )
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2478 {
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2479 *a2 = PID(OBJECT_Actor, closestId);
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2480 }
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2481
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2482 if (can_target_party && !pParty->Invisible())
0
Ritor1
parents:
diff changeset
2483 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2484 if ( thisActor->uAttributes & 0x80000
1956
542c13cd72e2 pActorBuffs[12] to pActorBuffs[ACTOR_BUFF_ENSLAVED]
Grumpy7
parents: 1955
diff changeset
2485 && thisActor->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0
1947
33f3103b062b pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
Grumpy7
parents: 1946
diff changeset
2486 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
1948
7fd4bfa175fd pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED]
Grumpy7
parents: 1947
diff changeset
2487 && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
2488 v14 = 4;
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2489 else
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2490 v14 = thisActor->GetActorsRelation(0);
417
55684f4eda73 Actor::SelectTarget & ai_near_actors_targets_pid
Nomad
parents: 414
diff changeset
2491 if ( v14 != 0 )
0
Ritor1
parents:
diff changeset
2492 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2493 if ( !thisActor->pMonsterInfo.uHostilityType )
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2494 v15 = _4DF380_hostilityRanges[v14];
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2495 else
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
2496 v15 = _4DF380_hostilityRanges[4];
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2497 v16 = abs(thisActor->vPosition.x - pParty->vPosition.x);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2498 v28 = abs(thisActor->vPosition.y - pParty->vPosition.y);
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2499 v17 = abs(thisActor->vPosition.z - pParty->vPosition.z);
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2500 if ( v16 <= v15 && v28 <= v15 && v17 <= v15 && (v16 * v16 + v28 * v28 + v17 * v17 < lowestRadius))
0
Ritor1
parents:
diff changeset
2501 {
1893
7293e7e8810b Actor::_SelectTarget final cleanup
Grumpy7
parents: 1892
diff changeset
2502 *a2 = OBJECT_Player;
0
Ritor1
parents:
diff changeset
2503 }
Ritor1
parents:
diff changeset
2504 }
Ritor1
parents:
diff changeset
2505 }
Ritor1
parents:
diff changeset
2506 }
Ritor1
parents:
diff changeset
2507 // 4DF380: using guessed type int dword_4DF380[];
Ritor1
parents:
diff changeset
2508 // 4DF390: using guessed type int dword_4DF390;
Ritor1
parents:
diff changeset
2509
Ritor1
parents:
diff changeset
2510 //----- (0040104C) --------------------------------------------------------
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2511 signed int Actor::GetActorsRelation(Actor *otherActPtr)
0
Ritor1
parents:
diff changeset
2512 {
Ritor1
parents:
diff changeset
2513 unsigned int v5; // edx@15
Ritor1
parents:
diff changeset
2514 unsigned int v6; // eax@16
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2515 unsigned int thisGroup; // ebp@19
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2516 int otherGroup; // eax@22
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2517 unsigned int thisAlly; // edx@25
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2518 unsigned int otherAlly; // edx@33
0
Ritor1
parents:
diff changeset
2519
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2520 if ( otherActPtr)
1890
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2521 {
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2522 v5 = otherActPtr->uGroup;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2523 v6 = this->uGroup;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2524 if ( v5 != 0 && v6 != 0 && v5 == v6 )
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2525 return 0;
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2526 }
eafc12a77a92 fixing buildability
Grumpy7
parents: 1889
diff changeset
2527
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2528 if (this->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2529 return 4;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2530 thisAlly = this->uAlly;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2531 if ( this->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime > 0 || thisAlly == 9999)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2532 thisGroup = 0;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2533 else if ( thisAlly > 0 )
0
Ritor1
parents:
diff changeset
2534 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2535 thisGroup = thisAlly;
0
Ritor1
parents:
diff changeset
2536 }
Ritor1
parents:
diff changeset
2537 else
Ritor1
parents:
diff changeset
2538 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2539 thisGroup = (this->pMonsterInfo.uID - 1) / 3 + 1;
0
Ritor1
parents:
diff changeset
2540 }
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2541
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2542 if ( otherActPtr )
0
Ritor1
parents:
diff changeset
2543 {
1889
397059718a9a Actor::_SelectTarget, Actor::GetActorsRelation some cleanups
Grumpy7
parents: 1887
diff changeset
2544 if (otherActPtr->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
0
Ritor1
parents:
diff changeset
2545 return 4;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2546 otherAlly = otherActPtr->uAlly;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2547 if ( otherActPtr->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime > 0 || otherAlly == 9999)
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2548 otherGroup = 0;
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2549 else if ( otherAlly > 0 )
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2550 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2551 otherGroup = otherAlly;
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2552 }
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2553 else
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2554 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2555 otherGroup = (otherActPtr->pMonsterInfo.uID - 1) / 3 + 1;
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2556 }
0
Ritor1
parents:
diff changeset
2557 }
Ritor1
parents:
diff changeset
2558 else
Ritor1
parents:
diff changeset
2559 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2560 otherGroup = 0;
0
Ritor1
parents:
diff changeset
2561 }
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2562
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2563 if ( this->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 && !otherGroup
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2564 || otherActPtr && otherActPtr->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 && !thisGroup )
0
Ritor1
parents:
diff changeset
2565 return 0;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2566 if ( this->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0 && this->uAttributes & 0x80000 && !otherGroup )
0
Ritor1
parents:
diff changeset
2567 return 4;
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2568 if (thisGroup >= 89 || otherGroup >= 89)
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2569 return 0;
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2570
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2571 if ( thisGroup == 0 )
0
Ritor1
parents:
diff changeset
2572 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2573 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
2574 return pFactionTable->relations[0][otherGroup];
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2575 else
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2576 return 4;
0
Ritor1
parents:
diff changeset
2577 }
1891
ecab40f41fe8 Actor::GetActorsRelation cleanup 2
Grumpy7
parents: 1890
diff changeset
2578 else
0
Ritor1
parents:
diff changeset
2579 {
1892
9995cbcc62e0 Actor::GetActorsRelation finishing cleanup
Grumpy7
parents: 1891
diff changeset
2580 return pFactionTable->relations[thisGroup][otherGroup];
0
Ritor1
parents:
diff changeset
2581 }
Ritor1
parents:
diff changeset
2582 }
Ritor1
parents:
diff changeset
2583
Ritor1
parents:
diff changeset
2584 //----- (0045976D) --------------------------------------------------------
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2585 void Actor::UpdateAnimation()
0
Ritor1
parents:
diff changeset
2586 {
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2587 //AIState state; // edx@1
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2588 //unsigned int result; // eax@1
0
Ritor1
parents:
diff changeset
2589
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2590 //state = (AIState)this->;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2591 uAttributes &= 0xFFDFFFFF;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2592 //result = this->uAttributes;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2593 switch (uAIState)
0
Ritor1
parents:
diff changeset
2594 {
Ritor1
parents:
diff changeset
2595 case Tethered:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2596 uCurrentActionAnimation = ANIM_Walking;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2597 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2598
0
Ritor1
parents:
diff changeset
2599 case AttackingMelee:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2600 uCurrentActionAnimation = ANIM_AtkMelee;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2601 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2602 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2603
0
Ritor1
parents:
diff changeset
2604 case AttackingRanged1:
Ritor1
parents:
diff changeset
2605 case AttackingRanged2:
Ritor1
parents:
diff changeset
2606 case AttackingRanged3:
Ritor1
parents:
diff changeset
2607 case AttackingRanged4:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2608 uCurrentActionAnimation = ANIM_AtkRanged;
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 Dying:
Ritor1
parents:
diff changeset
2613 case Resurrected:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2614 uCurrentActionAnimation = ANIM_Dying;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2615 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2616 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2617
0
Ritor1
parents:
diff changeset
2618 case Pursuing:
Ritor1
parents:
diff changeset
2619 case Fleeing:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2620 uCurrentActionAnimation = ANIM_Walking;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2621 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2622 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2623
0
Ritor1
parents:
diff changeset
2624 case Stunned:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2625 uCurrentActionAnimation = ANIM_GotHit;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2626 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2627 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2628
0
Ritor1
parents:
diff changeset
2629 case Fidgeting:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2630 uCurrentActionAnimation = ANIM_Bored;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2631 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2632 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2633
0
Ritor1
parents:
diff changeset
2634 case Standing:
Ritor1
parents:
diff changeset
2635 case Interacting:
Ritor1
parents:
diff changeset
2636 case Summoned:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2637 uCurrentActionAnimation = ANIM_Standing;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2638 uAttributes |= 0x200000u;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2639 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2640
0
Ritor1
parents:
diff changeset
2641 case Dead:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2642 if (pSpriteFrameTable->pSpriteSFrames[pSpriteIDs[ANIM_Dead]].pHwSpriteIDs[0] <= 0)
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2643 uAIState = Removed;
0
Ritor1
parents:
diff changeset
2644 else
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2645 uCurrentActionAnimation = ANIM_Dead;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2646 break;
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2647
551
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2648 case Removed:
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 602
diff changeset
2649 case Disabled:
551
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2650 return;
3b4a24fcd5a0 Actor::UpdateAnimation fix
Nomad
parents: 515
diff changeset
2651
0
Ritor1
parents:
diff changeset
2652 default:
322
ce39b96acf5c Killing friendly peasants subs
Nomad
parents: 321
diff changeset
2653 assert(false);
0
Ritor1
parents:
diff changeset
2654 }
Ritor1
parents:
diff changeset
2655 }
Ritor1
parents:
diff changeset
2656
Ritor1
parents:
diff changeset
2657 //----- (00459671) --------------------------------------------------------
Ritor1
parents:
diff changeset
2658 void Actor::Reset()
Ritor1
parents:
diff changeset
2659 {
Ritor1
parents:
diff changeset
2660 this->pActorName[0] = 0;
Ritor1
parents:
diff changeset
2661 this->word_000086_some_monster_id = 0;
602
628694cd5744 Margaret working
zipi
parents: 552
diff changeset
2662 this->sNPC_ID = 0;
0
Ritor1
parents:
diff changeset
2663 this->vPosition.z = 0;
Ritor1
parents:
diff changeset
2664 this->vPosition.y = 0;
Ritor1
parents:
diff changeset
2665 this->vPosition.x = 0;
Ritor1
parents:
diff changeset
2666 this->vVelocity.z = 0;
Ritor1
parents:
diff changeset
2667 this->vVelocity.y = 0;
Ritor1
parents:
diff changeset
2668 this->vVelocity.x = 0;
Ritor1
parents:
diff changeset
2669 this->uYawAngle = 0;
Ritor1
parents:
diff changeset
2670 this->uPitchAngle = 0;
Ritor1
parents:
diff changeset
2671 this->uAttributes = 0;
Ritor1
parents:
diff changeset
2672 this->uSectorID = 0;
Ritor1
parents:
diff changeset
2673 this->uCurrentActionTime = 0;
Ritor1
parents:
diff changeset
2674 this->vInitialPosition.z = 0;
Ritor1
parents:
diff changeset
2675 this->vInitialPosition.y = 0;
Ritor1
parents:
diff changeset
2676 this->vInitialPosition.x = 0;
Ritor1
parents:
diff changeset
2677 this->vGuardingPosition.z = 0;
Ritor1
parents:
diff changeset
2678 this->vGuardingPosition.y = 0;
Ritor1
parents:
diff changeset
2679 this->vGuardingPosition.x = 0;
Ritor1
parents:
diff changeset
2680 this->uTetherDistance = 256;
Ritor1
parents:
diff changeset
2681 this->uActorRadius = 32;
Ritor1
parents:
diff changeset
2682 this->uActorHeight = 128;
Ritor1
parents:
diff changeset
2683 this->uAIState = Standing;
305
cc8e4dc397ec MonsterPopup_Draw crash fix
Nomad
parents: 303
diff changeset
2684 this->uCurrentActionAnimation = ANIM_Standing;
0
Ritor1
parents:
diff changeset
2685 this->uMovementSpeed = 200;
Ritor1
parents:
diff changeset
2686 this->uCarriedItemID = 0;
Ritor1
parents:
diff changeset
2687 this->uGroup = 0;
Ritor1
parents:
diff changeset
2688 this->uAlly = 0;
Ritor1
parents:
diff changeset
2689 this->uSummonerID = 0;
Ritor1
parents:
diff changeset
2690 this->uLastCharacterIDToHit = 0;
Ritor1
parents:
diff changeset
2691 this->dword_000334_unique_name = 0;
Ritor1
parents:
diff changeset
2692 memset(this->pSpriteIDs, 0, sizeof(pSpriteIDs));
Ritor1
parents:
diff changeset
2693 memset(this->pActorBuffs, 0, 0x160u);
Ritor1
parents:
diff changeset
2694 }
Ritor1
parents:
diff changeset
2695
Ritor1
parents:
diff changeset
2696 //----- (0045959A) --------------------------------------------------------
Ritor1
parents:
diff changeset
2697 void Actor::PrepareSprites(char load_sounds_if_bit1_set)
Ritor1
parents:
diff changeset
2698 {
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2699
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2700 MonsterDesc *v3; // esi@1
0
Ritor1
parents:
diff changeset
2701 MonsterInfo *v9; // [sp+84h] [bp-10h]@1
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2702
0
Ritor1
parents:
diff changeset
2703 v3 = &pMonsterList->pMonsters[pMonsterInfo.uID - 1];
Ritor1
parents:
diff changeset
2704 v9 = &pMonsterStats->pInfos[pMonsterInfo.uID - 1 + 1];
Ritor1
parents:
diff changeset
2705 //v12 = pSpriteIDs;
Ritor1
parents:
diff changeset
2706 //Source = (char *)v3->pSpriteNames;
Ritor1
parents:
diff changeset
2707 //do
Ritor1
parents:
diff changeset
2708 for (uint i = 0; i < 8; ++i)
Ritor1
parents:
diff changeset
2709 {
Ritor1
parents:
diff changeset
2710 //strcpy(pSpriteName, v3->pSpriteNames[i]);
Ritor1
parents:
diff changeset
2711 pSpriteIDs[i] = pSpriteFrameTable->FastFindSprite(v3->pSpriteNames[i]);
Ritor1
parents:
diff changeset
2712 pSpriteFrameTable->InitializeSprite(pSpriteIDs[i]);
Ritor1
parents:
diff changeset
2713 }
Ritor1
parents:
diff changeset
2714 uActorHeight = v3->uMonsterHeight;
Ritor1
parents:
diff changeset
2715 uActorRadius = v3->uMonsterRadius;
33
a9e9c6989d04 20.01.13
Ritor1
parents: 0
diff changeset
2716 uMovementSpeed = v9->uBaseSpeed;
0
Ritor1
parents:
diff changeset
2717 if ( !(load_sounds_if_bit1_set & 1) )
Ritor1
parents:
diff changeset
2718 {
694
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2719 for (int i=0;i<4;++i )
52329962fcdb monster table init rework started
Gloval
parents: 652
diff changeset
2720 pSoundSampleIDs[i]=v3->pSoundSampleIDs[i];
0
Ritor1
parents:
diff changeset
2721 }
Ritor1
parents:
diff changeset
2722 }
Ritor1
parents:
diff changeset
2723
Ritor1
parents:
diff changeset
2724 //----- (00459667) --------------------------------------------------------
Ritor1
parents:
diff changeset
2725 void Actor::Remove()
Ritor1
parents:
diff changeset
2726 {
Ritor1
parents:
diff changeset
2727 this->uAIState = Removed;
Ritor1
parents:
diff changeset
2728 }
Ritor1
parents:
diff changeset
2729
Ritor1
parents:
diff changeset
2730 //----- (0044FD29) --------------------------------------------------------
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2731 void Actor::SummonMinion( int summonerId )
0
Ritor1
parents:
diff changeset
2732 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2733 unsigned __int8 extraSummonLevel; // al@1
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2734 int summonMonsterBaseType; // esi@1
0
Ritor1
parents:
diff changeset
2735 int v5; // edx@2
Ritor1
parents:
diff changeset
2736 int v7; // edi@10
Ritor1
parents:
diff changeset
2737 Actor *v8; // esi@10
Ritor1
parents:
diff changeset
2738 MonsterInfo *v9; // ebx@10
Ritor1
parents:
diff changeset
2739 MonsterDesc *v10; // edi@10
Ritor1
parents:
diff changeset
2740 int v13; // ebx@10
Ritor1
parents:
diff changeset
2741 int v15; // edi@10
Ritor1
parents:
diff changeset
2742 int v17; // ebx@10
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2743 unsigned int v19; // qax@10
0
Ritor1
parents:
diff changeset
2744 int result; // eax@13
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2745 unsigned int monsterId; // [sp+10h] [bp-18h]@8
0
Ritor1
parents:
diff changeset
2746 int v27; // [sp+18h] [bp-10h]@10
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2747 int actorSector; // [sp+1Ch] [bp-Ch]@8
0
Ritor1
parents:
diff changeset
2748
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2749
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2750 actorSector = 0;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2751 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2752 actorSector = pIndoor->GetSector(this->vPosition.x, this->vPosition.y, this->vPosition.z);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2753
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2754 v19 = this->uAlly;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2755 if ( !v19 )
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2756 {
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2757 monsterId = this->pMonsterInfo.uID - 1;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2758 v19 = (uint)(monsterId * 0.33333334);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2759 }
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2760 v27 = uCurrentlyLoadedLevelType == LEVEL_Outdoor ? 128 : 64;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2761 v13 = rand() % 2048;
2172
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
2762 v15 = fixpoint_mul(stru_5C6E00->Cos(v13), v27) + this->vPosition.x;
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
2763 v17 = fixpoint_mul(stru_5C6E00->Sin(v13), v27) + this->vPosition.y;
1895
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 if (uCurrentlyLoadedLevelType != LEVEL_Outdoor)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2766 {
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2767 result = pIndoor->GetSector(v15, v17, this->vPosition.z);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2768 if (result != actorSector)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2769 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2770 result = BLV_GetFloorLevel(v15, v17, v27, result, &monsterId);
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2771 if (result != -30000)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2772 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2773 if (abs(result - v27) > 1024)
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2774 return;
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2775 }
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2776
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2777 extraSummonLevel = this->pMonsterInfo.uSpecialAbilityDamageDiceRolls;
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2778 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
2779 if ( extraSummonLevel )
0
Ritor1
parents:
diff changeset
2780 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2781 if ( extraSummonLevel >= 1u && extraSummonLevel <= 3u )
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2782 summonMonsterBaseType = summonMonsterBaseType + extraSummonLevel - 1;
0
Ritor1
parents:
diff changeset
2783 }
Ritor1
parents:
diff changeset
2784 else
Ritor1
parents:
diff changeset
2785 {
Ritor1
parents:
diff changeset
2786 v5 = rand() % 100;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2787 if ( v5 >= 90 )
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2788 summonMonsterBaseType += 2;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2789 else if ( v5 >= 60 )
0
Ritor1
parents:
diff changeset
2790 {
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2791 summonMonsterBaseType += 1;
0
Ritor1
parents:
diff changeset
2792 }
Ritor1
parents:
diff changeset
2793 }
1896
b6a7410ff0ef renaming dword_4DF380 to dword_4DF380_hostilityRanges, moved it to actor.cpp
Grumpy7
parents: 1895
diff changeset
2794 v7 = summonMonsterBaseType - 1;
0
Ritor1
parents:
diff changeset
2795 v8 = &pActors[uNumActors];
Ritor1
parents:
diff changeset
2796 v9 = &pMonsterStats->pInfos[v7 + 1];
Ritor1
parents:
diff changeset
2797 pActors[uNumActors].Reset();
Ritor1
parents:
diff changeset
2798 v10 = &pMonsterList->pMonsters[v7];
Ritor1
parents:
diff changeset
2799 strcpy(v8->pActorName, v9->pName);
Ritor1
parents:
diff changeset
2800 v8->sCurrentHP = LOWORD(v9->uHP);
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2801 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
2802 v8->word_000086_some_monster_id = summonMonsterBaseType;
0
Ritor1
parents:
diff changeset
2803 v8->uActorRadius = v10->uMonsterRadius;
Ritor1
parents:
diff changeset
2804 v8->uActorHeight = v10->uMonsterHeight;
Ritor1
parents:
diff changeset
2805 v8->pMonsterInfo.uTreasureDiceRolls = 0;
Ritor1
parents:
diff changeset
2806 v8->pMonsterInfo.uTreasureType = 0;
Ritor1
parents:
diff changeset
2807 v8->pMonsterInfo.uExp = 0;
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2808 v8->uMovementSpeed = v10->uMovementSpeed;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2809 v8->vInitialPosition.z = this->vPosition.z;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2810 v8->vPosition.z = this->vPosition.z;
0
Ritor1
parents:
diff changeset
2811 v8->vInitialPosition.x = v15;
Ritor1
parents:
diff changeset
2812 v8->vPosition.x = v15;
Ritor1
parents:
diff changeset
2813 v8->vInitialPosition.y = v17;
Ritor1
parents:
diff changeset
2814 v8->vPosition.y = v17;
Ritor1
parents:
diff changeset
2815 v8->uTetherDistance = 256;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2816 v8->uSectorID = actorSector;
0
Ritor1
parents:
diff changeset
2817 v8->PrepareSprites(0);
Ritor1
parents:
diff changeset
2818 v8->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
Ritor1
parents:
diff changeset
2819 v8->uAlly = v19;
Ritor1
parents:
diff changeset
2820 v8->uCurrentActionTime = 0;
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2821 v8->uGroup = this->uGroup;
0
Ritor1
parents:
diff changeset
2822 v8->uAIState = Summoned;
Ritor1
parents:
diff changeset
2823 v8->uCurrentActionLength = 256;
Ritor1
parents:
diff changeset
2824 v8->UpdateAnimation();
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2825
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2826 ++uNumActors;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2827 ++this->pMonsterInfo.uSpecialAbilityDamageDiceBonus;
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2828 if ( this->uAttributes & 0x80000 )
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2829 v8->uAttributes |= 0x80000u;
1895
6b4e14436ee8 renaming Actor::_44FD29 to Actor::SummonMinion
Grumpy7
parents: 1894
diff changeset
2830 v8->uSummonerID = PID(OBJECT_Actor,summonerId);
1894
fe7182c30aad Actor::_44FD29 cleanup 1
Grumpy7
parents: 1893
diff changeset
2831
781
d170f23f70d1 tidy, code moving
zipi
parents: 760
diff changeset
2832 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2833 // 46DF1A: using guessed type int __fastcall 46DF1A_collide_against_actor(int, int);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2834 //----- (0046DF1A) --------------------------------------------------------
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2835 bool Actor::_46DF1A_collide_against_actor( int a1, int a2 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2836 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2837 Actor *v2; // edi@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2838 unsigned __int16 v3; // ax@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2839 int v4; // esi@6
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2840 int v8; // ecx@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2841 int v9; // eax@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2842 int v10; // ebx@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2843 int v11; // esi@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2844 int v12; // ebx@15
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2845 int v13; // ebx@17
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2846
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2847 v2 = &pActors[a1];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2848 v3 = v2->uAIState;
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2849 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
2850 return 0;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2851 v4 = v2->uActorRadius;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2852 if ( a2 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2853 v4 = a2;
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2854
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2855 if (stru_721530.sMaxX > v2->vPosition.x + v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2856 stru_721530.sMinX < v2->vPosition.x - v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2857 stru_721530.sMaxY > v2->vPosition.y + v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2858 stru_721530.sMinY < v2->vPosition.y - v4 ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2859 stru_721530.sMaxZ > v2->vPosition.z + v2->uActorHeight ||
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2860 stru_721530.sMinZ < v2->vPosition.z)
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2861 {
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2862 return false;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2863 }
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2864 v8 = v2->vPosition.x - stru_721530.normal.x;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2865 v9 = v2->vPosition.y - stru_721530.normal.y;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2866 v10 = stru_721530.prolly_normal_d + v4;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2867 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
2868 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
2869 if ( abs(v11) > v10 || v12 <= 0)
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2870 return false;
2172
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
2871 if (fixpoint_mul(stru_721530.direction.z, v12) + stru_721530.normal.z < v2->vPosition.z)
1897
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2872 return false;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2873
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2874 v13 = v12 - integer_sqrt(v10 * v10 - v11 * v11);
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2875 if ( v13 < 0 )
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2876 v13 = 0;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2877 if ( v13 < stru_721530.field_7C )
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2878 {
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2879 stru_721530.field_7C = v13;
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2880 stru_721530.uFaceID = PID(OBJECT_Actor,a1);
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2881 }
436553b0603c _46DF1A_collide_against_actor cleaned up, moved to Actor.h
Grumpy7
parents: 1896
diff changeset
2882 return true;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2883 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2884 //----- (00401A91) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
2885 void UpdateActorAI()
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2886 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2887 signed int v4; // edi@10
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2888 signed int sDmg; // eax@14
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2889 Player *pPlayer; // ecx@21
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2890 Actor *pActor; // esi@34
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2891 unsigned __int16 v22; // ax@86
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2892 unsigned int v27; // ecx@123
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2893 unsigned int v28; // eax@123
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2894 int v33; // eax@144
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2895 int v34; // eax@147
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2896 char v35; // al@150
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2897 unsigned int v36; // edi@152
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2898 signed int v37; // eax@154
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2899 double v42; // st7@176
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2900 double v43; // st6@176
1450
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2901 int v45; // eax@192
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2902 unsigned __int8 v46; // cl@197
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2903 signed int v47; // st7@206
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2904 uint v58; // st7@246
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2905 unsigned int v65; // [sp-10h] [bp-C0h]@144
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2906 int v70; // [sp-10h] [bp-C0h]@213
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2907 AIDirection v72; // [sp+0h] [bp-B0h]@246
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2908 AIDirection a3; // [sp+1Ch] [bp-94h]@129
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2909 int target_pid_type; // [sp+70h] [bp-40h]@83
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2910 signed int a1; // [sp+74h] [bp-3Ch]@129
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2911 int v78; // [sp+78h] [bp-38h]@79
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2912 AIDirection* pDir; // [sp+7Ch] [bp-34h]@129
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2913 float radiusMultiplier; // [sp+98h] [bp-18h]@33
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2914 int v81; // [sp+9Ch] [bp-14h]@100
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2915 signed int target_pid; // [sp+ACh] [bp-4h]@83
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2916 AIState uAIState;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
2917 uint v38;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2918
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2919 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2920 MakeActorAIList_ODM();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2921 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2922 MakeActorAIList_BLV();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2923
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2924 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor && pParty->armageddon_timer > 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2925 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2926 if ( pParty->armageddon_timer > 417 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2927 pParty->armageddon_timer = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2928 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2929 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2930 pParty->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (pParty->sRotationY + rand() % 16 - 8);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2931 pParty->sRotationX = pParty->sRotationX + rand() % 16 - 8;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2932 if ( pParty->sRotationX > 128)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2933 pParty->sRotationX = 128;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2934 else if ( pParty->sRotationX < -128 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2935 pParty->sRotationX = -128;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2936
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2937 pParty->uFlags |= 2u;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2938 pParty->armageddon_timer -= pMiscTimer->uTimeElapsed;
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2939 v4 = pParty->armageddonDamage + 50;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2940 if ( pParty->armageddon_timer <= 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2941 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2942 pParty->armageddon_timer = 0;
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2943 for(size_t i = 0; i < uNumActors; i++)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2944 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2945 pActor=&pActors[i];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2946 if ( pActor->CanAct() )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2947 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2948 sDmg = stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2949 pActor->sCurrentHP -= stru_50C198.CalcMagicalDamageToActor(pActor, 5, v4);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2950 if ( sDmg )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2951 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2952 if ( pActor->sCurrentHP >= 0 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2953 Actor::AI_Stun(i, 4, 0);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2954 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2955 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2956 Actor::Die(i);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2957 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
2958 pParty->GivePartyExp(pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uExp);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2959 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2960 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2961 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2962 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2963 for(int i = 1; i <= 4; i++)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2964 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2965 pPlayer = pPlayers[i];
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
2966 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
2967 pPlayer->ReceiveDamage(v4, DMGT_MAGICAL);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2968 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2969 }
1450
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2970 if (pTurnEngine->pending_actions)
8ff3c675a726 more renaming TE
Gloval
parents: 1449
diff changeset
2971 --pTurnEngine->pending_actions;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2972 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2973 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2974
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2975 if (pParty->bTurnBasedModeOn)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2976 {
1448
5a5d0c713d47 some turn engine renaming
Gloval
parents: 1362
diff changeset
2977 pTurnEngine->AITurnBasedAction();
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2978 return;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2979 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2980
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2981 for (uint i = 0; i < uNumActors; ++i)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2982 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2983 pActor = &pActors[i];
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2984 ai_near_actors_targets_pid[i] = OBJECT_Player;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2985 if (pActor->uAIState == Dead || pActor->uAIState == Removed || pActor->uAIState == Disabled || pActor->uAttributes & 0x0400)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2986 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2987
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2988 if (!pActor->sCurrentHP && pActor->uAIState != Dying)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2989 Actor::Die(i);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2990
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2991 for (uint j = 0; j < 22; ++j)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2992 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2993 if (j != 10)
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1336
diff changeset
2994 pActor->pActorBuffs[j].IsBuffExpiredToTime(pParty->uTimePlayed);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2995 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
2996 if (pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2997 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
2998 if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
2999 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1918
c77935190b51 fixing monsters not attacking unless attacked
Grumpy7
parents: 1912
diff changeset
3000 else if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3001 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3002
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3003 if (pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 ||
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3004 pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0)
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3005 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3006
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3007 pActor->pMonsterInfo.uRecoveryTime = max(pActor->pMonsterInfo.uRecoveryTime - pMiscTimer->uTimeElapsed, 0);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3008
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3009 pActor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3010 if (pActor->uCurrentActionTime < pActor->uCurrentActionLength)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3011 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3012
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3013 if (pActor->uAIState == Dying)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3014 pActor->uAIState = Dead;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3015 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3016 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3017 if (pActor->uAIState != Summoned)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3018 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3019 Actor::AI_StandOrBored(i, OBJECT_Player, 256, nullptr);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3020 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3021 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3022 pActor->uAIState = Standing;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3023 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3024
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3025 pActor->uCurrentActionTime = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3026 pActor->uCurrentActionLength = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3027 pActor->UpdateAnimation();
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3028 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3029
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3030
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3031 for(v78 = 0; v78 < ai_arrays_size; ++v78)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3032 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3033 uint actor_id = ai_near_actors_ids[v78];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3034 assert(actor_id < uNumActors);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3035
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3036 pActor = &pActors[actor_id];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3037
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3038 v47 = (signed int)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3039
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3040 Actor::_SelectTarget(actor_id, &ai_near_actors_targets_pid[actor_id], true);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3041 if (pActor->pMonsterInfo.uHostilityType && !ai_near_actors_targets_pid[actor_id])
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3042 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3043 target_pid = ai_near_actors_targets_pid[actor_id];
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3044 target_pid_type = PID_TYPE(target_pid);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3045 if ( target_pid_type == OBJECT_Actor)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3046 radiusMultiplier = 0.5;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3047 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3048 radiusMultiplier = 1.0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3049 v22 = pActor->uAIState;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3050 if ( v22 == Dying || v22 == Dead || v22 == Removed || v22 == Disabled || v22 == Summoned)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3051 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3052 if ( !pActor->sCurrentHP )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3053 Actor::Die(actor_id);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3054 for(int i=0;i<22;i++)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3055 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3056 if ( i != 10 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3057 pActor->pActorBuffs[i].IsBuffExpiredToTime(pParty->uTimePlayed);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3058 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3059 if ( pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3060 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3061 if ( pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3062 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3063 // not sure
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3064 else if ( pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3065 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
1948
7fd4bfa175fd pActorBuffs[2] to pActorBuffs[ACTOR_BUFF_SUMMONED]
Grumpy7
parents: 1947
diff changeset
3066 if ( pActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime < 0 )
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3067 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3068 pActor->uAIState = Removed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3069 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3070 }
1945
431d3da6e945 pActorBuffs[5] to pActorBuffs[ACTOR_BUFF_STONED]
Grumpy7
parents: 1940
diff changeset
3071 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0
1946
aa3ca49a10f5 pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
Grumpy7
parents: 1945
diff changeset
3072 || (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0)
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3073 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3074 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3075 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3076 v27 = pMiscTimer->uTimeElapsed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3077 v28 = pActor->pMonsterInfo.uRecoveryTime;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3078 pActor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3079 if ( (signed int)v28 > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3080 pActor->pMonsterInfo.uRecoveryTime = v28 - v27;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3081 if ( pActor->pMonsterInfo.uRecoveryTime < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3082 pActor->pMonsterInfo.uRecoveryTime = 0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3083 if ( !(pActor->uAttributes & 0x8000) )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3084 pActor->uAttributes |= 0x8000;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3085 a1 = PID(OBJECT_Actor,actor_id);
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3086 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
3087 pDir = &a3;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3088 uAIState = pActor->uAIState;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3089 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3090 || (signed int)pActor->pMonsterInfo.uRecoveryTime > 0
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3091 || radiusMultiplier * 307.2 < pDir->uDistance
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3092 || uAIState != Pursuing && uAIState != Standing && uAIState != Tethered && uAIState != Fidgeting
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3093 && !pActor->pMonsterInfo.uMissleAttack1Type || uAIState != Stunned )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3094 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3095 if ( (signed int)pActor->uCurrentActionTime < pActor->uCurrentActionLength )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3096 continue;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3097 else if ( pActor->uAIState == AttackingMelee )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3098 {
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
3099 v35 = pActor->special_ability_use_check(actor_id);
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3100 AttackerInfo.Add(a1, 5120, pActor->vPosition.x, pActor->vPosition.y, pActor->vPosition.z + ((signed int)pActor->uActorHeight >> 1), v35, 1 );
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3101 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3102 else if ( pActor->uAIState == AttackingRanged1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3103 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3104 v34 = pActor->pMonsterInfo.uMissleAttack1Type;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3105 Actor::AI_RangedAttack(actor_id, pDir, v34, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3106 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3107 else if ( pActor->uAIState == AttackingRanged2 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3108 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3109 v34 = pActor->pMonsterInfo.uMissleAttack2Type;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3110 Actor::AI_RangedAttack(actor_id, pDir, v34, 1);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3111 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3112 else if ( pActor->uAIState == AttackingRanged3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3113 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3114 v65 = pActor->pMonsterInfo.uSpellSkillAndMastery1;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3115 v33 = pActor->pMonsterInfo.uSpell1ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3116 Actor::AI_SpellAttack(actor_id, pDir, v33, 2, v65);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3117 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3118 else if ( pActor->uAIState == AttackingRanged4 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3119 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3120 v65 = pActor->pMonsterInfo.uSpellSkillAndMastery2;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3121 v33 = pActor->pMonsterInfo.uSpell2ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3122 Actor::AI_SpellAttack(actor_id, pDir, v33, 3, v65);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3123 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3124 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3125
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3126 v36 = pDir->uDistance;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3127 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3128 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3129 if ( target_pid_type == OBJECT_Actor )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3130 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3131 v36 = pDir->uDistance;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3132 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
3133 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3134 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3135 v37 = 4;
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3136 v38 = 0;
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3137 if ( v37 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3138 v38 = 1024;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3139 else if ( v37 == 3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3140 v38 = 2560;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3141 else if ( v37 == 4 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3142 v38 = 5120;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3143 if ( v37 >= 1 && v37 <= 4 && v36 < v38 || v37 == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3144 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3145 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3146
1950
8509a59af88f pActorBuffs[4] to pActorBuffs[ACTOR_BUFF_AFRAID]
Grumpy7
parents: 1949
diff changeset
3147 if (pActor->pActorBuffs[ACTOR_BUFF_AFRAID].uExpireTime > 0)
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3148 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3149 if ( (signed int)v36 >= 10240 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3150 Actor::AI_RandomMove(actor_id, target_pid, 1024, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3151 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3152 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3153 //peasents after attacked
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3154 //guard after attacked
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3155 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3156 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3157 continue;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3158 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3159
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3160 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Long && target_pid )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3161 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3162 if ( pActor->pMonsterInfo.uAIType == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3163 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3164 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3165 Actor::AI_Stand(actor_id, target_pid, (uint)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333), pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3166 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3167 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3168 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3169 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3170 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3171
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3172 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3173 if ( !(pActor->uAttributes & 0x020000) )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3174 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3175 if ( pActor->pMonsterInfo.uAIType == 2 || pActor->pMonsterInfo.uAIType == 3)
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3176 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3177 if ( pActor->pMonsterInfo.uAIType == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3178 v43 = (double)(signed int)pActor->pMonsterInfo.uHP * 0.2;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3179 if ( pActor->pMonsterInfo.uAIType == 3 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3180 v43 = (double)(signed int)pActor->pMonsterInfo.uHP * 0.1;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3181 v42 = (double)pActor->sCurrentHP;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3182 if ( v43 > v42 && (signed int)v36 < 10240 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3183 {
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3184 Actor::AI_Flee(actor_id, target_pid, 0, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3185 continue;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3186 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3187 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3188 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3189
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3190 v81 = v36 - pActor->uActorRadius;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3191 if ( target_pid_type == OBJECT_Actor )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3192 v81 -= pActors[PID_ID(target_pid)].uActorRadius;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3193 if ( v81 < 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3194 v81 = 0;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3195 rand();
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3196 pActor->uAttributes &= 0xFFFBFFFF;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3197 if ( v81 < 5120 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3198 {
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
3199 v45 = pActor->special_ability_use_check(actor_id);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3200 if ( v45 == 0 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3201 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3202 if ( pActor->pMonsterInfo.uMissleAttack1Type )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3203 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3204 if ( (signed int)pActor->pMonsterInfo.uRecoveryTime <= 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3205 Actor::AI_MissileAttack1(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3206 else if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3207 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3208 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3209 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3210 if ( radiusMultiplier * 307.2 > (double)v81 )
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3211 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3212 else
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3213 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3214 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3215 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3216 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3217 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3218 if ( (double)v81 >= radiusMultiplier * 307.2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3219 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3220 if (pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY)
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3221 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3222 else if ( v81 >= 1024 )//monsters
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3223 Actor::AI_Pursue3(actor_id, target_pid, 0, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3224 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3225 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3226 v70 = (signed int)(radiusMultiplier * 307.2);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3227 //monsters
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3228 //guard after player runs away
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3229 // follow player
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3230 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3231 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3232 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3233 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3234 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3235 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3236 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3237 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3238 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3239 //monsters
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3240 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3241 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3242 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3243 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3244 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3245 else if ( v45 == 2 || v45 == 3 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3246 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3247 if ( v45 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3248 v46 = pActor->pMonsterInfo.uSpell1ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3249 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3250 v46 = pActor->pMonsterInfo.uSpell2ID;
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3251 if ( v46 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3252 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3253 if ( (signed int)pActor->pMonsterInfo.uRecoveryTime <= 0 )
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3254 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3255 if ( v45 == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3256 Actor::AI_SpellAttack1(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3257 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3258 Actor::AI_SpellAttack2(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3259 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3260 else if ( radiusMultiplier * 307.2 > (double)v81 || pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1906
768590235c2c UpdateActorAI getting rid of unnecessary memcpys
Grumpy7
parents: 1897
diff changeset
3261 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3262 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3263 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3264 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3265 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3266 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3267 if ( (double)v81 >= radiusMultiplier * 307.2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3268 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3269 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3270 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3271 else if ( v81 >= 1024 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3272 Actor::AI_Pursue3(actor_id, target_pid, 256, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3273 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3274 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3275 v70 = (signed int)(radiusMultiplier * 307.2);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3276 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3277 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3278 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3279 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3280 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3281 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3282 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3283 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3284 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3285 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3286 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3287 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3288 continue;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3289 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3290 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3291 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3292
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3293 if ( pActor->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long || !target_pid || v81 >= 5120 || v45 != 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3294 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3295 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_SHORT )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3296 Actor::AI_RandomMove(actor_id, 4, 1024, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3297 else if ( pActor->pMonsterInfo.uMovementType == 1 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3298 Actor::AI_RandomMove(actor_id, 4, 2560, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3299 else if ( pActor->pMonsterInfo.uMovementType == 2 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3300 Actor::AI_RandomMove(actor_id, 4, 5120, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3301 else if ( pActor->pMonsterInfo.uMovementType == 4 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3302 Actor::AI_RandomMove(actor_id, 4, 10240, 0);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3303 else if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3304 {
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3305 Actor::GetDirectionInfo(a1, 4u, &v72, 0);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3306 v58 = (uint)(pActor->pMonsterInfo.uRecoveryTime * 2.133333333333333);
1910
8d3723ca71e6 Actor::GetDirectionInfo changed the signature to a less confusing one
Grumpy7
parents: 1909
diff changeset
3307 Actor::AI_Stand(actor_id, 4, v58, &v72);
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3308 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3309 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3310 else if ( !pActor->pMonsterInfo.uMissleAttack2Type )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3311 {
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3312 if ( (double)v81 >= radiusMultiplier * 307.2 )
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3313 {
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3314 if ( pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3315 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3316 else if ( v81 >= 1024 )
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3317 Actor::AI_Pursue3(actor_id, target_pid, 256, pDir);
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3318 else
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3319 {
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3320 v70 = (int)(radiusMultiplier * 307.2);
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3321 Actor::AI_Pursue2(actor_id, target_pid, 0, pDir, v70);
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3322 }
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3323 }
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3324 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3325 Actor::AI_Stand(actor_id, target_pid, v47, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3326 else
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3327 Actor::AI_MeleeAttack(actor_id, target_pid, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3328 }
1907
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3329 else if ( (signed int)pActor->pMonsterInfo.uRecoveryTime > 0 )
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3330 {
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3331 if ( radiusMultiplier * 307.2 > (double)v81 || pActor->pMonsterInfo.uMovementType == MONSTER_MOVEMENT_TYPE_STAIONARY )
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 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3334 Actor::AI_Pursue1(actor_id, target_pid, actor_id, v47, pDir);
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3335 }
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3336 else
1eb0515ff54b UpdateActorAI() minor clean ups
Grumpy7
parents: 1906
diff changeset
3337 Actor::AI_MissileAttack2(actor_id, target_pid, pDir);
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3338 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3339 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3340 //----- (0044665D) --------------------------------------------------------
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3341 // uType: 0 -> any monster
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3342 // 1 -> uParam is GroupID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3343 // 2 -> uParam is MonsterID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3344 // 3 -> uParam is ActorID
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3345 // uNumAlive: 0 -> all must be alive
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3346 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive)
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3347 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3348 unsigned int uAliveActors; // eax@6
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3349 unsigned int uTotalActors; // [sp+0h] [bp-4h]@1
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3350
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3351 uTotalActors = 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3352 if ( uType )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3353 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3354 if ( uType == 1 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3355 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3356 uAliveActors = SearchActorByGroup(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3357 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3358 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3359 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3360 if ( uType == 2 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3361 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3362 uAliveActors = SearchActorByMonsterID(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3363 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3364 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3365 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3366 if ( uType != 3 )
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3367 return 0;
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3368 uAliveActors = SearchActorByID(&uTotalActors, uParam);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3369 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3370 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3371 }
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3372 else
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3373 {
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3374 uAliveActors = SearchAliveActors(&uTotalActors);
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3375 }
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3376
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3377 if (uNumAlive)
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3378 return uAliveActors >= uNumAlive;
1295
86a83e12d795 moving files
Ritor1
parents: 1253
diff changeset
3379 else
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3380 return uTotalActors == uAliveActors;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3381 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3382 //----- (00408B54) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3383 unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3384 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3385 int v4; // eax@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3386 unsigned int v5; // ebx@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3387
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3388 v4 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3389 *pTotalActors = 0;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3390 if ( (pActors[a2].uAttributes & 0x100000) == GetAlertStatus() )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3391 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3392 *pTotalActors = 1;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3393 if ( pActors[a2].IsNotAlive() == 1 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3394 v5 = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3395 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3396 return v5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3397 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3398 //----- (00408AE7) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3399 unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3400 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3401 int v8; // [sp+Ch] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3402 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
3403 Actor* v4;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3404
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3405 v8 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3406 *pTotalActors = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3407 v9 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3408 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3409 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3410 v4 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3411 if ( (v4->uAttributes & 0x100000) == v8 && v4->uGroup == uGroup)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3412 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3413 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3414 if ( v4->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3415 ++v9;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3416 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3417 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3418 return v9;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3419 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3420 //----- (00408A7E) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3421 unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3422 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3423 Actor *v4; // edi@2
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3424 int v8; // [sp+Ch] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3425 unsigned int v9; // [sp+10h] [bp-4h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3426
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3427 v8 = GetAlertStatus();
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3428 *pTotalActors = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3429 v9 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3430 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3431 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3432 v4 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3433 if ( (v4->uAttributes & 0x100000) == v8 && v4->pMonsterInfo.field_33 == uMonsterID)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3434 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3435 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3436 if ( v4->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3437 ++v9;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3438 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3439 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3440 return v9;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3441 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3442 //----- (00408A27) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1456
diff changeset
3443 unsigned int SearchAliveActors(unsigned int *pTotalActors)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3444 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3445 int v2; // eax@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3446 unsigned int v3; // ebp@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3447 Actor *v5; // edi@2
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3448
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3449 v2 = GetAlertStatus();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3450 v3 = 0;
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3451 *pTotalActors = 0;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3452 for ( uint i = 0; i < uNumActors; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3453 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3454 v5 = &pActors[i];
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3455 if ( (v5->uAttributes & 0x100000) == v2 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3456 {
1927
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3457 ++*pTotalActors;
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3458 if ( v5->IsNotAlive() == 1 )
50d00b884765 SearchActorByID, SearchActorByGroup, SearchActorByMonsterID, SearchAliveActors changed if-do-whiles to fors
Grumpy7
parents: 1918
diff changeset
3459 ++v3;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3460 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3461 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3462 return v3;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3463 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3464 //----- (00408768) --------------------------------------------------------
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3465 void InitializeActors()
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3466 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3467 signed int v5; // [sp+Ch] [bp-10h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3468 signed int v6; // [sp+10h] [bp-Ch]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3469 signed int v7; // [sp+14h] [bp-8h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3470 signed int v8; // [sp+18h] [bp-4h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3471
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3472 v8 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3473 v6 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3474 v7 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3475 v5 = 0;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
3476 if ( !_stricmp(pCurrentMapName, "d25.blv") )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3477 v8 = 1;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
3478 if ( !_stricmp(pCurrentMapName, "d26.blv") )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3479 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
3480 if (pParty->IsPartyGood())
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3481 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
3482 if (pParty->IsPartyEvil())
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3483 v5 = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3484
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3485 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
3486 for (uint i = 0; i < uNumActors; ++i)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3487 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1974
diff changeset
3488 Actor* actor = &pActors[i];
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3489
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3490 if (actor->CanAct() || actor->uAIState == Disabled)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3491 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3492 actor->vPosition.x = actor->vInitialPosition.x;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3493 actor->vPosition.y = actor->vInitialPosition.y;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3494 actor->vPosition.z = actor->vInitialPosition.z;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3495 actor->sCurrentHP = actor->pMonsterInfo.uHP;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3496 if (actor->uAIState != Disabled)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3497 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3498 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
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
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3502 actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3503
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3504 if (!v8 || v7)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3505 if (!v6 || v5)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3506 if (actor->IsPeasant())
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3507 actor->uAttributes &= 0xF70000;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3508
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3509 actor->uAttributes &= 0x7F0000;
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3510 if (actor->uAttributes & 0x400000)
1882
b3191dddab9f Actor::AI_Stun cleaned up, commented out the body of _4031C1_update_job
Grumpy7
parents: 1881
diff changeset
3511 Actor::_4031C1_update_job_never_gets_called(i, pParty->uCurrentHour, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3512 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3513 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3514 //----- (00439474) --------------------------------------------------------
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3515 void DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, Vec3_int_ *pVelocity)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3516 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3517 SpriteObject *projectileSprite; // ebx@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3518 Actor *pMonster; // esi@7
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3519 unsigned __int16 v16; // cx@25
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3520 int v33; // eax@100
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3521 int v40; // ebx@107
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3522 int extraRecoveryTime; // qax@125
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3523 unsigned __int16 v43; // ax@132
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3524 unsigned __int16 v45; // ax@132
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3525 unsigned __int64 v46; // [sp+Ch] [bp-60h]@6
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3526 char *pPlayerName; // [sp+18h] [bp-54h]@12
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3527 char *pMonsterName; // [sp+1Ch] [bp-50h]@6
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3528 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
3529 bool IsAdditionalDamagePossible; // [sp+50h] [bp-1Ch]@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3530 int v61; // [sp+58h] [bp-14h]@1
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3531 bool isLifeStealing; // [sp+5Ch] [bp-10h]@1
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3532 int uDamageAmount; // [sp+60h] [bp-Ch]@1
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3533 DAMAGE_TYPE attackElement; // [sp+64h] [bp-8h]@27
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3534
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3535 projectileSprite = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3536 uDamageAmount = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3537 a4 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3538 v61 = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3539 IsAdditionalDamagePossible = false;
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3540 isLifeStealing = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3541 if ( PID_TYPE(a1) == OBJECT_Item)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3542 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3543 projectileSprite = &pSpriteObjects[PID_ID(a1)];
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3544 v61 = projectileSprite->field_60_distance_related_prolly_lod;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3545 a1 = projectileSprite->spell_caster_pid;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3546 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3547 if (PID_TYPE(a1) != OBJECT_Player)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3548 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3549
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3550 assert(PID_ID(abs(a1)) < 4);
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3551 Player* player = &pParty->pPlayers[PID_ID(a1)];
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3552 pMonster = &pActors[uActorID_Monster];
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3553 if (pMonster->IsNotAlive())
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3554 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3555
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
3556 pMonster->uAttributes |= 0xC000;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3557 if ( pMonster->uAIState == Fleeing )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3558 pMonster->uAttributes |= 0x20000u;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3559 bool hit_will_stun = false,
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3560 hit_will_paralyze = false;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3561 if ( !projectileSprite )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3562 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3563 int main_hand_idx = player->pEquipment.uMainHand;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3564 IsAdditionalDamagePossible = true;
1989
33787c8938a5 Single and Two-handed ENUM
zipi
parents: 1988
diff changeset
3565 if ( player->HasItemEquipped(EQUIP_TWO_HANDED) )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3566 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3567 uint main_hand_skill = player->GetMainHandItem()->GetPlayerSkillType();
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3568 uint main_hand_mastery = SkillToMastery(player->pActiveSkills[main_hand_skill]);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3569 switch (main_hand_skill)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3570 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3571 case PLAYER_SKILL_STAFF:
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3572 if (main_hand_mastery >= 3)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3573 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3574 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
3575 hit_will_stun = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3576 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3577 break;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3578
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3579 case PLAYER_SKILL_MACE:
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3580 if (main_hand_mastery >= 3)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3581 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3582 if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3583 hit_will_stun = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3584 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3585 if (main_hand_mastery >= 4)
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 (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3588 hit_will_paralyze = true;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3589 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3590 break;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3591 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3592 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3593 attackElement = DMGT_PHISYCAL;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3594 uDamageAmount = player->CalculateMeleeDamageTo(false, false, pMonster->pMonsterInfo.uID);
1928
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3595 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3596 {
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3597 player->PlaySound(SPEECH_52, 0);
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3598 return;
4fa815c2112d DamageMonsterFromParty removed LABEL_67
Grumpy7
parents: 1927
diff changeset
3599 }
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3600 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3601 else
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3602 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3603 v61 = projectileSprite->field_60_distance_related_prolly_lod;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3604 if ( projectileSprite->spell_id != SPELL_DARK_SOULDRINKER )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3605 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3606 std::array<int, 3> distances;
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3607 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
3608 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
3609 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
3610 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
3611 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
3612
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
3613 if ( v61 >= 5120 && !(pMonster->uAttributes & 0x400) )
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3614 return;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3615 else if ( v61 >= 2560 )
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3616 v61 = 2;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3617 else
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3618 v61 = 1;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3619 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3620
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3621 switch (projectileSprite->spell_id)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3622 {
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3623 case SPELL_LASER_PROJECTILE:
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3624 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
3625 v61 = 1;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3626 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
3627 a4 = player->pActiveSkills[PLAYER_SKILL_BLASTER] & 0x3F;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3628 attackElement = DMGT_PHISYCAL;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3629 uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3630 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
3631 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3632 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3633 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3634 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3635 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3636 case SPELL_101:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3637 attackElement = DMGT_FIRE;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3638 uDamageAmount = player->CalculateRangedDamageTo(0);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3639 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
3640 uDamageAmount >>= 1;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3641 IsAdditionalDamagePossible = true;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3642 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
3643 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3644 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3645 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3646 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3647 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3648 case SPELL_EARTH_BLADES:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3649 a4 = 5 * projectileSprite->spell_level;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3650 attackElement = (DAMAGE_TYPE)player->GetSpellSchool(SPELL_EARTH_BLADES);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3651 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
3652 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
3653 uDamageAmount >>= 1;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3654 IsAdditionalDamagePossible = false;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3655 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
3656 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3657 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3658 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3659 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3660 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3661 case SPELL_EARTH_STUN:
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3662 uDamageAmount = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3663 attackElement = DMGT_PHISYCAL;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3664 hit_will_stun = 1;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3665 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
3666 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3667 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3668 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3669 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3670 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3671 case SPELL_BOW_ARROW:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3672 attackElement = DMGT_PHISYCAL;
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3673 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
3674 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
3675 uDamageAmount /= 2;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3676 IsAdditionalDamagePossible = true;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3677 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
3678 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3679 attackElement = DMGT_FIRE;
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3680 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3681 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
3682 {
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3683 player->PlaySound(SPEECH_52, 0);
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3684 return;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3685 }
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3686 break;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3687
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3688 default:
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3689 attackElement = (DAMAGE_TYPE)player->GetSpellSchool(projectileSprite->spell_id);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3690 IsAdditionalDamagePossible = false;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3691 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
3692 break;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3693 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3694 }
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3695
1362
d6cf8ead9242 Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents: 1359
diff changeset
3696 if (player->IsWeak())
1929
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3697 uDamageAmount /= 2;
4cce1e24b7e7 DamageMonsterFromParty moved initial damage source logic to an if and a switch
Grumpy7
parents: 1928
diff changeset
3698 if ( pMonster->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3699 uDamageAmount = 0;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3700 v61 = stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, uDamageAmount);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3701 if ( !projectileSprite && player->IsUnarmed() && player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uExpireTime > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3702 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3703 v61 += stru_50C198.CalcMagicalDamageToActor(pMonster, 8, player->pPlayerBuffs[PLAYER_BUFF_HAMMERHANDS].uPower);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3704 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3705 uDamageAmount = v61;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3706 if ( IsAdditionalDamagePossible )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3707 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3708 if ( projectileSprite )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3709 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3710 a4 = projectileSprite->stru_24._439DF3_get_additional_damage((int*)&attackElement, &isLifeStealing);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3711 if ( isLifeStealing && pMonster->sCurrentHP > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3712 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3713 player->sHealth += v61 / 5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3714 if ( player->sHealth > player->GetMaxHealth() )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3715 player->sHealth = player->GetMaxHealth();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3716 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3717 uDamageAmount += stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, a4);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3718 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3719 else
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3720 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3721 for (int i = 0; i < 2; i++)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3722 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3723 if ( player->HasItemEquipped((ITEM_EQUIP_TYPE)i) )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3724 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3725 ItemGen* item;
1992
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3726 if (i == 0)
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3727 item = player->GetOffHandItem();
1e5f097e1c2d fixing incorrect item checked when dealing damage to monsters
Grumpy7
parents: 1989
diff changeset
3728 else
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3729 item = player->GetMainHandItem();
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3730 a4 = item->_439DF3_get_additional_damage((int*)&attackElement, &isLifeStealing);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3731 if ( isLifeStealing && pMonster->sCurrentHP > 0 )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3732 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3733 player->sHealth += v61 / 5;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3734 if ( player->sHealth > player->GetMaxHealth() )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3735 player->sHealth = player->GetMaxHealth();
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3736 }
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3737 uDamageAmount += stru_50C198.CalcMagicalDamageToActor(pMonster, attackElement, a4);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3738 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3739 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3740 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3741 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3742 pMonster->sCurrentHP -= uDamageAmount;
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3743 if ( uDamageAmount == 0 && !hit_will_stun )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3744 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3745 player->PlaySound(SPEECH_52, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3746 return;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3747 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3748 if ( pMonster->sCurrentHP > 0 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3749 {
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3750 Actor::AI_Stun(uActorID_Monster, a1, 0);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3751 Actor::AggroSurroundingPeasants(uActorID_Monster, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3752 if ( bShowDamage )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3753 {
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3754 if ( projectileSprite )
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3755 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
3756 else
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3757 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
3758 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3759 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3760 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3761 else
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3762 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3763 if ( pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].bQuestMonster & 1 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3764 {
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
3765 if ( /*pRenderer->pRenderD3D &&*/ pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3766 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
3767 v33 = byte_4D864C && pGame->uFlags & 0x80000 ? 10 * pMonster->uActorRadius : pMonster->uActorRadius;
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3768 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
3769 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3770 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3771 Actor::Die(uActorID_Monster);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3772 Actor::ApplyFineForKillingPeasant(uActorID_Monster);
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3773 Actor::AggroSurroundingPeasants(uActorID_Monster, 1);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3774 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
3775 pParty->GivePartyExp(pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].uExp);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3776 v40 = SPEECH_51;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3777 if ( rand() % 100 < 20 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3778 v40 = ((signed int)pMonster->pMonsterInfo.uHP >= 100) + 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3779 player->PlaySound((PlayerSpeech)v40, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3780 if ( bShowDamage )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3781 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3782 pMonsterName = (char *)uDamageAmount;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3783 pPlayerName = player->pName; // "%s inflicts %lu points killing %s"
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3784 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[175], player->pName, uDamageAmount, pMonster);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3785 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3786 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3787 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3788 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
3789 && uDamageAmount != 0 )
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3790 player->ReceiveDamage(uDamageAmount, attackElement);
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3791 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
3792 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
3793 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3794 extraRecoveryTime = 20;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3795 knockbackValue = 10;
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3796 if ( !pParty->bTurnBasedModeOn )
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3797 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
3798 pMonster->pMonsterInfo.uRecoveryTime += extraRecoveryTime;
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3799 if ( bShowDamage )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3800 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3801 pMonsterName = player->pName; // "%s stuns %s"
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3802 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[635], player->pName, pMonster);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3803 ShowStatusBarString(pTmpBuf.data(), 2u);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3804 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3805 }
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3806 if ( hit_will_paralyze && pMonster->CanAct() && stru_50C198.GetMagicalResistance(pMonster, DMGT_EARTH))
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3807 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3808 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
3809 v45 = SkillToMastery(v43);
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3810 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
3811 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
3812 if ( bShowDamage )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3813 {
1933
5fcf6023f9c3 DamageMonsterFromParty some additional vars removed, changed the ordering part to something more readable
Grumpy7
parents: 1932
diff changeset
3814 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
3815 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
3816 ShowStatusBarString(pTmpBuf.data(), 2u);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3817 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3818 }
1931
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3819 if ( knockbackValue > 10 )
2e3d08ff3309 DamageMonsterFromParty renaming vars, deleting unused ones, values to enums, etc.
Grumpy7
parents: 1929
diff changeset
3820 knockbackValue = 10;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3821 if ( !MonsterStats::BelongsToSupertype(pMonster->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3822 {
2172
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
3823 pVelocity->x = fixpoint_mul(knockbackValue, pVelocity->x);
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
3824 pVelocity->y = fixpoint_mul(knockbackValue, pVelocity->y);
56aa61b54785 indoor cleaning continue
Ritor1
parents: 2169
diff changeset
3825 pVelocity->z = fixpoint_mul(knockbackValue, pVelocity->z);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3826 pMonster->vVelocity.x = 50 * LOWORD(pVelocity->x);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3827 pMonster->vVelocity.y = 50 * LOWORD(pVelocity->y);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3828 pMonster->vVelocity.z = 50 * LOWORD(pVelocity->z);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3829 }
1934
564898c5882b DamageMonsterFromParty cleanup finished
Grumpy7
parents: 1933
diff changeset
3830 Actor::AddBloodsplatOnDamageOverlay(uActorID_Monster, 1, v61);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3831 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3832 //----- (004BBF61) --------------------------------------------------------
2169
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3833 void Actor::Arena_summon_actor( int monster_id, __int16 x, int y, int z )
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3834 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3835 int v12; // ebx@7
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3836 int v13; // eax@8
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3837 __int16 v16; // [sp+10h] [bp-4h]@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3838
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1554
diff changeset
3839 if (uNumActors < 500)
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3840 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3841 v16 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3842 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
1935
1cbfb6e50e48 moving _4BBF61_summon_actor under Actor
Grumpy7
parents: 1934
diff changeset
3843 v16 = pIndoor->GetSector(x, y, z);
2169
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3844 pActors[uNumActors].Reset();
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3845 strcpy(pActors[uNumActors].pActorName, pMonsterStats->pInfos[monster_id].pName);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3846 pActors[uNumActors].sCurrentHP = LOWORD(pMonsterStats->pInfos[monster_id].uHP);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3847 memcpy(&pActors[uNumActors].pMonsterInfo, &pMonsterStats->pInfos[monster_id], 0x58u);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3848 pActors[uNumActors].word_000086_some_monster_id = monster_id;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3849 pActors[uNumActors].uActorRadius = pMonsterList->pMonsters[monster_id - 1].uMonsterRadius;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3850 pActors[uNumActors].uActorHeight = pMonsterList->pMonsters[monster_id - 1].uMonsterHeight;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3851 pActors[uNumActors].uMovementSpeed = pMonsterList->pMonsters[monster_id - 1].uMovementSpeed;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3852 pActors[uNumActors].vInitialPosition.x = x;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3853 pActors[uNumActors].vPosition.x = x;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3854 pActors[uNumActors].uAttributes |= 80000;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3855 pActors[uNumActors].pMonsterInfo.uTreasureType = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3856 pActors[uNumActors].pMonsterInfo.uTreasureLevel = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3857 pActors[uNumActors].pMonsterInfo.uTreasureDiceSides = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3858 pActors[uNumActors].pMonsterInfo.uTreasureDiceRolls = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3859 pActors[uNumActors].pMonsterInfo.uTreasureDropChance = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3860 pActors[uNumActors].vInitialPosition.y = y;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3861 pActors[uNumActors].vPosition.y = y;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3862 pActors[uNumActors].vInitialPosition.z = z;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3863 pActors[uNumActors].vPosition.z = z;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3864 pActors[uNumActors].uTetherDistance = 256;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3865 pActors[uNumActors].uSectorID = v16;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3866 pActors[uNumActors].uGroup = 1;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3867 pActors[uNumActors].pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3868 pActors[uNumActors].PrepareSprites(0);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3869 for ( int i = 0; i < 4; i++)
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3870 pSoundList->LoadSound(pMonsterList->pMonsters[monster_id - 1].pSoundSampleIDs[i], 0);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3871 v12 = 0;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3872 do
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3873 {
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3874 v13 = pSoundList->LoadSound(v12 + word_4EE088_sound_ids[pMonsterStats->pInfos[monster_id].uSpell1ID], 1);
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3875 v12++;
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3876 }
5b27c035a241 small cleaning
Ritor1
parents: 2154
diff changeset
3877 while ( v13 );
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3878 ++uNumActors;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1295
diff changeset
3879 }
1911
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3880 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3881 //----- (00426E10) --------------------------------------------------------
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3882 int stru319::which_player_to_attack(Actor *pActor)
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3883 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3884 signed int v2; // ebx@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3885 bool flag; // edi@37
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3886 int v22; // [sp+8h] [bp-140h]@3
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3887 int Victims_list[60]; // [sp+48h] [bp-100h]@48
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3888 int for_sex; // [sp+13Ch] [bp-Ch]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3889 int for_race; // [sp+140h] [bp-8h]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3890 int for_class; // [sp+144h] [bp-4h]@1
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3891
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3892 for_class = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3893 for_race = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3894 for_sex = -1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3895 v2 = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3896 if ( pActor->pMonsterInfo.uAttackPreference )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3897 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3898 for ( uint i = 0; i < 16; i++ )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3899 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3900 v22 = pActor->pMonsterInfo.uAttackPreference & (1 << i);
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3901 if ( v22 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3902 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3903 switch ( v22 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3904 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3905 case 1:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3906 for_class = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3907 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3908 case 2:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3909 for_class = 12;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3910 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3911 case 4:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3912 for_class = 16;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3913 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3914 case 8:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3915 for_class = 28;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3916 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3917 case 16:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3918 for_class = 24;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3919 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3920 case 32:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3921 for_class = 32;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3922 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3923 case 64:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3924 for_class = 20;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3925 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3926 case 128:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3927 for_class = 4;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3928 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3929 case 256:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3930 for_class = 8;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3931 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3932 case 512:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3933 for_sex = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3934 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3935 case 1024:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3936 for_sex = 1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3937 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3938 case 2048:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3939 for_race = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3940 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3941 case 4096:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3942 for_race = 1;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3943 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3944 case 8192:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3945 for_race = 3;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3946 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3947 case 16384:
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3948 for_race = 2;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3949 break;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3950 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3951 v2 = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3952 for ( uint j = 0; j < 4; ++j )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3953 {
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3954 flag = 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3955 if ( for_class != -1 && for_class == pPlayers[j + 1]->classType )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3956 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3957 if ( for_sex != -1 && for_sex == pPlayers[j + 1]->uSex )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3958 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3959 if ( for_race != -1 && for_race == pPlayers[j + 1]->GetRace() )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3960 flag = true;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3961 if ( flag == true )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3962 {
2057
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
3963 if ( !(pPlayers[j + 1]->pConditions[Condition_Paralyzed] | pPlayers[j + 1]->pConditions[Condition_Unconcious]
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
3964 | 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
3965 Victims_list[v2++] = j;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3966 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3967 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3968 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3969 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3970 if ( v2 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3971 return Victims_list[rand() % v2];
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3972 }
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3973 for ( uint i = 0; i < 4; ++i )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3974 {
2057
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
3975 if ( !(pPlayers[i + 1]->pConditions[Condition_Paralyzed] | pPlayers[i + 1]->pConditions[Condition_Unconcious]
b7485a6502f2 AgressorAtackInfo
Ritor1
parents: 2044
diff changeset
3976 | 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
3977 Victims_list[v2++] = i;
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 if ( v2 )
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3980 return Victims_list[rand() % v2];
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3981 else
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3982 return 0;
af38275939cc which_player_to_attack rename and cleaning
Ritor1
parents: 1909
diff changeset
3983 }
1936
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3984 //----- (0042F4DA) --------------------------------------------------------
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3985 bool CheckActors_proximity()
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3986 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3987 signed int distance; // edi@1
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3988 int for_x; // ebx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3989 int for_y; // [sp+Ch] [bp-10h]@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3990 int for_z; // [sp+10h] [bp-Ch]@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3991 int v3; // eax@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3992 int v4; // ebx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3993 unsigned int v5; // ecx@5
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3994 int v6; // edx@6
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3995 unsigned int v7; // edx@8
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3996 unsigned int v8; // edx@10
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3997
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3998
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
3999 distance = 5120;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4000 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4001 distance = 2560;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4002
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4003 if ( (signed int)uNumActors <= 0 )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4004 return false;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4005 for ( uint i = 0; i < (signed int)uNumActors; ++i )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4006 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4007 for_x = abs(pActors[i].vInitialPosition.x - pParty->vPosition.x);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4008 for_y = abs(pActors[i].vInitialPosition.y - pParty->vPosition.y);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4009 for_z = abs(pActors[i].vInitialPosition.z - pParty->vPosition.z);
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4010 v3 = for_x;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4011 v4 = for_y;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4012 v5 = for_z;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4013 if ( v3 < for_y )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4014 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4015 v6 = v3;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4016 v3 = for_y;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4017 v4 = v6;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4018 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4019 if ( v3 < for_z )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4020 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4021 v7 = v3;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4022 v3 = for_z;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4023 v5 = v7;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4024 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4025 if ( v4 < (signed int)v5 )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4026 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4027 v8 = v5;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4028 v5 = v4;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4029 v4 = v8;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4030 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4031 if ( (signed int)(((unsigned int)(11 * v4) >> 5) + (v5 >> 2) + v3) < distance )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4032 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4033 if ( pActors[i].uAIState != Dead )
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4034 {
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4035 if ( pActors[i].uAIState != Dying && pActors[i].uAIState != Removed
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4036 && pActors[i].uAIState != Disabled && pActors[i].uAIState != Summoned
2203
4bfee77e900d DoInteractionWithTopmostZObject cleaned
Ritor1
parents: 2172
diff changeset
4037 && (pActors[i].uAttributes & 0x80000 || pActors[i].GetActorsRelation(0) ) )
1936
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4038 return true;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4039 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4040 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4041 }
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4042 return false;
68f2d9d3a1d9 MSVS 2010 project file
Ritor1
parents: 1929
diff changeset
4043 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4044
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4045
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4046 //----- (00426A5A) --------------------------------------------------------
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4047 void Actor::LootActor()
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4048 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4049 signed int v2; // edi@1
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4050 unsigned __int8 v7; // al@30
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4051 char *v9; // [sp-4h] [bp-3Ch]@10
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4052 char *v10; // [sp-4h] [bp-3Ch]@31
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4053 char *v11; // [sp-4h] [bp-3Ch]@38
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4054 ItemGen Dst; // [sp+Ch] [bp-2Ch]@1
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4055 bool itemFound; // [sp+30h] [bp-8h]@1
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4056 int v14; // [sp+34h] [bp-4h]@1
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4057
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4058 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4059 Dst.Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4060 v2 = 0;
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4061 itemFound = false;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4062 v14 = 0;
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4063 if ( !( this->uAttributes & 0x800000 ) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4064 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4065 for (uchar i = 0; i < this->pMonsterInfo.uTreasureDiceRolls; i++ )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4066 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4067 v14 += rand() % this->pMonsterInfo.uTreasureDiceSides + 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4068 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4069 if ( v14 != 0 )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4070 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4071 pParty->PartyFindsGold(v14, 0);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4072 viewparams->bRedrawGameUI = 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4073 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4074 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4075 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4076 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4077 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
4078 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4079 v14 = this->array_000234[3].uSpecEnchantmentType;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4080 this->array_000234[3].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4081 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4082 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4083 pParty->PartyFindsGold(v14, 0);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4084 viewparams->bRedrawGameUI = 1;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4085 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4086 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4087 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4088 if ( this->uCarriedItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4089 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4090 Dst.Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4091 Dst.uItemID = this->uCarriedItemID;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4092 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4093 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4094 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[490], v14, v9);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4095 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4096 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v9);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4097 ShowStatusBarString(pTmpBuf2.data(), 2u);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4098 if ( Dst.GetItemEquipType() == 12 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4099 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4100 Dst.uNumCharges = rand() % 6 + Dst.GetDamageMod() + 1;
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4101 Dst.uMaxCharges = Dst.uNumCharges;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4102 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4103 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
4104 Dst.uEnchantmentType = 2 * rand() % 4 + 2;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4105 pItemsTable->SetSpecialBonus(&Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4106 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4107 pParty->SetHoldingItem(&Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4108 this->uCarriedItemID = 0;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4109 if ( this->array_000234[0].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4110 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4111 if ( !pParty->AddItemToParty(this->array_000234) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4112 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4113 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4114 pParty->SetHoldingItem(this->array_000234);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4115 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4116 this->array_000234[0].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4117 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4118 if ( this->array_000234[1].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4119 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4120 if ( !pParty->AddItemToParty(&this->array_000234[1]) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4121 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4122 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4123 pParty->SetHoldingItem(&this->array_000234[1]);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4124 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4125 this->array_000234[1].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4126 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4127 this->Remove();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4128 return;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4129 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4130 if ( ( this->uAttributes & 0x800000 ) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4131 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4132 if ( this->array_000234[3].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4133 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4134 memcpy(&Dst, &this->array_000234[3], sizeof(Dst));
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4135 this->array_000234[3].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4136 v11 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4137 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4138 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[490], v14, v11);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4139 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4140 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v11);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4141 ShowStatusBarString(pTmpBuf2.data(), 2u);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4142 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4143 pParty->SetHoldingItem(&Dst);
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4144 itemFound = true;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4145 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4146 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4147 else
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4148 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4149 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
4150 {
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4151 pItemsTable->GenerateItem(v7, this->pMonsterInfo.uTreasureType, &Dst);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4152 v10 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4153 if ( v14 )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4154 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
4155 else
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4156 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], v10);//Âû íàøëè ^Pv[%s]!
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4157 ShowStatusBarString(pTmpBuf2.data(), 2);
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4158 if ( !pParty->AddItemToParty(&Dst) )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4159 pParty->SetHoldingItem(&Dst);
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4160 itemFound = true;
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4161 }
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4162 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4163 if ( this->array_000234[0].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4164 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4165 if ( !pParty->AddItemToParty(this->array_000234) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4166 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4167 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4168 pParty->SetHoldingItem(this->array_000234);
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4169 itemFound = true;
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4170 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4171 this->array_000234[0].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4172 }
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4173 if ( this->array_000234[1].uItemID )
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4174 {
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4175 if ( !pParty->AddItemToParty(&this->array_000234[1]) )
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4176 {
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4177 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4178 pParty->SetHoldingItem(&this->array_000234[1]);
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4179 itemFound = true;
1966
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 this->array_000234[1].Reset();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4182 }
1967
05787232b571 Actor::LootActor cleaned up, fixed item looting not working
Grumpy7
parents: 1966
diff changeset
4183 if ( !itemFound || rand() % 100 < 90 )
1966
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 this->Remove();
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4186 }
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4187 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4188
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4189
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4190 //----- (00427102) --------------------------------------------------------
1971
e45c277da9f1 Actor::_427102 to Actor::_427102_IsOkToCastSpell
Grumpy7
parents: 1970
diff changeset
4191 bool Actor::_427102_IsOkToCastSpell( signed int a2 )
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4192 {
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4193 switch(a2)
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4194 {
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4195 case SPELL_BODY_POWER_CURE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4196 {
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4197 if ( this->sCurrentHP >= (signed int)this->pMonsterInfo.uHP )
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4198 return false;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4199 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4200 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4201 case SPELL_LIGHT_DISPEL_MAGIC:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4202 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4203 for (int i = 0; i < 20; i++)
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4204 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4205 if (pParty->pPartyBuffs[i].uExpireTime > 0)
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4206 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4207 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4208 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4209 }
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4210 for ( int i = 1; i <= 4; i++ )
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4211 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4212 for ( int j = 0; j < 22; j++ )
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4213 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4214 if (pPlayers[i]->pPlayerBuffs[j].uExpireTime > 0)
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4215 {
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4216 return true;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4217 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4218 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4219 }
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4220 return false;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4221 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4222 case SPELL_LIGHT_DAY_OF_PROTECTION:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4223 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4224 return this->pActorBuffs[ACTOR_BUFF_DAY_OF_PROTECTION].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4225 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4226 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4227 case SPELL_LIGHT_HOUR_OF_POWER:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4228 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4229 return this->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4230 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4231 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4232 case SPELL_DARK_PAIN_REFLECTION:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4233 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4234 return this->pActorBuffs[ACTOR_BUFF_PAIN_REFLECTION].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4235 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4236 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4237 case SPELL_BODY_HAMMERHANDS:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4238 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4239 return this->pActorBuffs[ACTOR_BUFF_PAIN_HAMMERHANDS].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4240 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4241 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4242 case SPELL_FIRE_HASTE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4243 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4244 return this->pActorBuffs[ACTOR_BUFF_HASTE].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4245 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4246 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4247 case SPELL_AIR_SHIELD:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4248 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4249 return this->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4250 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4251 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4252 case SPELL_EARTH_STONESKIN:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4253 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4254 return this->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime <= 0;
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4255 break;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4256 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4257 case SPELL_SPIRIT_BLESS:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4258 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4259 return this->pActorBuffs[ACTOR_BUFF_BLESS].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4260 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4261 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4262 case SPELL_SPIRIT_FATE:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4263 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4264 return this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4265 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4266 }
1969
a9adc0aa49ca Actor::_427102 changing cases to enum values
Grumpy7
parents: 1968
diff changeset
4267 case SPELL_SPIRIT_HEROISM:
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4268 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4269 return this->pActorBuffs[ACTOR_BUFF_HEROISM].uExpireTime <= 0;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4270 break;
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4271 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4272 default:
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4273 {
1970
8e36ef7de0db Actor::_427102 cleaned up
Grumpy7
parents: 1969
diff changeset
4274 return true;
1968
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4275 }
7d2c5fa98584 moving stru319::_427102 to Actor::_427102
Grumpy7
parents: 1967
diff changeset
4276 }
1972
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4277 }
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4278
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4279
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4280 //----- (0042704B) --------------------------------------------------------
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4281 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
4282 {
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4283 signed int okToCastSpell1; // ebx@5
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4284 signed int okToCastSpell2; // edi@5
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4285
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4286 if ( this->pMonsterInfo.uSpecialAbilityType == 2
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4287 && this->pMonsterInfo.uSpecialAbilityDamageDiceBonus < 3u
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4288 && rand() % 100 < 5 )
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4289 this->SummonMinion(a2);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4290 okToCastSpell1 = this->_427102_IsOkToCastSpell(this->pMonsterInfo.uSpell1ID);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4291 okToCastSpell2 = this->_427102_IsOkToCastSpell(this->pMonsterInfo.uSpell2ID);
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4292 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
4293 return ABILITY_SPELL1;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4294 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
4295 return ABILITY_SPELL2;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4296 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
4297 return ABILITY_ATTACK2;
3ef25d06b9b0 Actor::special_ability_use_check moved to Actor and cleaned up
Grumpy7
parents: 1971
diff changeset
4298 return ABILITY_ATTACK1;
1974
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4299 }
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4300
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4301
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4302
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4303 //----- (004273BB) --------------------------------------------------------
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4304 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
4305 {
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4306 signed int v6; // ebx@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4307 signed int v7; // esi@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4308 int armorSum; // ebx@10
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4309 signed int a2a; // [sp+18h] [bp+Ch]@1
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4310
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4311 v6 = defender->pMonsterInfo.uAC;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4312 v7 = 0;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4313 a2a = 0;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4314 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
4315 v6 /= 2;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4316 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
4317 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
4318 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
4319 v7 = defender->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4320 armorSum = v7 + v6;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4321 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
4322 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
4323 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
4324 a2a = this->pActorBuffs[ACTOR_BUFF_BLESS].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4325 if ( this->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4326 {
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4327 a2a += this->pActorBuffs[ACTOR_BUFF_FATE].uPower;
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4328 this->pActorBuffs[ACTOR_BUFF_FATE].Reset();
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4329 }
0f62a2b8bd0a stru319::_4273BB moved to Actor::_4273BB, renamed to _4273BB_DoesHitOtherActor
Grumpy7
parents: 1972
diff changeset
4330 return rand() % (armorSum + 2 * this->pMonsterInfo.uLevel + 10) + a2a + 1 > armorSum + 5;
2101
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4331 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4332
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4333 //----- (00448A98) --------------------------------------------------------
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4334 void __fastcall ToggleActorGroupFlag(unsigned int uGroupID, unsigned int uFlag, unsigned int bToggle)
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4335 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4336 if ( uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4337 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4338 if ( bToggle )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4339 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4340 for ( uint i = 0; i < (unsigned int)uNumActors; ++i )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4341 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4342 if ( pActors[i].uGroup == uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4343 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4344 pActors[i].uAttributes |= uFlag;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4345 if ( uFlag == 0x10000 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4346 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4347 pActors[i].uAIState = Disabled;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4348 pActors[i].UpdateAnimation();
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4349 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4350 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4351 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4352 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4353 else
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4354 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4355 for ( uint i = 0; i < (unsigned int)uNumActors; ++i )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4356 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4357 if ( pActors[i].uGroup == uGroupID )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4358 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4359 if ( uFlag == 0x10000 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4360 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4361 if ( pActors[i].uAIState != Dead )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4362 {
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4363 if ( pActors[i].uAIState != 4 && pActors[i].uAIState != 11 )
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4364 pActors[i].uAIState = Standing;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4365 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4366 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4367 LODWORD(pActors[i].uAttributes) &= ~uFlag;
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4368 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4369 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4370 }
ee2724b9ca05 RasterLine2D fix and etc.
Ritor1
parents: 2059
diff changeset
4371 }
1966
7840fe323f67 stru319::LootActor(struct Actor *pActor) to Actor::LootActor
Grumpy7
parents: 1965
diff changeset
4372 }