annotate mm7_4.cpp @ 2414:0673a59ec9e5

Слияние
author Ritor1
date Wed, 16 Jul 2014 18:28:23 +0600
parents 8cee51ce4382
children f4af3b203f65
rev   line source
2253
aff7a7b072b7 adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Grumpy7
parents: 2250
diff changeset
1 #define _CRT_SECURE_NO_WARNINGS
2336
d6887ee81068 header file include cleanup
Grumpy7
parents: 2334
diff changeset
2
d6887ee81068 header file include cleanup
Grumpy7
parents: 2334
diff changeset
3 #include "ErrorHandling.h"
d6887ee81068 header file include cleanup
Grumpy7
parents: 2334
diff changeset
4 #include "VectorTypes.h"
2152
d44b7775fc06 Removed DirectDraw2 compatibility.
Nomad
parents: 2132
diff changeset
5 #include "mm7_unsorted_subs.h"
341
a8ee15a20bea EnterHouse
Nomad
parents: 336
diff changeset
6 #include "MM7.h"
0
Ritor1
parents:
diff changeset
7 #include "MapInfo.h"
Ritor1
parents:
diff changeset
8 #include "Game.h"
Ritor1
parents:
diff changeset
9 #include "GUIWindow.h"
Ritor1
parents:
diff changeset
10 #include "GUIFont.h"
Ritor1
parents:
diff changeset
11 #include "Party.h"
Ritor1
parents:
diff changeset
12 #include "AudioPlayer.h"
Ritor1
parents:
diff changeset
13 #include "Outdoor.h"
1277
1803172dffd9 header stuff
Grumpy7
parents: 1275
diff changeset
14 #include "Outdoor_stuff.h"
0
Ritor1
parents:
diff changeset
15 #include "LOD.h"
Ritor1
parents:
diff changeset
16 #include "Actor.h"
Ritor1
parents:
diff changeset
17 #include "Events.h"
Ritor1
parents:
diff changeset
18 #include "Viewport.h"
Ritor1
parents:
diff changeset
19 #include "FrameTableInc.h"
2037
7a9477135943 Renamed Math.h -> OurMath.h (file resolution was sometimes ambiguous)
Nomad
parents: 2030
diff changeset
20 #include "OurMath.h"
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
21 #include "SpriteObject.h"
0
Ritor1
parents:
diff changeset
22 #include "ObjectList.h"
Ritor1
parents:
diff changeset
23 #include "DecorationList.h"
2044
28cb79ae2f6f Time.h rename
Ritor1
parents: 2043
diff changeset
24 #include "Timer.h"
0
Ritor1
parents:
diff changeset
25 #include "PlayerFrameTable.h"
Ritor1
parents:
diff changeset
26 #include "Awards.h"
189
038a4d09406f new texts file, fix text rendender error
Gloval
parents: 180
diff changeset
27 #include "texts.h"
1299
8c2f689b5f0b folder UI
Ritor1
parents: 1295
diff changeset
28 #include "UI\UIHouses.h"
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
29 #include "Lights.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
30 #include "Level/Decoration.h"
2336
d6887ee81068 header file include cleanup
Grumpy7
parents: 2334
diff changeset
31 #include "mm7_data.h"
2374
802460e60eee add UIArena.cpp and UIArena.h and other
Ritor1
parents: 2373
diff changeset
32 #include "UI\UIArena.h"
0
Ritor1
parents:
diff changeset
33
Ritor1
parents:
diff changeset
34 //----- (0046CC4B) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
35 void check_event_triggers()
0
Ritor1
parents:
diff changeset
36 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
37 for (size_t i = 0; i < num_event_triggers; i++)
0
Ritor1
parents:
diff changeset
38 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
39 if (pLevelDecorations[event_triggers[i]].uFlags & LEVEL_DECORATION_TRIGGERED_BY_TOUCH
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
40 && pLevelDecorations[event_triggers[i]].vPosition.GetDistanceTo(pParty->vPosition) < pLevelDecorations[event_triggers[i]].uTriggerRange)
0
Ritor1
parents:
diff changeset
41 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
42 EventProcessor(pLevelDecorations[event_triggers[i]].uEventID, PID(OBJECT_Decoration,i), 1);
0
Ritor1
parents:
diff changeset
43 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
44 else if (pLevelDecorations[event_triggers[i]].uFlags & LEVEL_DECORATION_TRIGGERED_BY_MONSTER)
0
Ritor1
parents:
diff changeset
45 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
46 for (size_t j = 0; j < uNumActors; j++)
0
Ritor1
parents:
diff changeset
47 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
48 if (pLevelDecorations[event_triggers[i]].vPosition.GetDistanceTo(pActors[j].vPosition) < pLevelDecorations[event_triggers[i]].uTriggerRange)
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
49 EventProcessor(pLevelDecorations[event_triggers[i]].uEventID, 0, 1);
0
Ritor1
parents:
diff changeset
50 }
Ritor1
parents:
diff changeset
51 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
52 else if (pLevelDecorations[event_triggers[i]].uFlags & LEVEL_DECORATION_TRIGGERED_BY_OBJECT)
0
Ritor1
parents:
diff changeset
53 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
54 for (size_t j = 0; j < uNumSpriteObjects; j++)
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
55 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
56 if (pLevelDecorations[event_triggers[i]].vPosition.GetDistanceTo(pSpriteObjects[j].vPosition) < pLevelDecorations[event_triggers[i]].uTriggerRange)
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
57 EventProcessor(pLevelDecorations[event_triggers[i]].uEventID, 0, 1);
0
Ritor1
parents:
diff changeset
58 }
Ritor1
parents:
diff changeset
59 }
Ritor1
parents:
diff changeset
60 }
Ritor1
parents:
diff changeset
61 }
Ritor1
parents:
diff changeset
62 // 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
Ritor1
parents:
diff changeset
63
Ritor1
parents:
diff changeset
64 //----- (0046DEF2) --------------------------------------------------------
Ritor1
parents:
diff changeset
65 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID)
Ritor1
parents:
diff changeset
66 {
Ritor1
parents:
diff changeset
67 unsigned int result; // eax@1
Ritor1
parents:
diff changeset
68
Ritor1
parents:
diff changeset
69 result = uLayingItemID;
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
70 if ( pObjectList->pObjects[pSpriteObjects[uLayingItemID].uObjectDescID].uFlags & 0x10 )
0
Ritor1
parents:
diff changeset
71 result = _46BFFA_check_object_intercept(uLayingItemID, a2);
Ritor1
parents:
diff changeset
72 return result;
Ritor1
parents:
diff changeset
73 }
Ritor1
parents:
diff changeset
74
Ritor1
parents:
diff changeset
75 //----- (0046E0B2) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
76 void _46E0B2_collide_against_decorations()
0
Ritor1
parents:
diff changeset
77 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
78 BLVSector *sector; // ebp@1
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
79 LevelDecoration *decor; // edi@2
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
80 DecorationDesc *decor_desc; // esi@3
0
Ritor1
parents:
diff changeset
81 int v8; // ebx@10
Ritor1
parents:
diff changeset
82 int v9; // esi@11
Ritor1
parents:
diff changeset
83 int v11; // eax@12
Ritor1
parents:
diff changeset
84 int v12; // esi@14
Ritor1
parents:
diff changeset
85 unsigned int v13; // eax@17
Ritor1
parents:
diff changeset
86 signed int i; // [sp+4h] [bp-14h]@1
Ritor1
parents:
diff changeset
87 int v15; // [sp+8h] [bp-10h]@10
Ritor1
parents:
diff changeset
88 int v16; // [sp+Ch] [bp-Ch]@10
Ritor1
parents:
diff changeset
89 int v17; // [sp+10h] [bp-8h]@10
Ritor1
parents:
diff changeset
90
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
91 sector = &pIndoor->pSectors[stru_721530.uSectorID];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
92 for ( i = 0; i < sector->uNumDecorations; ++i )
0
Ritor1
parents:
diff changeset
93 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
94 decor = &pLevelDecorations[sector->pDecorationIDs[i]];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
95 if (!(decor->uFlags & LEVEL_DECORATION_INVISIBLE))
0
Ritor1
parents:
diff changeset
96 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
97 decor_desc = &pDecorationList->pDecorations[decor->uDecorationDescID];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
98 if (!decor_desc->CanMoveThrough())
0
Ritor1
parents:
diff changeset
99 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
100 if ( stru_721530.sMaxX <= decor->vPosition.x + decor_desc->uRadius && stru_721530.sMinX >= decor->vPosition.x - decor_desc->uRadius
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
101 && stru_721530.sMaxY <= decor->vPosition.y + decor_desc->uRadius && stru_721530.sMinY >= decor->vPosition.y - decor_desc->uRadius
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
102 && stru_721530.sMaxZ <= decor->vPosition.z + decor_desc->uDecorationHeight && stru_721530.sMinZ >= decor->vPosition.z )
0
Ritor1
parents:
diff changeset
103 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
104 v16 = decor->vPosition.x - stru_721530.normal.x;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
105 v15 = decor->vPosition.y - stru_721530.normal.y;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
106 v8 = stru_721530.prolly_normal_d + decor_desc->uRadius;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
107 v17 = ((decor->vPosition.x - stru_721530.normal.x) * stru_721530.direction.y
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
108 - (decor->vPosition.y - stru_721530.normal.y) * stru_721530.direction.x) >> 16;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
109 if ( abs(v17) <= stru_721530.prolly_normal_d + decor_desc->uRadius )
0
Ritor1
parents:
diff changeset
110 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
111 v9 = (v16 * stru_721530.direction.x + v15 * stru_721530.direction.y) >> 16;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
112 if ( v9 > 0 )
0
Ritor1
parents:
diff changeset
113 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
114 v11 = stru_721530.normal.z + fixpoint_mul(stru_721530.direction.z, v9);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
115 if ( v11 >= decor->vPosition.z )
0
Ritor1
parents:
diff changeset
116 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
117 if ( v11 <= decor_desc->uDecorationHeight + decor->vPosition.z )
0
Ritor1
parents:
diff changeset
118 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
119 v12 = v9 - integer_sqrt(v8 * v8 - v17 * v17);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
120 if ( v12 < 0 )
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
121 v12 = 0;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
122 if ( v12 < stru_721530.field_7C )
0
Ritor1
parents:
diff changeset
123 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
124 stru_721530.field_7C = v12;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
125 v13 = 8 * sector->pDecorationIDs[i];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
126 LOBYTE(v13) = v13 | 5;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
127 stru_721530.uFaceID = v13;
0
Ritor1
parents:
diff changeset
128 }
Ritor1
parents:
diff changeset
129 }
Ritor1
parents:
diff changeset
130 }
Ritor1
parents:
diff changeset
131 }
Ritor1
parents:
diff changeset
132 }
Ritor1
parents:
diff changeset
133 }
Ritor1
parents:
diff changeset
134 }
Ritor1
parents:
diff changeset
135 }
Ritor1
parents:
diff changeset
136 }
Ritor1
parents:
diff changeset
137 }
Ritor1
parents:
diff changeset
138
Ritor1
parents:
diff changeset
139 //----- (00487DA9) --------------------------------------------------------
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
140 void sub_487DA9()
0
Ritor1
parents:
diff changeset
141 {
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
142 for (int i = 0; i < 20000; ++i)
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
143 array_77EC08[i].field_108 = 0;
0
Ritor1
parents:
diff changeset
144 }
Ritor1
parents:
diff changeset
145
Ritor1
parents:
diff changeset
146 //----- (00491E3A) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
147 void sub_491E3A()
0
Ritor1
parents:
diff changeset
148 {
Ritor1
parents:
diff changeset
149 signed int v1; // esi@3
Ritor1
parents:
diff changeset
150 unsigned int v3; // eax@7
Ritor1
parents:
diff changeset
151 unsigned int v4; // edx@8
Ritor1
parents:
diff changeset
152 int v6; // edi@17
Ritor1
parents:
diff changeset
153 int v12; // eax@26
Ritor1
parents:
diff changeset
154
2163
9aa0a5d90454 fall_speed
Ritor1
parents: 2155
diff changeset
155 //__debugbreak();//Ritor1
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
156 for ( uint pl = 0; pl < 4; pl++ )
0
Ritor1
parents:
diff changeset
157 {
203
0c64754c7fd4 Voices work (at least in party creation screen)
Nomad
parents: 198
diff changeset
158 if (SoundSetAction[24][0])
0
Ritor1
parents:
diff changeset
159 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
160 v3 = 0;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
161 for ( v1 = 0; v1 < (signed int)pSoundList->sNumSounds; ++v1 )
0
Ritor1
parents:
diff changeset
162 {
2163
9aa0a5d90454 fall_speed
Ritor1
parents: 2155
diff changeset
163 int ps = 2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[pl].uVoiceID) + 4998;//6728
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
164 if ( pSoundList->pSL_Sounds[v1].uSoundID == 2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[pl].uVoiceID) + 4998 )
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
165 v3 = v1;
0
Ritor1
parents:
diff changeset
166 }
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
167 pSoundList->UnloadSound(v3, 1);
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
168 for ( v4 = 0; (signed int)v4 < (signed int)pSoundList->sNumSounds; ++v4 )
0
Ritor1
parents:
diff changeset
169 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
170 if ( pSoundList->pSL_Sounds[v4].uSoundID == 2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[pl].uVoiceID) + 4999 )
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
171 pSoundList->UnloadSound(v4, 1);
0
Ritor1
parents:
diff changeset
172 }
Ritor1
parents:
diff changeset
173 }
Ritor1
parents:
diff changeset
174 }
Ritor1
parents:
diff changeset
175 v6 = pIcons_LOD->uNumLoadedFiles - 1;
33
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
176 if ( v6 >= pIcons_LOD->pFacesLock )
0
Ritor1
parents:
diff changeset
177 {
Ritor1
parents:
diff changeset
178 do
Ritor1
parents:
diff changeset
179 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
180 pIcons_LOD->pTextures[v6].Release();
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
181 if ( pIcons_LOD->pHardwareTextures )
0
Ritor1
parents:
diff changeset
182 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
183 if ( pIcons_LOD->pHardwareTextures[v6] )
0
Ritor1
parents:
diff changeset
184 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
185 pIcons_LOD->pHardwareTextures[v6]->Release();
0
Ritor1
parents:
diff changeset
186 pIcons_LOD->pHardwareTextures[v6] = 0;
Ritor1
parents:
diff changeset
187 }
Ritor1
parents:
diff changeset
188 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
189 if ( pIcons_LOD->pHardwareSurfaces )
0
Ritor1
parents:
diff changeset
190 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
191 if ( pIcons_LOD->pHardwareSurfaces[v6] )
0
Ritor1
parents:
diff changeset
192 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
193 pIcons_LOD->pHardwareSurfaces[v6]->Release();
0
Ritor1
parents:
diff changeset
194 pIcons_LOD->pHardwareSurfaces[v6] = 0;
Ritor1
parents:
diff changeset
195 }
Ritor1
parents:
diff changeset
196 }
Ritor1
parents:
diff changeset
197 --v6;
Ritor1
parents:
diff changeset
198 }
33
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
199 while ( v6 >= pIcons_LOD->pFacesLock );
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
200 }
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
201 v12 = pIcons_LOD->pFacesLock;
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
202 pIcons_LOD->pFacesLock = 0;
0
Ritor1
parents:
diff changeset
203 pIcons_LOD->uNumLoadedFiles = v12;
Ritor1
parents:
diff changeset
204 }
Ritor1
parents:
diff changeset
205 // 4ED498: using guessed type char byte_4ED498;
Ritor1
parents:
diff changeset
206
Ritor1
parents:
diff changeset
207 //----- (00493938) --------------------------------------------------------
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
208 void _493938_regenerate()
0
Ritor1
parents:
diff changeset
209 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
210 int current_time; // edi@1
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
211 int last_reg_time; // qax@1
0
Ritor1
parents:
diff changeset
212 int v4; // eax@2
Ritor1
parents:
diff changeset
213 int v5; // edi@5
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
214 bool cursed_flag; // ecx@5
0
Ritor1
parents:
diff changeset
215 char v7; // sf@5
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
216 int *v8; // ecx@10
0
Ritor1
parents:
diff changeset
217 int v9; // edi@15
Ritor1
parents:
diff changeset
218 signed int v10; // eax@15
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
219 // __int16 *v11; // edx@16
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
220 // int v12; // eax@20
2255
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
221 int numberOfActorsAffected; // ebx@20
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
222 unsigned int v14; // esi@21
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
223 //unsigned int v15; // ecx@21
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
224 //unsigned int v16; // eax@21
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
225 // int v18; // eax@21
0
Ritor1
parents:
diff changeset
226 signed int v19; // eax@21
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
227 bool recovery_HP; // ebx@25
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
228 // ITEM_EQUIP_TYPE v22; // edi@30
0
Ritor1
parents:
diff changeset
229 signed int v25; // eax@33
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
230 // int v26; // eax@35
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
231 // int v27; // eax@36
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
232 // int v28; // eax@37
0
Ritor1
parents:
diff changeset
233 signed int v31; // ecx@53
2255
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
234 int actorsAffectedByImmolation[100]; // [sp+4h] [bp-22Ch]@20
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
235 SpriteObject a1; // [sp+194h] [bp-9Ch]@15
0
Ritor1
parents:
diff changeset
236 Vec3_int_ a3; // [sp+204h] [bp-2Ch]@15
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
237 bool has_dragon_flag; // [sp+210h] [bp-20h]@22
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
238 bool lich_jar_flag; // [sp+214h] [bp-1Ch]@25
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
239 bool zombie_flag; // [sp+218h] [bp-18h]@25
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
240 bool decrease_HP; // [sp+21Ch] [bp-14h]@25
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
241 bool lich_flag; // [sp+220h] [bp-10h]@25
0
Ritor1
parents:
diff changeset
242 int v49; // [sp+224h] [bp-Ch]@24
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
243 bool recovery_SP; // [sp+228h] [bp-8h]@25
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
244 bool redraw_flag; // [sp+22Ch] [bp-4h]@2
0
Ritor1
parents:
diff changeset
245
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
246 current_time = (signed int)(signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
247 last_reg_time = (signed int)(signed __int64)((double)pParty->uLastRegenerationTime * 0.234375) / 60;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
248 if ( current_time >= (signed int)last_reg_time + 5 )
0
Ritor1
parents:
diff changeset
249 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
250 redraw_flag = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
251 v4 = (current_time - last_reg_time) / 5;
0
Ritor1
parents:
diff changeset
252 if (pParty->FlyActive())
Ritor1
parents:
diff changeset
253 {
Ritor1
parents:
diff changeset
254 if ( pParty->bFlying )
Ritor1
parents:
diff changeset
255 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
256 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
257 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
258 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
259 cursed_flag = pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster - 1].pConditions[Condition_Cursed];//cursed
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
260 v7 = cursed_flag < v5;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
261 //cursed_flag -= v5;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
262 if ( !v7 )
0
Ritor1
parents:
diff changeset
263 {
Ritor1
parents:
diff changeset
264 pParty->uFlags &= 0xFFFFFFBFu;
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
265 pParty->bFlying = false;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
266 redraw_flag = true;
0
Ritor1
parents:
diff changeset
267 }
Ritor1
parents:
diff changeset
268 }
Ritor1
parents:
diff changeset
269 }
Ritor1
parents:
diff changeset
270 }
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
271
0
Ritor1
parents:
diff changeset
272 if (pParty->WaterWalkActive())
Ritor1
parents:
diff changeset
273 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
274 if (pParty->uFlags & PARTY_FLAGS_1_STANDING_ON_WATER )
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
275 {
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
276 if ( !(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) )
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
277 { // taking on water
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
278 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster - 1].pConditions[Condition_Cursed];//&AA1058_PartyQuickSpellSound[4].pSounds[6972 * pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster + 2000];
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
279 v7 = *v8 < v4;
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
280 *v8 -= v4;
0
Ritor1
parents:
diff changeset
281 if ( v7 )
Ritor1
parents:
diff changeset
282 {
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
283 *v8 = 0;
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
284 pParty->uFlags &= ~PARTY_FLAGS_1_STANDING_ON_WATER;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
285 redraw_flag = true;
0
Ritor1
parents:
diff changeset
286 }
Ritor1
parents:
diff changeset
287 }
Ritor1
parents:
diff changeset
288 }
Ritor1
parents:
diff changeset
289 }
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
290
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
291 if (pParty->ImmolationActive())//
0
Ritor1
parents:
diff changeset
292 {
Ritor1
parents:
diff changeset
293 a3.z = 0;
Ritor1
parents:
diff changeset
294 a3.y = 0;
Ritor1
parents:
diff changeset
295 a3.x = 0;
Ritor1
parents:
diff changeset
296 a1.stru_24.Reset();
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
297 a1.spell_level = pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uPower;
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
298 a1.spell_skill = pParty->ImmolationSkillLevel();
0
Ritor1
parents:
diff changeset
299 v10 = 0;
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
300 a1.uType = 1070;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
301 a1.spell_id = SPELL_FIRE_IMMOLATION;
2257
8878fba164fd simplifying a loop in immolation effect
Grumpy7
parents: 2256
diff changeset
302 v10 = 0;
8878fba164fd simplifying a loop in immolation effect
Grumpy7
parents: 2256
diff changeset
303 for (uint i = 0; i > pObjectList->uNumObjects; i++)
0
Ritor1
parents:
diff changeset
304 {
2257
8878fba164fd simplifying a loop in immolation effect
Grumpy7
parents: 2256
diff changeset
305 if (pObjectList->pObjects[i].uObjectID == stru_4E3ACC[8].uType)
8878fba164fd simplifying a loop in immolation effect
Grumpy7
parents: 2256
diff changeset
306 v10 = i;
0
Ritor1
parents:
diff changeset
307 }
Ritor1
parents:
diff changeset
308 a1.uObjectDescID = v10;
Ritor1
parents:
diff changeset
309 a1.field_60_distance_related_prolly_lod = 0;
Ritor1
parents:
diff changeset
310 a1.uAttributes = 0;
Ritor1
parents:
diff changeset
311 a1.uSectorID = 0;
Ritor1
parents:
diff changeset
312 a1.uSpriteFrameID = 0;
2255
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
313 a1.spell_caster_pid = PID(OBJECT_Player, pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uCaster);
0
Ritor1
parents:
diff changeset
314 a1.uFacing = 0;
Ritor1
parents:
diff changeset
315 a1.uSoundID = 0;
2256
27f2a2c2fd8f _46A89E_immolation_effect moved into Party
Grumpy7
parents: 2255
diff changeset
316 numberOfActorsAffected = pParty->_46A89E_immolation_effect(actorsAffectedByImmolation, 100, 307);
2255
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
317 for ( v9 = 0; v9 < numberOfActorsAffected; ++v9 )
0
Ritor1
parents:
diff changeset
318 {
2255
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
319 v14 = actorsAffectedByImmolation[v9];
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
320 a1.vPosition.x = pActors[v14].vPosition.x;
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
321 a1.vPosition.y = pActors[v14].vPosition.y;
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
322 a1.vPosition.z = pActors[v14].vPosition.z;
4c9fef516e0a immolation cleaned up a bit
Grumpy7
parents: 2253
diff changeset
323 a1.spell_target_pid = PID(OBJECT_Actor,v14);
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
324 v19 = a1.Create(0, 0, 0, 0);
2338
1e865e8690ba Moving some function declarations from unsorted subs to Actor.h and SpriteObject.h
Grumpy7
parents: 2336
diff changeset
325 Actor::DamageMonsterFromParty(PID(OBJECT_Item,v19), v14, &a3);
0
Ritor1
parents:
diff changeset
326 }
Ritor1
parents:
diff changeset
327 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
328
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
329 has_dragon_flag = false;
248
37dcbe8f3cca Dialogue stuff
Nomad
parents: 232
diff changeset
330 if (PartyHasDragon())
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
331 has_dragon_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
332
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
333 for ( v49 = 0; v49 < 4; v49++ )
0
Ritor1
parents:
diff changeset
334 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
335 recovery_HP = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
336 recovery_SP = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
337 decrease_HP = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
338 lich_flag = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
339 lich_jar_flag = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
340 zombie_flag = false;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
341
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
342 for ( int v22 = 0; (signed int)v22 < 16; v22++ )
0
Ritor1
parents:
diff changeset
343 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
344 if ( pParty->pPlayers[v49].HasItemEquipped((ITEM_EQUIP_TYPE)v22) )
0
Ritor1
parents:
diff changeset
345 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
346 uint _idx = pParty->pPlayers[v49].pEquipment.pIndices[v22];
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
347 if ( pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uItemID > 134 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
348 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
349 if ( pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uItemID == ITEM_RELIC_ETHRICS_STAFF )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
350 decrease_HP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
351 if ( pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uItemID == ITEM_ARTIFACT_HERMES_SANDALS )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
352 {
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
353 recovery_HP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
354 recovery_SP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
355 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
356 if ( pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uItemID == ITEM_ARTIFACT_MINDS_EYE )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
357 recovery_SP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
358 if ( pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uItemID == ITEM_ARTIFACT_HEROS_BELT )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
359 recovery_HP = true;
0
Ritor1
parents:
diff changeset
360 }
Ritor1
parents:
diff changeset
361 else
Ritor1
parents:
diff changeset
362 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
363 v25 = pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uSpecEnchantmentType;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
364 if ( v25 == 37 //of Regeneration("Regenerate 1hp/x while walking, etc")
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
365 || v25 == 44 //of Life("HP (+10), Regen hpts")
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
366 || v25 == 50 //of The Phoenix("Fire Res (+30), Regen hpts") &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
367 || v25 == 54 )// of The Troll("End (+15), Regen hpts")
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
368 recovery_HP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
369 if ( v25 == 38 //of Mana("Regenerate 1sp/x while walking, etc")
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
370 || v25 == 47 //of The Eclipse("SP (+10), Regen spts")
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
371 || v25 == 55 )//of The Unicorn("Luck (+15), Regen spts")
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
372 recovery_SP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
373 if ( v25 == 66 )// of Plenty("Regenerate 1 hp/x and 1 sp/x while walking, etc.")
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
374 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
375 recovery_HP = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
376 recovery_SP = true;
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
377 }
0
Ritor1
parents:
diff changeset
378 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
379
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
380 if (recovery_HP &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
381 !pParty->pPlayers[v49].pConditions[Condition_Dead] &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
382 !pParty->pPlayers[v49].pConditions[Condition_Eradicated])
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
383 {
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
384 if ( pParty->pPlayers[v49].sHealth < pParty->pPlayers[v49].GetMaxHealth() )
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
385 ++pParty->pPlayers[v49].sHealth;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
386 if ( pParty->pPlayers[v49].pConditions[Condition_Unconcious] && pParty->pPlayers[v49].sHealth > 0 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
387 pParty->pPlayers[v49].pConditions[Condition_Unconcious] = 0;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
388 redraw_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
389 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
390
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
391 if (recovery_SP &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
392 !pParty->pPlayers[v49].pConditions[Condition_Dead] &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
393 !pParty->pPlayers[v49].pConditions[Condition_Eradicated])
0
Ritor1
parents:
diff changeset
394 {
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
395 if ( pParty->pPlayers[v49].sMana < pParty->pPlayers[v49].GetMaxMana() )
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
396 ++pParty->pPlayers[v49].sMana;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
397 redraw_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
398 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
399
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
400 if (decrease_HP &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
401 !pParty->pPlayers[v49].pConditions[Condition_Dead] &&
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
402 !pParty->pPlayers[v49].pConditions[Condition_Eradicated] )
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
403 {
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
404 --pParty->pPlayers[v49].sHealth;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
405 if ( !(pParty->pPlayers[v49].pConditions[Condition_Unconcious]) && pParty->pPlayers[v49].sHealth < 0 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
406 pParty->pPlayers[v49].pConditions[Condition_Unconcious] = pParty->uTimePlayed;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
407 if ( pParty->pPlayers[v49].sHealth < 1 )
0
Ritor1
parents:
diff changeset
408 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
409 if ( pParty->pPlayers[v49].sHealth + pParty->pPlayers[v49].uEndurance + pParty->pPlayers[v49].GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) >= 1
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
410 || (signed __int64)pParty->pPlayers[v49].pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
411 pParty->pPlayers[v49].pConditions[Condition_Unconcious] = pParty->uTimePlayed;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
412 else
0
Ritor1
parents:
diff changeset
413 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
414 if ( !pParty->pPlayers[v49].pConditions[Condition_Dead] )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
415 pParty->pPlayers[v49].pConditions[Condition_Dead] = pParty->uTimePlayed;
0
Ritor1
parents:
diff changeset
416 }
Ritor1
parents:
diff changeset
417 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
418 redraw_flag = true;
0
Ritor1
parents:
diff changeset
419 }
Ritor1
parents:
diff changeset
420 }
Ritor1
parents:
diff changeset
421 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
422
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
423 //regeneration
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
424 if ( pParty->pPlayers[v49].pPlayerBuffs[PLAYER_BUFF_REGENERATION].uExpireTime > 0
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
425 && !pParty->pPlayers[v49].pConditions[Condition_Dead]
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
426 && !pParty->pPlayers[v49].pConditions[Condition_Eradicated] )
0
Ritor1
parents:
diff changeset
427 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
428 pParty->pPlayers[v49].sHealth += 5 * pParty->pPlayers[v49].pPlayerBuffs[PLAYER_BUFF_REGENERATION].uPower;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
429 if ( pParty->pPlayers[v49].sHealth > pParty->pPlayers[v49].GetMaxHealth() )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
430 pParty->pPlayers[v49].sHealth = pParty->pPlayers[v49].GetMaxHealth();
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
431 if ( pParty->pPlayers[v49].pConditions[Condition_Unconcious] && pParty->pPlayers[v49].sHealth > 0 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
432 pParty->pPlayers[v49].pConditions[Condition_Unconcious] = 0;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
433 redraw_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
434 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
435
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
436 //for warlock
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
437 if ( has_dragon_flag && pParty->pPlayers[v49].classType == PLAYER_CLASS_WARLOCK )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
438 {
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
439 if ( pParty->pPlayers[v49].sMana < pParty->pPlayers[v49].GetMaxMana() )
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
440 ++pParty->pPlayers[v49].sMana;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
441 redraw_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
442 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
443
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
444 //for lich
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
445 if ( pParty->pPlayers[v49].classType == PLAYER_CLASS_LICH )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
446 {
2085
52abdea20b9e Door_switch_animation
Ritor1
parents: 2065
diff changeset
447 for ( v31 = 0; v31 < 126; ++v31 )
0
Ritor1
parents:
diff changeset
448 {
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
449 if ( pParty->pPlayers[v49].pInventoryItemList[v31].uItemID == ITEM_LICH_JAR_FULL )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
450 lich_jar_flag = true;
0
Ritor1
parents:
diff changeset
451 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
452 lich_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
453 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
454 if ( lich_flag && !pParty->pPlayers[v49].pConditions[Condition_Dead]
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
455 && !pParty->pPlayers[v49].pConditions[Condition_Eradicated] )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
456 {
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
457 if ( pParty->pPlayers[v49].sHealth > pParty->pPlayers[v49].GetMaxHealth() / 2 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
458 pParty->pPlayers[v49].sHealth = pParty->pPlayers[v49].sHealth - 2;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
459 if ( pParty->pPlayers[v49].sMana > pParty->pPlayers[v49].GetMaxMana() / 2 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
460 pParty->pPlayers[v49].sMana = pParty->pPlayers[v49].sMana - 2;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
461 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
462 if ( lich_jar_flag )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
463 {
2155
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
464 if ( pParty->pPlayers[v49].sMana < pParty->pPlayers[v49].GetMaxMana() )
0a1438c16c2b Render decoupling.
Nomad
parents: 2154
diff changeset
465 ++pParty->pPlayers[v49].sMana;
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
466 }
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
467
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
468 //for zombie
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
469 if ( pParty->pPlayers[v49].pConditions[Condition_Zombie] )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
470 zombie_flag = true;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
471 if ( zombie_flag && !pParty->pPlayers[v49].pConditions[Condition_Dead]
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
472 && !pParty->pPlayers[v49].pConditions[Condition_Eradicated] )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
473 {
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
474 if ( pParty->pPlayers[v49].sHealth > pParty->pPlayers[v49].GetMaxHealth() / 2 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
475 pParty->pPlayers[v49].sHealth = pParty->pPlayers[v49].sHealth - 1;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
476 if ( pParty->pPlayers[v49].sMana > 0 )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
477 pParty->pPlayers[v49].sMana = pParty->pPlayers[v49].sMana - 1;
0
Ritor1
parents:
diff changeset
478 }
Ritor1
parents:
diff changeset
479 }
2060
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
480 pParty->uLastRegenerationTime = pParty->uTimePlayed;
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
481 if ( !viewparams->bRedrawGameUI )
72177f3603da _493938_regenerate()
Ritor1
parents: 2059
diff changeset
482 viewparams->bRedrawGameUI = redraw_flag;
0
Ritor1
parents:
diff changeset
483 }
Ritor1
parents:
diff changeset
484 }
Ritor1
parents:
diff changeset
485
Ritor1
parents:
diff changeset
486 //----- (00493F79) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
487 void init_summoned_item(stru351_summoned_item *_this, __int64 duration)
0
Ritor1
parents:
diff changeset
488 {
Ritor1
parents:
diff changeset
489 signed __int64 v2; // ST2C_8@1
Ritor1
parents:
diff changeset
490 signed __int64 v3; // qax@1
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
491 //signed __int64 v4; // ST1C_8@1
0
Ritor1
parents:
diff changeset
492 unsigned __int64 v5; // qax@1
Ritor1
parents:
diff changeset
493 unsigned int v6; // ebx@1
Ritor1
parents:
diff changeset
494
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
495 v2 = (signed __int64)((double)duration * 0.234375);
0
Ritor1
parents:
diff changeset
496 v3 = v2 / 60 / 60;
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
497 //v4 = v3;
0
Ritor1
parents:
diff changeset
498 v5 = (unsigned int)v3 / 0x18;
Ritor1
parents:
diff changeset
499 v6 = (unsigned int)(v5 / 7) >> 2;
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
500 _this->field_0_expire_second = v2 % 60;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
501 _this->field_4_expire_minute = v2 / 60 % 60;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
502 _this->field_8_expire_hour = v3 % 24;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
503 _this->field_10_expire_week = v5 / 7 & 3;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
504 _this->field_C_expire_day = (unsigned int)v5 % 0x1C;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
505 _this->field_14_exprie_month = v6 % 0xC;
352
ec6cc5cefa4b Game starting age (1168) moved to a variable
Nomad
parents: 351
diff changeset
506 _this->field_18_expire_year = v6 / 0xC + game_starting_year;
0
Ritor1
parents:
diff changeset
507 }
Ritor1
parents:
diff changeset
508
Ritor1
parents:
diff changeset
509 //----- (00494035) --------------------------------------------------------
1031
f93d17337113 UI stuff.
Nomad
parents: 1029
diff changeset
510 void _494035_timed_effects__water_walking_damage__etc()
0
Ritor1
parents:
diff changeset
511 {
Ritor1
parents:
diff changeset
512 signed __int64 v0; // qax@1
Ritor1
parents:
diff changeset
513 unsigned int v4; // edi@1
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
514 // signed int v12; // edi@29
0
Ritor1
parents:
diff changeset
515 int v24; // ecx@60
Ritor1
parents:
diff changeset
516 int v26; // ecx@64
Ritor1
parents:
diff changeset
517 int v28; // ecx@68
Ritor1
parents:
diff changeset
518 int v30; // ecx@72
Ritor1
parents:
diff changeset
519 int v32; // ecx@76
Ritor1
parents:
diff changeset
520 int v34; // ecx@80
Ritor1
parents:
diff changeset
521 int v36; // ecx@84
Ritor1
parents:
diff changeset
522 int v38; // ecx@88
Ritor1
parents:
diff changeset
523 int v40; // ecx@92
Ritor1
parents:
diff changeset
524 int v42; // ecx@96
Ritor1
parents:
diff changeset
525 bool v43; // ebx@102
Ritor1
parents:
diff changeset
526 bool v46; // edi@111
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
527 // unsigned int v56; // [sp-8h] [bp-38h]@55
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
528 // int v59; // [sp-4h] [bp-34h]@55
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
529 // unsigned int v61; // [sp+14h] [bp-1Ch]@1
0
Ritor1
parents:
diff changeset
530 signed int a2a; // [sp+18h] [bp-18h]@47
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
531 signed int old_day; // [sp+1Ch] [bp-14h]@47
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
532 signed int old_hour;
0
Ritor1
parents:
diff changeset
533
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
534 old_day = pParty->uDaysPlayed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
535 old_hour = pParty->uCurrentHour;
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
536 //auto prev_time = pEventTimer->uTimeElapsed;
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
537 pParty->uTimePlayed += pEventTimer->uTimeElapsed;
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
538 v0 = ((signed __int64)(pParty->uTimePlayed * 0.234375) / 60)/60i64;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
539 v4 = (unsigned int)(((unsigned int)v0 / 24) / 7) >> 2;
0
Ritor1
parents:
diff changeset
540 pParty->uCurrentTimeSecond = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) % 60;
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
541 pParty->uCurrentMinute = ((signed __int64)(pParty->uTimePlayed * 0.234375) / 60) % 60;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
542 pParty->uCurrentHour = v0 % 24;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
543 pParty->uCurrentMonthWeek = ((unsigned int)v0 / 24) / 7 & 3;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
544 pParty->uDaysPlayed = (unsigned int)((unsigned int)v0 / 24) % 28;
0
Ritor1
parents:
diff changeset
545 pParty->uCurrentMonth = v4 % 12;
352
ec6cc5cefa4b Game starting age (1168) moved to a variable
Nomad
parents: 351
diff changeset
546 pParty->uCurrentYear = v4 / 0xC + game_starting_year;
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
547 if ( pParty->uCurrentHour >= 3 && (old_hour < 3 || pParty->uDaysPlayed > old_day) ) // new day dawns
0
Ritor1
parents:
diff changeset
548 {
Ritor1
parents:
diff changeset
549 pParty->pHirelings[0].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
550 pParty->pHirelings[1].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
551
Ritor1
parents:
diff changeset
552 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
Ritor1
parents:
diff changeset
553 pNPCStats->pNewNPCData[i].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
554
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
555 ++pParty->days_played_without_rest;
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
556 if (pParty->days_played_without_rest > 1)
0
Ritor1
parents:
diff changeset
557 {
Ritor1
parents:
diff changeset
558 for (uint i = 0; i < 4; ++i)
1361
b3ac17fd12de Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents: 1358
diff changeset
559 pParty->pPlayers[i].SetCondWeakWithBlockCheck(0);
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
560
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
561 if (pParty->uNumFoodRations)
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
562 Party::TakeFood(1);
0
Ritor1
parents:
diff changeset
563 else
Ritor1
parents:
diff changeset
564 for (uint i = 0; i < 4; ++i)
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
565 pParty->pPlayers[i].sHealth = pParty->pPlayers[i].sHealth / (pParty->days_played_without_rest + 1) + 1;
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
566
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
567 if (pParty->days_played_without_rest > 3)
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
568 for ( uint i = 0; i < 4; ++i )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
569 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
570 pParty->pPlayers[i].Zero();
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
571 if (!pParty->pPlayers[i].IsPertified() && !pParty->pPlayers[i].IsEradicated()
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
572 && !pParty->pPlayers[i].IsDead())
0
Ritor1
parents:
diff changeset
573 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
574 if (rand() % 100 < 5 * pParty->days_played_without_rest)
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
575 pParty->pPlayers[i].SetCondDeadWithBlockCheck(0);
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
576 if (rand() % 100 < 10 * pParty->days_played_without_rest)
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
577 pParty->pPlayers[i].SetCondInsaneWithBlockCheck(0);
0
Ritor1
parents:
diff changeset
578 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
579 }
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
580 }
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
581 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
0
Ritor1
parents:
diff changeset
582 pOutdoor->SetFog();
Ritor1
parents:
diff changeset
583
Ritor1
parents:
diff changeset
584 for (uint i = 0; i < 4; ++i)
Ritor1
parents:
diff changeset
585 pParty->pPlayers[i].uNumDivineInterventionCastsThisDay = 0;
Ritor1
parents:
diff changeset
586 }
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
587
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
588 if ( pParty->uFlags & 4 && pParty->field_6FC < (signed __int64)pParty->uTimePlayed )//water damage
0
Ritor1
parents:
diff changeset
589 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
590 pParty->field_6FC = (signed __int64)pParty->uTimePlayed + 128;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
591 viewparams->bRedrawGameUI = true;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
592 for ( uint pl = 1; pl <= 4; ++pl )
0
Ritor1
parents:
diff changeset
593 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
594 if ( pPlayers[pl]->WearsItem(ITEM_RELIC_HARECS_LEATHER, EQUIP_ARMOUR)
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
595 || pPlayers[pl]->HasEnchantedItemEquipped(71)
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
596 || pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_WATER_WALK].uExpireTime > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
597 pPlayers[pl]->PlayEmotion(CHARACTER_EXPRESSION_37, 0);
0
Ritor1
parents:
diff changeset
598 else
Ritor1
parents:
diff changeset
599 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
600 if ( !pPlayers[pl]->HasUnderwaterSuitEquipped() )
0
Ritor1
parents:
diff changeset
601 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
602 pPlayers[pl]->ReceiveDamage((signed __int64)pPlayers[pl]->GetMaxHealth() * 0.1, DMGT_FIRE);
0
Ritor1
parents:
diff changeset
603 if ( pParty->uFlags & 4 )
Ritor1
parents:
diff changeset
604 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
605 strcpy(GameUI_Footer_TimedString.data(), pGlobalTXT_LocalizationStrings[660]);// !
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 775
diff changeset
606 GameUI_Footer_TimeLeft = 128;
0
Ritor1
parents:
diff changeset
607 }
Ritor1
parents:
diff changeset
608 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
609 else
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
610 pPlayers[pl]->PlayEmotion(CHARACTER_EXPRESSION_37, 0);
0
Ritor1
parents:
diff changeset
611 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
612 }
0
Ritor1
parents:
diff changeset
613 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
614 if ( pParty->uFlags & 0x200 && pParty->field_6FC < (signed __int64)pParty->uTimePlayed ) //lava damage
0
Ritor1
parents:
diff changeset
615 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
616 viewparams->bRedrawGameUI = true;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
617 pParty->field_6FC = (signed __int64)pParty->uTimePlayed + 128;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
618
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
619 for ( uint pl = 1; pl <= 4; pl++ )
0
Ritor1
parents:
diff changeset
620 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
621 pPlayers[pl]->ReceiveDamage((signed __int64)pPlayers[pl]->GetMaxHealth() * 0.1, DMGT_FIRE);
0
Ritor1
parents:
diff changeset
622 if ( pParty->uFlags & 0x200 )
Ritor1
parents:
diff changeset
623 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
624 strcpy(GameUI_Footer_TimedString.data(), pGlobalTXT_LocalizationStrings[661]); // !
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 775
diff changeset
625 GameUI_Footer_TimeLeft = 128;
0
Ritor1
parents:
diff changeset
626 }
Ritor1
parents:
diff changeset
627 }
Ritor1
parents:
diff changeset
628 }
Ritor1
parents:
diff changeset
629 _493938_regenerate();
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
630 uint party_condition_flag = 4;
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
631 a2a = pEventTimer->uTimeElapsed;
2063
7890930801a8 small fix
Ritor1
parents: 2062
diff changeset
632 if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING )//
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
633 {
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
634 a2a *= 0.5f;
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
635 if (a2a < 1)
0
Ritor1
parents:
diff changeset
636 a2a = 1;
Ritor1
parents:
diff changeset
637 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
638
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
639 for ( uint pl = 1; pl <= 4; pl++ )
0
Ritor1
parents:
diff changeset
640 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
641 if ( pPlayers[pl]->uTimeToRecovery )
2063
7890930801a8 small fix
Ritor1
parents: 2062
diff changeset
642 pPlayers[pl]->Recover(a2a);//
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
643 if ( pPlayers[pl]->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) + pPlayers[pl]->sHealth + pPlayers[pl]->uEndurance >= 1
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
644 || (signed __int64)pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_PRESERVATION].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
645 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
646 if ( pPlayers[pl]->sHealth < 1 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
647 pPlayers[pl]->SetCondition(Condition_Unconcious, 0);
0
Ritor1
parents:
diff changeset
648 }
Ritor1
parents:
diff changeset
649 else
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
650 pPlayers[pl]->SetCondition(Condition_Dead, 0);
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
651 if ( pPlayers[pl]->field_E0 )
0
Ritor1
parents:
diff changeset
652 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
653 v24 = pPlayers[pl]->field_E0 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
654 if ( v24 > 0 )
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
655 pPlayers[pl]->field_E0 = v24;
0
Ritor1
parents:
diff changeset
656 else
Ritor1
parents:
diff changeset
657 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
658 pPlayers[pl]->field_E0 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
659 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
660 }
Ritor1
parents:
diff changeset
661 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
662 if ( pPlayers[pl]->field_E4 )
0
Ritor1
parents:
diff changeset
663 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
664 v26 = pPlayers[pl]->field_E4 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
665 if ( v26 > 0 )
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
666 pPlayers[pl]->field_E4 = v26;
0
Ritor1
parents:
diff changeset
667 else
Ritor1
parents:
diff changeset
668 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
669 pPlayers[pl]->field_E4 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
670 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
671 }
Ritor1
parents:
diff changeset
672 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
673 if ( pPlayers[pl]->field_E8 )
0
Ritor1
parents:
diff changeset
674 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
675 v28 = pPlayers[pl]->field_E8 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
676 if ( v28 > 0 )
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
677 pPlayers[pl]->field_E8 = v28;
0
Ritor1
parents:
diff changeset
678 else
Ritor1
parents:
diff changeset
679 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
680 pPlayers[pl]->field_E8 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
681 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
682 }
Ritor1
parents:
diff changeset
683 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
684 if ( pPlayers[pl]->field_EC )
0
Ritor1
parents:
diff changeset
685 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
686 v30 = pPlayers[pl]->field_EC - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
687 if ( v30 > 0 )
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
688 pPlayers[pl]->field_EC = v30;
0
Ritor1
parents:
diff changeset
689 else
Ritor1
parents:
diff changeset
690 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
691 pPlayers[pl]->field_EC = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
692 viewparams->bRedrawGameUI = true;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
693 }
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
694 }
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
695 if ( pPlayers[pl]->field_F0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
696 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
697 v32 = pPlayers[pl]->field_F0 - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
698 if ( v32 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
699 pPlayers[pl]->field_F0 = v32;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
700 else
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
701 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
702 pPlayers[pl]->field_F0 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
703 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
704 }
Ritor1
parents:
diff changeset
705 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
706 if ( pPlayers[pl]->field_F4 )
0
Ritor1
parents:
diff changeset
707 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
708 v34 = pPlayers[pl]->field_F4 - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
709 if ( v34 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
710 pPlayers[pl]->field_F4 = v34;
0
Ritor1
parents:
diff changeset
711 else
Ritor1
parents:
diff changeset
712 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
713 pPlayers[pl]->field_F4 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
714 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
715 }
Ritor1
parents:
diff changeset
716 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
717 if ( pPlayers[pl]->field_F8 )
0
Ritor1
parents:
diff changeset
718 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
719 v36 = pPlayers[pl]->field_F8 - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
720 if ( v36 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
721 pPlayers[pl]->field_F8 = v36;
0
Ritor1
parents:
diff changeset
722 else
Ritor1
parents:
diff changeset
723 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
724 pPlayers[pl]->field_F8 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
725 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
726 }
Ritor1
parents:
diff changeset
727 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
728 if ( pPlayers[pl]->field_FC )
0
Ritor1
parents:
diff changeset
729 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
730 v38 = pPlayers[pl]->field_FC - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
731 if ( v38 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
732 pPlayers[pl]->field_FC = v38;
0
Ritor1
parents:
diff changeset
733 else
Ritor1
parents:
diff changeset
734 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
735 pPlayers[pl]->field_FC = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
736 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
737 }
Ritor1
parents:
diff changeset
738 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
739 if ( pPlayers[pl]->field_100 )
0
Ritor1
parents:
diff changeset
740 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
741 v40 = pPlayers[pl]->field_100 - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
742 if ( v40 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
743 pPlayers[pl]->field_100 = v40;
0
Ritor1
parents:
diff changeset
744 else
Ritor1
parents:
diff changeset
745 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
746 pPlayers[pl]->field_100 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
747 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
748 }
Ritor1
parents:
diff changeset
749 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
750 if ( pPlayers[pl]->field_104 )
0
Ritor1
parents:
diff changeset
751 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
752 v42 = pPlayers[pl]->field_104 - pEventTimer->uTimeElapsed;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
753 if ( v42 > 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
754 pPlayers[pl]->field_104 = v42;
0
Ritor1
parents:
diff changeset
755 else
Ritor1
parents:
diff changeset
756 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
757 pPlayers[pl]->field_104 = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
758 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
759 }
Ritor1
parents:
diff changeset
760 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
761 if ( pPlayers[pl]->pConditions[Condition_Sleep] | pPlayers[pl]->pConditions[Condition_Paralyzed]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
762 | pPlayers[pl]->pConditions[Condition_Unconcious] | pPlayers[pl]->pConditions[Condition_Dead]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
763 | pPlayers[pl]->pConditions[Condition_Pertified] | pPlayers[pl]->pConditions[Condition_Eradicated] )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
764 --party_condition_flag;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
765 v43 = (signed __int64)pPlayers[pl]->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime > 0; //
0
Ritor1
parents:
diff changeset
766
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
767 for ( uint k = 0; k < 24; ++k )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
768 pPlayers[pl]->pPlayerBuffs[k].IsBuffExpiredToTime(pParty->uTimePlayed);
0
Ritor1
parents:
diff changeset
769
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
770 if ( v43 && (signed __int64)pPlayers[pl]->pPlayerBuffs[7].uExpireTime <= 0 )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
771 pPlayers[pl]->SetCondition(Condition_Weak, 0);
0
Ritor1
parents:
diff changeset
772 }
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
773
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
774 v46 = (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0;
0
Ritor1
parents:
diff changeset
775
Ritor1
parents:
diff changeset
776 for (uint i = 0; i < 20; ++i)
Ritor1
parents:
diff changeset
777 {
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1339
diff changeset
778 if (pParty->pPartyBuffs[i].IsBuffExpiredToTime(pParty->uTimePlayed) == 1)
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
779 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
780 }
Ritor1
parents:
diff changeset
781
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
782 if ( v46 && (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
783 {
Ritor1
parents:
diff changeset
784 for (uint i = 0; i < 4; ++i)
Ritor1
parents:
diff changeset
785 pParty->pPlayers[i].SetCondition(1, 0);
Ritor1
parents:
diff changeset
786 }
Ritor1
parents:
diff changeset
787
2182
e1e4a8a20b5f _46А6АС_GetActorsInViewport
Ritor1
parents: 2163
diff changeset
788 for (uint i = 0; i < 2; ++i)//
0
Ritor1
parents:
diff changeset
789 {
2182
e1e4a8a20b5f _46А6АС_GetActorsInViewport
Ritor1
parents: 2163
diff changeset
790 SpellBuff* pBuf = &pParty->pPartyBuffs[Party_Spec_Motion_status_ids[i]];
0
Ritor1
parents:
diff changeset
791 if (pBuf->uExpireTime == 0)
Ritor1
parents:
diff changeset
792 continue;
Ritor1
parents:
diff changeset
793
Ritor1
parents:
diff changeset
794 if ( !(pBuf->uFlags & 1) )
Ritor1
parents:
diff changeset
795 {
Ritor1
parents:
diff changeset
796 if (!pPlayers[pBuf->uCaster]->CanAct())
Ritor1
parents:
diff changeset
797 {
Ritor1
parents:
diff changeset
798 pBuf->Reset();
2182
e1e4a8a20b5f _46А6АС_GetActorsInViewport
Ritor1
parents: 2163
diff changeset
799 if (Party_Spec_Motion_status_ids[i] == PARTY_BUFF_FLY )
0
Ritor1
parents:
diff changeset
800 pParty->bFlying = false;
Ritor1
parents:
diff changeset
801 }
Ritor1
parents:
diff changeset
802 }
Ritor1
parents:
diff changeset
803 }
Ritor1
parents:
diff changeset
804
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
805 if ( !party_condition_flag )
0
Ritor1
parents:
diff changeset
806 {
151
9abdd40a107b pCurrentScreen
Ritor1
parents: 150
diff changeset
807 if ( pCurrentScreen != SCREEN_REST )
0
Ritor1
parents:
diff changeset
808 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
809 for ( uint pl = 1; pl <= 4; pl++ )
0
Ritor1
parents:
diff changeset
810 {
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
811 if ( pPlayers[pl]->pConditions[Condition_Sleep] )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
812 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
813 pPlayers[pl]->pConditions[Condition_Sleep] = 0;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
814 party_condition_flag = 1;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
815 break;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
816 }
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
817 }
2154
9bd7522cdbbb Render decoupling.
Nomad
parents: 2153
diff changeset
818 if ( !party_condition_flag || _5C35C0_force_party_death )
2062
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
819 uGameState = GAME_STATE_PARTY_DIED;
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
820 }
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
821 }
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
822
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
823 if ( uActiveCharacter )//
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
824 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
825 if ( pCurrentScreen != SCREEN_REST )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
826 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
827 if ( pPlayers[uActiveCharacter]->pConditions[Condition_Sleep]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
828 || pPlayers[uActiveCharacter]->pConditions[Condition_Paralyzed]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
829 || pPlayers[uActiveCharacter]->pConditions[Condition_Unconcious]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
830 || pPlayers[uActiveCharacter]->pConditions[Condition_Dead]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
831 || pPlayers[uActiveCharacter]->pConditions[Condition_Pertified]
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
832 || pPlayers[uActiveCharacter]->pConditions[Condition_Eradicated] )
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
833 {
c2a004e7458b _494035_timed_effects__water_walking_damage__etc()
Ritor1
parents: 2060
diff changeset
834 viewparams->bRedrawGameUI = true;
0
Ritor1
parents:
diff changeset
835 uActiveCharacter = pParty->GetNextActiveCharacter();
Ritor1
parents:
diff changeset
836 }
Ritor1
parents:
diff changeset
837 }
Ritor1
parents:
diff changeset
838 }
Ritor1
parents:
diff changeset
839 }
Ritor1
parents:
diff changeset
840
Ritor1
parents:
diff changeset
841 //----- (00494820) --------------------------------------------------------
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
842 unsigned int __fastcall _494820_training_time(unsigned int a1)
0
Ritor1
parents:
diff changeset
843 {
Ritor1
parents:
diff changeset
844 signed int v1; // eax@1
Ritor1
parents:
diff changeset
845
Ritor1
parents:
diff changeset
846 v1 = 5;
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
847 if ( a1 % 24 >= 5 )
0
Ritor1
parents:
diff changeset
848 v1 = 29;
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
849 return v1 - a1 % 24;
0
Ritor1
parents:
diff changeset
850 }
Ritor1
parents:
diff changeset
851
Ritor1
parents:
diff changeset
852 //----- (00494836) --------------------------------------------------------
2184
e0863f5beee0 SPELL_WATER_RECHARGE_ITEM
Ritor1
parents: 2182
diff changeset
853 int stru339_spell_sound::AddPartySpellSound(int uSoundID, int a6)
0
Ritor1
parents:
diff changeset
854 {
Ritor1
parents:
diff changeset
855 int v3; // esi@1
Ritor1
parents:
diff changeset
856 int result; // eax@1
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
857 //stru339_spell_sound *v5; // ebx@1
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
858 //int *v6; // edi@2
0
Ritor1
parents:
diff changeset
859 unsigned int v7; // eax@3
Ritor1
parents:
diff changeset
860 int v8; // [sp+Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
861 int v9; // [sp+10h] [bp-4h]@2
Ritor1
parents:
diff changeset
862 int a2a; // [sp+1Ch] [bp+8h]@1
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
863 //return 0;
0
Ritor1
parents:
diff changeset
864 v3 = 0;
Ritor1
parents:
diff changeset
865 result = word_4EE088_sound_ids[uSoundID];
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
866 //v5 = this;
0
Ritor1
parents:
diff changeset
867 a2a = word_4EE088_sound_ids[uSoundID];
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
868 if ( word_4EE088_sound_ids[uSoundID] )
0
Ritor1
parents:
diff changeset
869 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
870 //v6 = this->pSoundsOffsets;
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
871 for ( v9 = 0; v9 < 2; ++v9 )
0
Ritor1
parents:
diff changeset
872 {
Ritor1
parents:
diff changeset
873 v7 = a2a++;
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
874 result = pSoundList->LoadSound(v7, (char *)this + v3, 44744 - v3, &v8, a6);
0
Ritor1
parents:
diff changeset
875 if ( !result )
Ritor1
parents:
diff changeset
876 break;
Ritor1
parents:
diff changeset
877 a6 += 4;
Ritor1
parents:
diff changeset
878 result = v8 + 256;
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
879 this->pSoundsOffsets[v9] = v3;
0
Ritor1
parents:
diff changeset
880 v3 += result;
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
881 this->pSoundsSizes[v9] = v8 + 256;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
882 //++v6;
0
Ritor1
parents:
diff changeset
883 }
Ritor1
parents:
diff changeset
884 }
Ritor1
parents:
diff changeset
885 return result;
Ritor1
parents:
diff changeset
886 }
Ritor1
parents:
diff changeset
887 // 4EE088: using guessed type __int16 word_4EE088_sound_ids[];
Ritor1
parents:
diff changeset
888
Ritor1
parents:
diff changeset
889 //----- (00494AED) --------------------------------------------------------
130
1c471f3629fb Party expressions update
Nomad
parents: 121
diff changeset
890 unsigned int PlayerFrameTable::GetFrameIdByExpression(CHARACTER_EXPRESSION_ID expression)
0
Ritor1
parents:
diff changeset
891 {
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
892 for ( uint i = 0; i < this->uNumFrames; i++ )
0
Ritor1
parents:
diff changeset
893 {
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
894 if ( this->pFrames[i].expression == expression )
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
895 return i;
0
Ritor1
parents:
diff changeset
896 }
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
897 return 0;
0
Ritor1
parents:
diff changeset
898 }
Ritor1
parents:
diff changeset
899
Ritor1
parents:
diff changeset
900 //----- (00494B10) --------------------------------------------------------
Ritor1
parents:
diff changeset
901 PlayerFrame *PlayerFrameTable::GetFrameBy_x(unsigned int uFramesetID, unsigned int uFrameID)
Ritor1
parents:
diff changeset
902 {
Ritor1
parents:
diff changeset
903 unsigned int v3; // esi@1
Ritor1
parents:
diff changeset
904 __int16 v6; // dx@2
Ritor1
parents:
diff changeset
905 int v7; // edx@3
Ritor1
parents:
diff changeset
906 char *i; // eax@3
Ritor1
parents:
diff changeset
907 int v9; // ecx@5
Ritor1
parents:
diff changeset
908 PlayerFrame *result; // eax@6
Ritor1
parents:
diff changeset
909
Ritor1
parents:
diff changeset
910 v3 = uFramesetID;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
911 if ( this->pFrames[uFramesetID].uFlags & 1 && (v6 = this->pFrames[uFramesetID].uAnimLength) != 0 )
0
Ritor1
parents:
diff changeset
912 {
Ritor1
parents:
diff changeset
913 v7 = ((signed int)uFrameID >> 3) % (unsigned __int16)v6;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
914 for ( i = (char *)&this->pFrames[uFramesetID].uAnimTime; ; i += 10 )
0
Ritor1
parents:
diff changeset
915 {
Ritor1
parents:
diff changeset
916 v9 = *(short *)i;
Ritor1
parents:
diff changeset
917 if ( v7 <= v9 )
Ritor1
parents:
diff changeset
918 break;
Ritor1
parents:
diff changeset
919 v7 -= v9;
Ritor1
parents:
diff changeset
920 ++v3;
Ritor1
parents:
diff changeset
921 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
922 result = &this->pFrames[v3];
0
Ritor1
parents:
diff changeset
923 }
Ritor1
parents:
diff changeset
924 else
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
925 result = &this->pFrames[uFramesetID];
0
Ritor1
parents:
diff changeset
926 return result;
Ritor1
parents:
diff changeset
927 }
Ritor1
parents:
diff changeset
928
Ritor1
parents:
diff changeset
929 //----- (00494B5E) --------------------------------------------------------
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
930 PlayerFrame *PlayerFrameTable::GetFrameBy_y(int *pFramesetID, int *pAnimTime, int a4)
0
Ritor1
parents:
diff changeset
931 {
Ritor1
parents:
diff changeset
932 int v5; // esi@1
Ritor1
parents:
diff changeset
933 int v6; // eax@2
Ritor1
parents:
diff changeset
934
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
935 v5 = a4 + *pAnimTime;
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
936 if ( v5 < 8 * this->pFrames[*pFramesetID].uAnimTime )
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
937 *pAnimTime = v5;
0
Ritor1
parents:
diff changeset
938 else
Ritor1
parents:
diff changeset
939 {
Ritor1
parents:
diff changeset
940 v6 = rand() % 4 + 21;
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
941 *pFramesetID = v6;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
942 *pAnimTime = 8 * v5 % this->pFrames[v6].uAnimTime;
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
943 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
944 return &this->pFrames[*pFramesetID];
0
Ritor1
parents:
diff changeset
945 }
Ritor1
parents:
diff changeset
946
Ritor1
parents:
diff changeset
947 //----- (00494BC3) --------------------------------------------------------
Ritor1
parents:
diff changeset
948 void PlayerFrameTable::ToFile()
Ritor1
parents:
diff changeset
949 {
Ritor1
parents:
diff changeset
950 PlayerFrameTable *v1; // esi@1
Ritor1
parents:
diff changeset
951 FILE *v2; // eax@1
Ritor1
parents:
diff changeset
952 FILE *v3; // edi@1
Ritor1
parents:
diff changeset
953
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
954 PlayerFrameTable* Str = this;
0
Ritor1
parents:
diff changeset
955
Ritor1
parents:
diff changeset
956 v1 = Str;
Ritor1
parents:
diff changeset
957 v2 = fopen("data\\dpft.bin", "wb");
Ritor1
parents:
diff changeset
958 v3 = v2;
Ritor1
parents:
diff changeset
959 if ( !v2 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
960 Error("Unable to save dpft.bin");
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
961 fwrite(v1, 4, 1, v2);
0
Ritor1
parents:
diff changeset
962 fwrite(v1->pFrames, 0xAu, v1->uNumFrames, v3);
Ritor1
parents:
diff changeset
963 fclose(v3);
Ritor1
parents:
diff changeset
964 }
Ritor1
parents:
diff changeset
965
Ritor1
parents:
diff changeset
966 //----- (00494C0F) --------------------------------------------------------
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
967 void PlayerFrameTable::FromFile(void *data_mm6, void *data_mm7, void *data_mm8)
0
Ritor1
parents:
diff changeset
968 {
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
969 uint num_mm6_frames = data_mm6 ? *(int *)data_mm6 : 0,
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
970 num_mm7_frames = data_mm7 ? *(int *)data_mm7 : 0,
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
971 num_mm8_frames = data_mm8 ? *(int *)data_mm8 : 0;
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
972 uNumFrames = num_mm6_frames + num_mm7_frames + num_mm8_frames;
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
973 assert(uNumFrames);
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
974 assert(!num_mm8_frames);
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
975
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
976 pFrames = (PlayerFrame *)malloc(uNumFrames * sizeof(PlayerFrame));
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
977 memcpy(pFrames, (char *)data_mm7 + 4, num_mm7_frames * sizeof(PlayerFrame));
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
978 memcpy(pFrames + num_mm7_frames, (char *)data_mm6 + 4, num_mm6_frames * sizeof(PlayerFrame));
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
979 memcpy(pFrames + num_mm6_frames + num_mm7_frames, (char *)data_mm8 + 4, num_mm8_frames * sizeof(PlayerFrame));
0
Ritor1
parents:
diff changeset
980 }
Ritor1
parents:
diff changeset
981
Ritor1
parents:
diff changeset
982 //----- (00494C5A) --------------------------------------------------------
Ritor1
parents:
diff changeset
983 int PlayerFrameTable::FromFileTxt(const char *Args)
Ritor1
parents:
diff changeset
984 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
985 //PlayerFrameTable *v2; // ebx@1
0
Ritor1
parents:
diff changeset
986 FILE *v3; // eax@1
Ritor1
parents:
diff changeset
987 int v4; // esi@3
Ritor1
parents:
diff changeset
988 void *v5; // eax@10
Ritor1
parents:
diff changeset
989 FILE *v6; // ST0C_4@12
Ritor1
parents:
diff changeset
990 char *i; // eax@12
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
991 // __int16 v8; // ax@15
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
992 // const char *v9; // ST10_4@15
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
993 // unsigned __int16 v10; // ax@15
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
994 // const char *v11; // ST0C_4@15
0
Ritor1
parents:
diff changeset
995 int j; // esi@15
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2331
diff changeset
996 // int v13; // eax@17
0
Ritor1
parents:
diff changeset
997 int v14; // edx@22
Ritor1
parents:
diff changeset
998 int v15; // ecx@23
Ritor1
parents:
diff changeset
999 int v16; // eax@24
Ritor1
parents:
diff changeset
1000 signed int k; // eax@27
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1001 //PlayerFrame *v18; // edx@28
0
Ritor1
parents:
diff changeset
1002 int v19; // esi@28
Ritor1
parents:
diff changeset
1003 int l; // ecx@29
Ritor1
parents:
diff changeset
1004 char Buf; // [sp+Ch] [bp-2F8h]@3
Ritor1
parents:
diff changeset
1005 FrameTableTxtLine v23; // [sp+200h] [bp-104h]@4
Ritor1
parents:
diff changeset
1006 FrameTableTxtLine v24; // [sp+27Ch] [bp-88h]@4
Ritor1
parents:
diff changeset
1007 int v25; // [sp+2F8h] [bp-Ch]@3
Ritor1
parents:
diff changeset
1008 int v26; // [sp+2FCh] [bp-8h]@3
Ritor1
parents:
diff changeset
1009 FILE *File; // [sp+300h] [bp-4h]@1
Ritor1
parents:
diff changeset
1010 int Argsa; // [sp+30Ch] [bp+8h]@28
Ritor1
parents:
diff changeset
1011
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1012 __debugbreak();//Ritor1;
0
Ritor1
parents:
diff changeset
1013 //TileTable::dtor((TileTable *)this);
Ritor1
parents:
diff changeset
1014 v3 = fopen(Args, "r");
Ritor1
parents:
diff changeset
1015 File = v3;
Ritor1
parents:
diff changeset
1016 if ( !v3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1017 Error("PlayerFrameTable::load - Unable to open file: %s.", Args);
0
Ritor1
parents:
diff changeset
1018 v4 = 0;
Ritor1
parents:
diff changeset
1019 v25 = 0;
Ritor1
parents:
diff changeset
1020 v26 = 1;
Ritor1
parents:
diff changeset
1021 if ( fgets(&Buf, 490, v3) )
Ritor1
parents:
diff changeset
1022 {
Ritor1
parents:
diff changeset
1023 do
Ritor1
parents:
diff changeset
1024 {
Ritor1
parents:
diff changeset
1025 *strchr(&Buf, 10) = 0;
703
a9c1fb7483c2 monster parser almost complete.
Gloval
parents: 701
diff changeset
1026 memcpy(&v24, txt_file_frametable_parser(&Buf, &v23), sizeof(v24));
701
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1027 if ( v24.uPropCount && *v24.pProperties[0] != 47 )
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1028 {
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1029 if ( v24.uPropCount < 3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1030 Error("PlayerFrameTable::load, too few arguments, %s line %i.", Args, v26);
0
Ritor1
parents:
diff changeset
1031 ++v25;
Ritor1
parents:
diff changeset
1032 }
Ritor1
parents:
diff changeset
1033 ++v26;
Ritor1
parents:
diff changeset
1034 }
Ritor1
parents:
diff changeset
1035 while ( fgets(&Buf, 490, File) );
Ritor1
parents:
diff changeset
1036 v4 = v25;
Ritor1
parents:
diff changeset
1037 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1038 this->uNumFrames = v4;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
1039 v5 = malloc(10 * v4);
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1040 this->pFrames = (PlayerFrame *)v5;
0
Ritor1
parents:
diff changeset
1041 if ( !v5 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1042 Error("PlayerFrameTable::load - Out of Memory!");
0
Ritor1
parents:
diff changeset
1043 v6 = File;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1044 this->uNumFrames = 0;
0
Ritor1
parents:
diff changeset
1045 fseek(v6, 0, 0);
Ritor1
parents:
diff changeset
1046 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
Ritor1
parents:
diff changeset
1047 {
Ritor1
parents:
diff changeset
1048 *strchr(&Buf, 10) = 0;
703
a9c1fb7483c2 monster parser almost complete.
Gloval
parents: 701
diff changeset
1049 memcpy(&v24, txt_file_frametable_parser(&Buf, &v23), sizeof(v24));
701
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1050 if ( v24.uPropCount && *v24.pProperties[0] != 47 )
0
Ritor1
parents:
diff changeset
1051 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1052 //v8 = atoi(v24.pProperties[0]);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1053 //v9 = v24.pProperties[1];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1054 this->pFrames[this->uNumFrames].expression = (CHARACTER_EXPRESSION_ID)atoi(v24.pProperties[0]);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1055 //v10 = atoi(v9);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1056 //v11 = v24.pProperties[2];
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1057 this->pFrames[this->uNumFrames].uTextureID = atoi(v24.pProperties[1]);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1058 this->pFrames[this->uNumFrames].uAnimTime = atoi(v24.pProperties[2]);
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1059 this->pFrames[this->uNumFrames].uAnimLength = 0;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1060 this->pFrames[this->uNumFrames].uFlags = 0;
701
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1061 for ( j = 3; j < v24.uPropCount; ++j )
0
Ritor1
parents:
diff changeset
1062 {
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
1063 if ( !_stricmp(v24.pProperties[j], "New") )
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1064 this->pFrames[this->uNumFrames].uFlags |= 4;
0
Ritor1
parents:
diff changeset
1065 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1066 ++this->uNumFrames;
0
Ritor1
parents:
diff changeset
1067 }
Ritor1
parents:
diff changeset
1068 }
Ritor1
parents:
diff changeset
1069 fclose(File);
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1070
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1071 if ( (signed int)(this->uNumFrames - 1) > 0 )
0
Ritor1
parents:
diff changeset
1072 {
Ritor1
parents:
diff changeset
1073 v15 = 0;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1074 for ( v14 = 0; v14 < this->uNumFrames - 1; ++v14 )
0
Ritor1
parents:
diff changeset
1075 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1076 v16 = (int)&this->pFrames[v15];
0
Ritor1
parents:
diff changeset
1077 if ( !(*(char *)(v16 + 18) & 4) )
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1078 this->pFrames[v14].uFlags |= 1;
0
Ritor1
parents:
diff changeset
1079 ++v15;
Ritor1
parents:
diff changeset
1080 }
Ritor1
parents:
diff changeset
1081 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1082 for ( k = 0; k < (signed int)this->uNumFrames; *(short *)(Argsa + 6) = v19 )
0
Ritor1
parents:
diff changeset
1083 {
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1084 //v18 = this->pFrames;
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1085 Argsa = (int)&this->pFrames[k];
0
Ritor1
parents:
diff changeset
1086 v19 = *(short *)(Argsa + 4);
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1087 if ( this->pFrames[k].uFlags & 1 )
0
Ritor1
parents:
diff changeset
1088 {
Ritor1
parents:
diff changeset
1089 ++k;
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1090 for ( l = (int)&this->pFrames[k]; this->pFrames[k].uFlags & 1; l += 10 )
0
Ritor1
parents:
diff changeset
1091 {
Ritor1
parents:
diff changeset
1092 v19 += *(short *)(l + 4);
Ritor1
parents:
diff changeset
1093 ++k;
Ritor1
parents:
diff changeset
1094 }
2117
c7bf59066842 mm7_4-6 cleaned
Ritor1
parents: 2113
diff changeset
1095 LOWORD(v19) = this->pFrames[k].uAnimTime + v19;
0
Ritor1
parents:
diff changeset
1096 }
Ritor1
parents:
diff changeset
1097 ++k;
Ritor1
parents:
diff changeset
1098 }
Ritor1
parents:
diff changeset
1099 return 1;
Ritor1
parents:
diff changeset
1100 }
Ritor1
parents:
diff changeset
1101
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
1102
0
Ritor1
parents:
diff changeset
1103
Ritor1
parents:
diff changeset
1104 //----- (00495430) --------------------------------------------------------
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1105 const char * GetReputationString( signed int a1 )
607
cfca6297e4ae ArmorShop fixes
Gloval
parents: 606
diff changeset
1106 {
566
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1107 if (a1 >= 25)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1108 return pGlobalTXT_LocalizationStrings[379]; // Hated
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1109 else if (a1 >= 6)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1110 return pGlobalTXT_LocalizationStrings[392]; // Unfriendly
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1111 else if (a1 >= -5)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1112 return pGlobalTXT_LocalizationStrings[399]; // Neutral;
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1113 else if (a1 >= -24)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1114 return pGlobalTXT_LocalizationStrings[402]; // Friendly
0
Ritor1
parents:
diff changeset
1115 else
566
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1116 return pGlobalTXT_LocalizationStrings[434]; // Respected;
0
Ritor1
parents:
diff changeset
1117 }
Ritor1
parents:
diff changeset
1118
Ritor1
parents:
diff changeset
1119 //----- (00495461) --------------------------------------------------------
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1120 char *BuildDialogueString(const char *lpsz, unsigned __int8 uPlayerID, ItemGen *a3, char *a4, int a5, __int64 *a6)
0
Ritor1
parents:
diff changeset
1121 {
Ritor1
parents:
diff changeset
1122 Player *pPlayer; // ebx@3
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1123 const char *pText; // esi@7
0
Ritor1
parents:
diff changeset
1124 int v17; // eax@10
Ritor1
parents:
diff changeset
1125 signed __int64 v18; // qax@18
Ritor1
parents:
diff changeset
1126 unsigned __int8 *v20; // ebx@32
Ritor1
parents:
diff changeset
1127 int v21; // ecx@34
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1128 int pReputation; // eax@45
0
Ritor1
parents:
diff changeset
1129 int v29; // eax@68
Ritor1
parents:
diff changeset
1130 __int16 v55[56]; // [sp+10h] [bp-128h]@34
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
1131 stru351_summoned_item v56; // [sp+80h] [bp-B8h]@107
0
Ritor1
parents:
diff changeset
1132 char a1[100]; // [sp+B8h] [bp-80h]@3
Ritor1
parents:
diff changeset
1133 int v63; // [sp+12Ch] [bp-Ch]@32
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1134
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1135 if ( IsBadStringPtrA(lpsz, 1) )
0
Ritor1
parents:
diff changeset
1136 return "Invalid String Passed";
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1137
0
Ritor1
parents:
diff changeset
1138 a1[0] = 0;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1139 pPlayer = &pParty->pPlayers[uPlayerID];
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1140 memset(pTmpBuf2.data(), 0, sizeof(pTmpBuf2));
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1141
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1142 NPCData *npc = nullptr;
0
Ritor1
parents:
diff changeset
1143 if ( dword_5C35D4 )
1211
fd3bea473c0c fix HouseNpcdata array addresiing
Gloval
parents: 1209
diff changeset
1144 npc = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0))]; //- 1
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1145 else
602
628694cd5744 Margaret working
zipi
parents: 569
diff changeset
1146 npc = GetNPCData(sDialogue_SpeakingActorNPC_ID);
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1147
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1148 //pText = a4;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
1149 uint len = strlen(lpsz);
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1150 for (int i = 0, dst = 0; i < len; ++i)
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1151 {
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1152 char c = lpsz[i];
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1153 if (c != '%')
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1154 pTmpBuf2[dst++] = c;
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1155 else
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1156 {
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1157 v17 = 10 * (int)(lpsz[i + 1] - '0') + lpsz[i + 2] - '0';
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1158
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1159 switch ( v17 )
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1160 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1161 case 1://
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1162 strcat(pTmpBuf2.data(), npc->pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1163 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1164 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1165 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1166 case 2:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1167 strcat(pTmpBuf2.data(), pPlayer->pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1168 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1169 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1170 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1171 case 3:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1172 case 4:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1173 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1174 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1175 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1176 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1177 case 5:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1178 v18 = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1179 pText = pGlobalTXT_LocalizationStrings[397];// "evening"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1180 if ( SHIDWORD(v18) <= 0 && SHIDWORD(v18) >= 0 && (unsigned int)v18 >= 5 && SHIDWORD(v18) <= 0 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1181 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1182 if ( SHIDWORD(v18) >= 0 && (unsigned int)v18 >= 11 )
0
Ritor1
parents:
diff changeset
1183 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1184 if ( v18 < 20 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1185 pText = pGlobalTXT_LocalizationStrings[396];// "day"
0
Ritor1
parents:
diff changeset
1186 }
Ritor1
parents:
diff changeset
1187 else
Ritor1
parents:
diff changeset
1188 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1189 pText = pGlobalTXT_LocalizationStrings[395];// "morning"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1190 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1191 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1192 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1193 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1194 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1195 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1196 case 6:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1197 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1198 pText = pGlobalTXT_LocalizationStrings[387];// "lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1199 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1200 pText = pGlobalTXT_LocalizationStrings[385];// "sir"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1201 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1202 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1203 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1204 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1205 case 7:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1206 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1207 pText = pGlobalTXT_LocalizationStrings[389];// "Lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1208 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1209 pText = pGlobalTXT_LocalizationStrings[386];// "Sir"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1210 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1211 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1212 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1213 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1214 case 8:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1215 v63 = 0;
1460
ff2118028c71 renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents: 1453
diff changeset
1216 v20 = (unsigned __int8 *)pPlayer->_achieved_awards_bits;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1217 for ( uint _i = 0; _i < 28; ++_i )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1218 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1219 if ( (unsigned __int16)_449B57_test_bit(v20, word_4EE150[i]) )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1220 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1221 v21 = v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1222 ++v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1223 v55[v63] = word_4EE150[i];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1224 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1225 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1226 if ( v63 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1227 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1228 if ( dword_A74CDC == -1 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1229 dword_A74CDC = rand() % v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1230 pText = (char *)pAwards[v55[dword_A74CDC]].pText;//(char *)dword_723E80_award_related[2 * v55[v24]];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1231 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1232 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1233 pText = (char *)pNPCTopics[55].pText;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1234 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1235 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1236 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1237 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1238 case 9:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1239 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1240 pText = pGlobalTXT_LocalizationStrings[384];// "her"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1241 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1242 pText = pGlobalTXT_LocalizationStrings[383];// "his"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1243 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1244 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1245 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1246 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1247 case 10:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1248 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1249 pText = pGlobalTXT_LocalizationStrings[389];// "Lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1250 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1251 pText = pGlobalTXT_LocalizationStrings[388];// "Lord"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1252 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1253 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1254 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1255 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1256 case 11:
1827
0c75c3e7e436 cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
Grumpy7
parents: 1826
diff changeset
1257 pReputation = pParty->GetPartyReputation();
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1258 if ( pReputation >= 25 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1259 pText = pGlobalTXT_LocalizationStrings[379];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1260 else//v25 < 25
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1261 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1262 if ( pReputation < 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1263 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1264 if ( pReputation >= -5 )//6 >= v25 >= -5
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1265 pText = pGlobalTXT_LocalizationStrings[399];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1266 else// v25 < -5
0
Ritor1
parents:
diff changeset
1267 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1268 if ( pReputation < -24 )//-24 > v25
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1269 pText = pGlobalTXT_LocalizationStrings[434];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1270 else// -5 > v25 > -24
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1271 pText = pGlobalTXT_LocalizationStrings[402];
0
Ritor1
parents:
diff changeset
1272 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1273 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1274 else//25 > v25 > 6
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1275 pText = pGlobalTXT_LocalizationStrings[392];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1276 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1277 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1278 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1279 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1280 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1281 case 12:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1282 pReputation = npc->rep;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1283 if ( pReputation >= 25 )
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1284 pText = pGlobalTXT_LocalizationStrings[379];//
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1285 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1286 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1287 if ( pReputation < 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1288 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1289 if ( pReputation >= -5 )
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1290 pText = pGlobalTXT_LocalizationStrings[399];//
0
Ritor1
parents:
diff changeset
1291 else
Ritor1
parents:
diff changeset
1292 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1293 if ( pReputation < -24 )
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1294 pText = pGlobalTXT_LocalizationStrings[434];//
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1295 else
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1296 pText = pGlobalTXT_LocalizationStrings[402];//
0
Ritor1
parents:
diff changeset
1297 }
Ritor1
parents:
diff changeset
1298 }
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1299 else
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1300 pText = pGlobalTXT_LocalizationStrings[392];//
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1301 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1302 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1303 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1304 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1305 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1306 case 13:
2229
10c909eb6766 dword_AE336C to NPCStats::dword_AE336C_LastMispronouncedNameFirstLetter,
Grumpy7
parents: 2215
diff changeset
1307 strcat(pTmpBuf2.data(), pNPCStats->sub_495366_MispronounceName(pPlayer->pName[0], pPlayer->uSex));
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1308 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1309 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1310 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1311 case 14:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1312 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1313 pText = pGlobalTXT_LocalizationStrings[391];// "sister"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1314 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1315 pText = pGlobalTXT_LocalizationStrings[390];// "brother"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1316 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1317 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1318 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1319 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1320 case 15:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1321 strcat(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[393]);// "daughter"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1322 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1323 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1324 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1325 case 16:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1326 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1327 pText = pGlobalTXT_LocalizationStrings[391];// "sister"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1328 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1329 pText = pGlobalTXT_LocalizationStrings[390];// "brother"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1330 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1331 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1332 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1333 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1334 case 17://
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1335 {
2115
90cc547a7927 Fixing hireling prices
Grumpy7
parents: 2103
diff changeset
1336 uint pay_percentage = pNPCStats->pProfessions[npc->uProfession].uHirePrice / 100;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1337 if ( !pay_percentage )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1338 pay_percentage = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1339 sprintf(a1, "%lu", pay_percentage);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1340 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1341 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1342 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1343 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1344 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1345 case 18:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1346 case 19:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1347 case 20:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1348 case 21:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1349 case 22:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1350 case 26:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1351 strncpy(a1, lpsz + i + 1, 2);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1352 sprintf(a1, "%lu", atoi(a1));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1353 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1354 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1355 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1356 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1357 case 23:
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1358 if ( pMapStats->GetMapInfo(pCurrentMapName) )
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1359 pText = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1360 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1361 pText = pGlobalTXT_LocalizationStrings[394];// "Unknown"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1362 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1363 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1364 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1365 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1366 case 24://
2069
259df09dfb50 32bits almost there
Nomad
parents: 2060
diff changeset
1367 sprintfex(a1, format_4E2D80, Color16(255, 255, 155), a3->GetDisplayName());
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1368 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1369 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1370 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1371 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1372 case 25:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1373 v29 = pPlayer->GetBaseBuyingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
0
Ritor1
parents:
diff changeset
1374 switch ( a5 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1375 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1376 case 3:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1377 v29 = pPlayer->GetBaseSellingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1378 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1379 case 4:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1380 v29 = pPlayer->GetBaseIdentifyPrice(p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1381 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1382 case 5:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1383 v29 = pPlayer->GetBaseRepairPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1384 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1385 case 6:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1386 v29 = pPlayer->GetBaseSellingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier) / 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1387 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1388 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1389 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1390 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1391 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1392 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1393 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1394 case 27://
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1395 v29 = pPlayer->GetBuyingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1396 if ( a5 == 3 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1397 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1398 v29 = pPlayer->GetPriceSell(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
1567
9f8b3e904e14 Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents: 1546
diff changeset
1399 if (a3->IsBroken())
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1400 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1401 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1402 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1403 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1404 i += 2;
0
Ritor1
parents:
diff changeset
1405 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1406 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1407 if ( a5 != 4 )
0
Ritor1
parents:
diff changeset
1408 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1409 if ( a5 == 5 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1410 v29 = pPlayer->GetPriceRepair(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1411 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1412 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1413 if ( a5 == 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1414 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1415 v29 = pPlayer->GetPriceSell(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier) / 2;
1567
9f8b3e904e14 Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents: 1546
diff changeset
1416 if (a3->IsBroken())
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1417 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1418 if (!v29)
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1419 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1420 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1421 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1422 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1423 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1424 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1425 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1426 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1427 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1428 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1429 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1430 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1431 break;
0
Ritor1
parents:
diff changeset
1432 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1433 sprintfex(a1, "%lu", pPlayer->GetPriceIdentification(p2DEvents[(signed int)a4 - 1].fPriceMultiplier));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1434 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1435 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1436 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1437 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1438 case 28://
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1439 strcat(pTmpBuf2.data(), (char *)p2DEvents[(signed int)a4 - 1].pProprieterTitle);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1440 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1441 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1442 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1443 case 29:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1444 sprintfex(a1, "%lu", pPlayer->GetPriceIdentification(p2DEvents[(signed int)a4 - 1].fPriceMultiplier));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1445 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1446 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1447 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1448 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1449 case 30:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1450 if ( !a6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1451 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1452 strcat(pTmpBuf2.data(), a4);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1453 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1454 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1455 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1456 }
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
1457 init_summoned_item(&v56, *a6);
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1458 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1459 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1460 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1461 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1462 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1463 case 31:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1464 case 32:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1465 case 33:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1466 case 34:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1467 strcat(pTmpBuf2.data(), pParty->pPlayers[v17 - 31].pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1468 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1469 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1470 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1471 default:
0
Ritor1
parents:
diff changeset
1472 if ( v17 <= 50 || v17 > 70 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1473 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1474 strncpy(a1, lpsz + i + 1, 2);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1475 sprintf(a1, "%lu", atoi(a1));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1476 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1477 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1478 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1479 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1480 }
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1481 if ( v17 - 51 >= 20 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1482 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1483 strcat(pTmpBuf2.data(), a4);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1484 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1485 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1486 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1487 }
1747
cecb080929c4 Party_stru0 renamed to PartyTimeStruct, fixed its members, renamed Party::field_3C to Party::PartyTimes, started Player::SetVariable refactoring start
Grumpy7
parents: 1709
diff changeset
1488 init_summoned_item(&v56, pParty->PartyTimes._s_times[v17-51]);
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1489 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1490 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1491 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1492 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1493 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1494 }
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1495 }
0
Ritor1
parents:
diff changeset
1496 }
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1497 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
1498 }
Ritor1
parents:
diff changeset
1499
Ritor1
parents:
diff changeset
1500 //----- (0049B04D) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1501 void stru154::GetFacePlaneAndClassify(ODMFace *a2, BSPVertexBuffer *a3)
0
Ritor1
parents:
diff changeset
1502 {
Ritor1
parents:
diff changeset
1503 Vec3_float_ v; // [sp+4h] [bp-Ch]@1
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1504 float v7;
0
Ritor1
parents:
diff changeset
1505
Ritor1
parents:
diff changeset
1506 v.x = 0.0;
Ritor1
parents:
diff changeset
1507 v.y = 0.0;
Ritor1
parents:
diff changeset
1508 v.z = 0.0;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1509 GetFacePlane(a2, a3, &v, &v7);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1510
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1511 if (fabsf(a2->pFacePlane.vNormal.z) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1512 polygonType = POLYGON_VerticalWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1513 else if (fabsf(a2->pFacePlane.vNormal.x) < 1e-6f &&
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1514 fabsf(a2->pFacePlane.vNormal.y) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1515 polygonType = POLYGON_Floor;
0
Ritor1
parents:
diff changeset
1516 else
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1517 polygonType = POLYGON_InBetweenFloorAndWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1518
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1519 face_plane.vNormal.x = v.x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1520 face_plane.vNormal.y = v.y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1521 face_plane.vNormal.z = v.z;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1522 face_plane.dist = v7;
0
Ritor1
parents:
diff changeset
1523 }
Ritor1
parents:
diff changeset
1524
Ritor1
parents:
diff changeset
1525 //----- (0049B0C9) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1526 void stru154::ClassifyPolygon(Vec3_float_ *pNormal, float dist)
0
Ritor1
parents:
diff changeset
1527 {
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1528 if (fabsf(pNormal->z) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1529 polygonType = POLYGON_VerticalWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1530 else if (fabsf(pNormal->x) < 1e-6f &&
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1531 fabsf(pNormal->y) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1532 polygonType = POLYGON_Floor;
0
Ritor1
parents:
diff changeset
1533 else
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1534 polygonType = POLYGON_InBetweenFloorAndWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1535
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1536 face_plane.vNormal.x = pNormal->x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1537 face_plane.dist = dist;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1538 face_plane.vNormal.y = pNormal->y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1539 face_plane.vNormal.z = pNormal->z;
0
Ritor1
parents:
diff changeset
1540 }
Ritor1
parents:
diff changeset
1541
Ritor1
parents:
diff changeset
1542 //----- (0049B13D) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1543 void stru154::GetFacePlane(ODMFace *pFace, BSPVertexBuffer *pVertices, Vec3_float_ *pOutNormal, float *pOutDist)
0
Ritor1
parents:
diff changeset
1544 {
Ritor1
parents:
diff changeset
1545 Vec3_float_ *v19; // eax@3
Ritor1
parents:
diff changeset
1546 Vec3_float_ v2; // [sp+4h] [bp-64h]@3
Ritor1
parents:
diff changeset
1547 float v26; // [sp+1Ch] [bp-4Ch]@3
Ritor1
parents:
diff changeset
1548 float v27; // [sp+20h] [bp-48h]@3
Ritor1
parents:
diff changeset
1549 float v28; // [sp+24h] [bp-44h]@3
Ritor1
parents:
diff changeset
1550 Vec3_float_ v1; // [sp+40h] [bp-28h]@1
Ritor1
parents:
diff changeset
1551 Vec3_float_ v38; // [sp+58h] [bp-10h]@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1552
0
Ritor1
parents:
diff changeset
1553 v1.x = 0.0;
Ritor1
parents:
diff changeset
1554 v1.y = 0.0;
Ritor1
parents:
diff changeset
1555 v1.z = 0.0;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1556
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1557 if (pFace->uNumVertices >= 2)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1558 {
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1559 for ( int i = 0; i < pFace->uNumVertices - 2; i++ )
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1560 {
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1561 v1.x = pVertices->pVertices[pFace->pVertexIDs[i + 1]].x - pVertices->pVertices[pFace->pVertexIDs[i]].x;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1562 v1.y = pVertices->pVertices[pFace->pVertexIDs[i + 1]].y - pVertices->pVertices[pFace->pVertexIDs[i]].y;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1563 v1.z = pVertices->pVertices[pFace->pVertexIDs[i + 1]].z - pVertices->pVertices[pFace->pVertexIDs[i]].z;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1564
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1565 v26 = pVertices->pVertices[pFace->pVertexIDs[i + 2]].x - pVertices->pVertices[pFace->pVertexIDs[i + 1]].x;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1566 v27 = pVertices->pVertices[pFace->pVertexIDs[i + 2]].y - pVertices->pVertices[pFace->pVertexIDs[i + 1]].y;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1567 v28 = pVertices->pVertices[pFace->pVertexIDs[i + 2]].z - pVertices->pVertices[pFace->pVertexIDs[i + 1]].z;
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1568
0
Ritor1
parents:
diff changeset
1569 v19 = Vec3_float_::Cross(&v1, &v2, v26, v27, v28);
Ritor1
parents:
diff changeset
1570 v38.x = v19->x;
Ritor1
parents:
diff changeset
1571 v38.y = v19->y;
Ritor1
parents:
diff changeset
1572 v38.z = v19->z;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1573 if ( v38.x != 0.0 || v38.y != 0.0 || v38.z != 0.0)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1574 {
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1575 v38.Normalize();
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1576
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1577 pOutNormal->x = v38.x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1578 pOutNormal->y = v38.y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1579 pOutNormal->z = v38.z;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1580
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1581 *pOutDist = -(pVertices->pVertices[pFace->pVertexIDs[i]].x * v38.x
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1582 + pVertices->pVertices[pFace->pVertexIDs[i]].y * v38.y
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1583 + pVertices->pVertices[pFace->pVertexIDs[i]].z * v38.z);
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1584 return;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1585 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1586 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1587 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
1588
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1589 pOutNormal->x = (double)(pFace->pFacePlane.vNormal.x & 0xFFFF) / 65535.0f + (double)(pFace->pFacePlane.vNormal.x >> 16);
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1590 pOutNormal->y = (double)(pFace->pFacePlane.vNormal.y & 0xFFFF) / 65535.0f + (double)(pFace->pFacePlane.vNormal.y >> 16);
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1591 pOutNormal->z = (double)(pFace->pFacePlane.vNormal.z & 0xFFFF) / 65535.0f + (double)(pFace->pFacePlane.vNormal.z >> 16);
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1592 *pOutDist = (double)(pFace->pFacePlane.dist & 0xFFFF) / 65535.0f + (double)(pFace->pFacePlane.dist >> 16);
0
Ritor1
parents:
diff changeset
1593 }
Ritor1
parents:
diff changeset
1594
Ritor1
parents:
diff changeset
1595 //----- (0049D700) --------------------------------------------------------
Ritor1
parents:
diff changeset
1596 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim)
Ritor1
parents:
diff changeset
1597 {
Ritor1
parents:
diff changeset
1598 int v2; // ecx@1
Ritor1
parents:
diff changeset
1599 unsigned int v3; // eax@1
Ritor1
parents:
diff changeset
1600
Ritor1
parents:
diff changeset
1601 v2 = 0;
2103
2318216e5206 stru_AA1058[i]._494836() continue
Ritor1
parents: 2102
diff changeset
1602 v3 = uDim - 1;
0
Ritor1
parents:
diff changeset
1603 while ( v3 & 1 )
Ritor1
parents:
diff changeset
1604 {
Ritor1
parents:
diff changeset
1605 v3 >>= 1;
Ritor1
parents:
diff changeset
1606 ++v2;
Ritor1
parents:
diff changeset
1607 }
Ritor1
parents:
diff changeset
1608 return v3 == 0 ? v2 : 0;
Ritor1
parents:
diff changeset
1609 }
Ritor1
parents:
diff changeset
1610
Ritor1
parents:
diff changeset
1611 //----- (004B1447) --------------------------------------------------------
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1612 void sub_4B1447_party_fine(int shopId, int stealingResult, int fineToAdd)
0
Ritor1
parents:
diff changeset
1613 {
Ritor1
parents:
diff changeset
1614 signed int v3; // esi@1
Ritor1
parents:
diff changeset
1615 DDM_DLV_Header *v7; // eax@14
Ritor1
parents:
diff changeset
1616
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1617 if ( stealingResult == 0 || stealingResult == 1)
0
Ritor1
parents:
diff changeset
1618 {
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1619 if ( pParty->uFine < 4000000 )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1620 {
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1621 if ( fineToAdd + pParty->uFine < 0 )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1622 pParty->uFine = 0;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1623 else if ( fineToAdd + pParty->uFine > 4000000 )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1624 pParty->uFine = 4000000;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1625 else
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1626 pParty->uFine += fineToAdd;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1627 }
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1628 if ( pParty->uFine )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1629 {
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1630 for ( uint i = 1; i <= 4; ++i )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1631 {
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1632 if ( !_449B57_test_bit(pPlayers[i]->_achieved_awards_bits, 1) )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1633 _449B7E_toggle_bit(pPlayers[i]->_achieved_awards_bits, 1, 1);
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1634 }
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1635 }
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1636 if (stealingResult == 1)
1754
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
1637 v3 = 2;
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1638 else
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1639 v3 = 1;
0
Ritor1
parents:
diff changeset
1640 }
Ritor1
parents:
diff changeset
1641 else
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1642 v3 = 2;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1643 pParty->PartyTimes._shop_ban_times[shopId] = pParty->uTimePlayed + 368640;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1644 pParty->InTheShopFlags[shopId] = 1;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1645 v7 = &pOutdoor->ddm;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1646 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1647 v7 = &pIndoor->dlv;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1648 v7->uReputation += v3;
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1649 if ( v7->uReputation > 10000 )
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
1650 v7->uReputation = 10000;
0
Ritor1
parents:
diff changeset
1651 }
Ritor1
parents:
diff changeset
1652
Ritor1
parents:
diff changeset
1653
Ritor1
parents:
diff changeset
1654 //----- (004B1ECE) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
1655 void OracleDialogue()
0
Ritor1
parents:
diff changeset
1656 {
Ritor1
parents:
diff changeset
1657 __int16 *v0; // edi@1
Ritor1
parents:
diff changeset
1658 signed int v4; // eax@9
Ritor1
parents:
diff changeset
1659 int v5; // ebx@11
Ritor1
parents:
diff changeset
1660 signed int v8; // edi@14
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1661 ItemGen *v9; // [sp+Ch] [bp-Ch]@11
0
Ritor1
parents:
diff changeset
1662 signed int v10; // [sp+10h] [bp-8h]@13
Ritor1
parents:
diff changeset
1663 int v11; // [sp+14h] [bp-4h]@1
Ritor1
parents:
diff changeset
1664
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
1665 contract_approved = 0;
0
Ritor1
parents:
diff changeset
1666 v11 = 0;
Ritor1
parents:
diff changeset
1667 uDialogueType = 84;
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
1668 current_npc_text = (char *)pNPCTopics[667].pText;
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1669 v0 = _4F0882_evt_VAR_PlayerItemInHands_vals.data();
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1670 //while ( 1 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1671 for ( uint i = 0; i <= 53; i++ )
0
Ritor1
parents:
diff changeset
1672 {
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
1673 if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, *v0) )
0
Ritor1
parents:
diff changeset
1674 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1675 //v1 = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1676 //v2 = pParty->pPlayers.data();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1677 for ( uint pl = 0; pl < 4; pl++ )
0
Ritor1
parents:
diff changeset
1678 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1679 //LOBYTE(v3) = pParty->pPlayers[pl].CompareVariable(VAR_PlayerItemInHands, *(v0+1));
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
1680 if ( pParty->pPlayers[pl].CompareVariable(VAR_PlayerItemInHands, *(v0 + 1)) )
0
Ritor1
parents:
diff changeset
1681 break;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1682 //++v2;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1683 //++v1;
0
Ritor1
parents:
diff changeset
1684 }
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1685 //while ( (signed int)v2 < (signed int)pParty->pHirelings.data() );
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1686 //if ( v1 == 4 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1687 //break;
0
Ritor1
parents:
diff changeset
1688 }
Ritor1
parents:
diff changeset
1689 ++v11;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1690 //v0 += 2;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1691 //if ( v0 > &_4F0882_evt_VAR_PlayerItemInHands_vals[53] )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1692 //break;
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1693 }
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1694 if ( v0 <= &_4F0882_evt_VAR_PlayerItemInHands_vals[53] )
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1695 {
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
1696 current_npc_text = (char *)pNPCTopics[666].pText; // Here's %s that you lost. Be careful
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1697 v4 = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11];
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
1698 contract_approved = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11];
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1699 pParty->pPlayers[0].AddVariable(VAR_PlayerItemInHands, v4);
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1700 }
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
1701 if ( contract_approved == 601 )
0
Ritor1
parents:
diff changeset
1702 {
Ritor1
parents:
diff changeset
1703 v5 = 0;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1704 //v12 = pParty->pPlayers.data();//[0].uClass;
0
Ritor1
parents:
diff changeset
1705 v9 = 0;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1706 //while ( 1 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1707 for ( uint i = 0; i < 4; i++ )
0
Ritor1
parents:
diff changeset
1708 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1709 if ( pParty->pPlayers[i].classType == PLAYER_CLASS_LICH )
0
Ritor1
parents:
diff changeset
1710 {
Ritor1
parents:
diff changeset
1711 v10 = 0;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1712 //v6 = pParty->pPlayers.data();//[0].pInventoryItems[0].field_1A;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1713 for ( uint pl = 0; pl < 4; pl++ )
0
Ritor1
parents:
diff changeset
1714 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1715 for ( v8 = 0; v8 < 126; v8++ )//138
0
Ritor1
parents:
diff changeset
1716 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1717 if ( pParty->pPlayers[pl].pInventoryItemList[v8].uItemID == ITEM_LICH_JAR_FULL )
0
Ritor1
parents:
diff changeset
1718 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1719 if ( !pParty->pPlayers[pl].pInventoryItemList[v8].uHolderPlayer )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1720 v9 = &pParty->pPlayers[pl].pInventoryItemList[v8];
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1721 if ( pParty->pPlayers[pl].pInventoryItemList[v8].uHolderPlayer == v5 )
0
Ritor1
parents:
diff changeset
1722 v10 = 1;
Ritor1
parents:
diff changeset
1723 }
Ritor1
parents:
diff changeset
1724 }
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
1725 }
0
Ritor1
parents:
diff changeset
1726 if ( !v10 )
Ritor1
parents:
diff changeset
1727 break;
Ritor1
parents:
diff changeset
1728 }
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1729 // ++v12;
0
Ritor1
parents:
diff changeset
1730 ++v5;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1731 // if ( v12 > &pParty->pPlayers[3] )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
1732 // return;
0
Ritor1
parents:
diff changeset
1733 }
Ritor1
parents:
diff changeset
1734 if ( v9 )
377
243418228760 GetIdentifiedName
Gloval
parents: 373
diff changeset
1735 v9->uHolderPlayer = v5;
0
Ritor1
parents:
diff changeset
1736 }
Ritor1
parents:
diff changeset
1737 }
Ritor1
parents:
diff changeset
1738
Ritor1
parents:
diff changeset
1739 //----- (004B254D) --------------------------------------------------------
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1740 const char * _4B254D_SkillMasteryTeacher(int trainerInfo)
0
Ritor1
parents:
diff changeset
1741 {
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1742 int teacherLevel; // edx@1
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1743 int skillBeingTaught; // ecx@1
955
Ritor1
parents: 917
diff changeset
1744 int pClassType; // eax@7
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1745 int currClassMaxMastery; // eax@7
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1746 int pointsInSkillWOutMastery; // ebx@7
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1747 int classBaseId; // eax@8
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1748 unsigned int skillMastery; // eax@29
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1749 unsigned __int16 pointsInSkill; // [sp+1Ch] [bp-10h]@7
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1750 int masteryLevelBeingTaught; // [sp+24h] [bp-8h]@7
0
Ritor1
parents:
diff changeset
1751
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
1752 contract_approved = 0;
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1753 teacherLevel = (trainerInfo - 200) % 3;
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1754 skillBeingTaught = (trainerInfo - 200) / 3;
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1755 Player* activePlayer = pPlayers[uActiveCharacter];
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1756 pClassType = activePlayer->classType;
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1757 currClassMaxMastery = byte_4ED970_skill_learn_ability_by_class_table[pClassType][skillBeingTaught];
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1758 masteryLevelBeingTaught = teacherLevel + 2;
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1759 dword_F8B1B0_MasteryBeingTaught = masteryLevelBeingTaught;
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1760 if ( currClassMaxMastery < masteryLevelBeingTaught )
0
Ritor1
parents:
diff changeset
1761 {
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1762 classBaseId = pClassType - pClassType % 4;
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1763 if (byte_4ED970_skill_learn_ability_by_class_table[classBaseId + 1][skillBeingTaught] >= masteryLevelBeingTaught)
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1764 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[633], pClassNames[classBaseId + 1]);// %s . You have to be promoted to %s to learn this skill level.
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1765 else if (byte_4ED970_skill_learn_ability_by_class_table[classBaseId + 2][skillBeingTaught] >= masteryLevelBeingTaught
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1766 && byte_4ED970_skill_learn_ability_by_class_table[classBaseId + 3][skillBeingTaught] >= masteryLevelBeingTaught)
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1767 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[634], pClassNames[classBaseId + 2], pClassNames[classBaseId + 3]);// %s %s . You have to be promoted to %s or %s to learn this skill level.
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1768 else if (byte_4ED970_skill_learn_ability_by_class_table[classBaseId + 2][skillBeingTaught] >= masteryLevelBeingTaught)
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1769 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[633], pClassNames[classBaseId + 2]);// %s . You have to be promoted to %s to learn this skill level.
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1770 else if (byte_4ED970_skill_learn_ability_by_class_table[classBaseId + 3][skillBeingTaught] >= masteryLevelBeingTaught)
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1771 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[633], pClassNames[classBaseId + 3]);// %s . You have to be promoted to %s to learn this skill level.
0
Ritor1
parents:
diff changeset
1772 else
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1773 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[632], pClassNames[pClassType]);// %s. This skill level can not be learned by the %s class.
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1774 return pTmpBuf.data();
0
Ritor1
parents:
diff changeset
1775 }
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1776 if ( !activePlayer->CanAct() )
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1777 return pNPCTopics[122].pText; //Not in your condition!
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1778 pointsInSkill = activePlayer->pActiveSkills[skillBeingTaught];
2237
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1779 pointsInSkillWOutMastery = pointsInSkill & 0x3F;
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1780 if ( !pointsInSkillWOutMastery )
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1781 return pNPCTopics[131].pText; //You must know the skill before you can become an expert in it!
d903816e972e _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Grumpy7
parents: 2236
diff changeset
1782 skillMastery = SkillToMastery(pointsInSkill);
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1783 if ( (signed int)skillMastery > teacherLevel + 1 )
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1784 return pNPCTopics[teacherLevel + 128].pText; // You are already an SKILLLEVEL in this skill.
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1785 dword_F8B1AC_award_bit_number = skillBeingTaught;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1786 if ( masteryLevelBeingTaught == 2 && pointsInSkillWOutMastery < 4
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1787 || masteryLevelBeingTaught == 3 && pointsInSkillWOutMastery < 7
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1788 || masteryLevelBeingTaught == 4 && pointsInSkillWOutMastery < 10
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1789 )
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1790 return pNPCTopics[127].pText; //"You don't meet the requirements, and cannot be taught until you do."
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1791 switch (dword_F8B1AC_award_bit_number)
0
Ritor1
parents:
diff changeset
1792 {
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1793 case PLAYER_SKILL_STAFF:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1794 case PLAYER_SKILL_SWORD:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1795 case PLAYER_SKILL_DAGGER:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1796 case PLAYER_SKILL_AXE:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1797 case PLAYER_SKILL_SPEAR:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1798 case PLAYER_SKILL_BOW:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1799 case PLAYER_SKILL_MACE:
2240
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1800 case PLAYER_SKILL_ARMSMASTER:
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1801 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1802 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1803 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1804 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1805 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1806 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1807 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1808 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1809 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1810 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1811 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1812 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1813 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1814 case PLAYER_SKILL_BLASTER:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1815 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1816 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1817 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1818 gold_transaction_amount = 0;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1819 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1820 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1821 gold_transaction_amount = 0;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1822 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1823 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1824 gold_transaction_amount = 0;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1825 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1826 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1827 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1828 case PLAYER_SKILL_SHIELD:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1829 case PLAYER_SKILL_LEATHER:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1830 case PLAYER_SKILL_CHAIN:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1831 case PLAYER_SKILL_PLATE:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1832 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1833 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1834 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1835 gold_transaction_amount = 1000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1836 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1837 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1838 gold_transaction_amount = 3000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1839 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1840 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1841 gold_transaction_amount = 7000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1842 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1843 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1844 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1845 case PLAYER_SKILL_FIRE:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1846 case PLAYER_SKILL_AIR:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1847 case PLAYER_SKILL_WATER:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1848 case PLAYER_SKILL_EARTH:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1849 case PLAYER_SKILL_SPIRIT:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1850 case PLAYER_SKILL_MIND:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1851 case PLAYER_SKILL_BODY:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1852 switch (masteryLevelBeingTaught)
0
Ritor1
parents:
diff changeset
1853 {
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1854 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1855 gold_transaction_amount = 1000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1856 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1857 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1858 gold_transaction_amount = 4000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1859 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1860 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1861 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1862 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1863 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1864 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1865 case PLAYER_SKILL_LIGHT:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1866 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1867 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1868 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1869 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1870 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1871 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1872 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 114) )
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1873 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1874 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1875 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1876 case 4:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1877 if ( !activePlayer->ProfessionOrGuildFlagsCorrect(0x22u, 1) ||
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1878 !activePlayer->ProfessionOrGuildFlagsCorrect(0x1Au, 1))
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1879 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1880 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1881 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1882 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1883 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1884 case PLAYER_SKILL_DARK:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1885 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1886 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1887 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1888 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1889 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1890 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1891 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 110) )
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1892 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1893 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1894 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1895 case 4:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1896 if ( !activePlayer->ProfessionOrGuildFlagsCorrect(0x23u, 1)
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1897 || !activePlayer->ProfessionOrGuildFlagsCorrect(0x1Bu, 1))
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1898 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1899 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1900 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1901 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1902 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1903 case PLAYER_SKILL_ITEM_ID:
2240
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1904 case PLAYER_SKILL_REPAIR:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1905 case PLAYER_SKILL_MEDITATION:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1906 case PLAYER_SKILL_PERCEPTION:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1907 case PLAYER_SKILL_TRAP_DISARM:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1908 case PLAYER_SKILL_MONSTER_ID:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1909 case PLAYER_SKILL_STEALING:
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
1910 case PLAYER_SKILL_ALCHEMY:
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1911 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1912 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1913 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1914 gold_transaction_amount = 500;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1915 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1916 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1917 gold_transaction_amount = 2500;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1918 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1919 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1920 gold_transaction_amount = 6000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1921 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1922 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1923 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1924 case PLAYER_SKILL_MERCHANT:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1925 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1926 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1927 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1928 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1929 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1930 case 3:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1931 if ( activePlayer->GetBaseWillpower() < 50 )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1932 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1933 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1934 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1935 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1936 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1937 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1938 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1939 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1940 case PLAYER_SKILL_BODYBUILDING:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1941 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1942 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1943 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1944 gold_transaction_amount = 500;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1945 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1946 case 3:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1947 if ( activePlayer->GetBaseEndurance() < 50 )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1948 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1949 gold_transaction_amount = 2500;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1950 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1951 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1952 gold_transaction_amount = 6000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1953 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1954 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1955 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1956 case PLAYER_SKILL_DIPLOMACY:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1957 Error("Diplomacy not used");
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1958 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1959 case PLAYER_SKILL_TIEVERY:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1960 Error("Thievery not used");
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1961 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1962 case PLAYER_SKILL_DODGE:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1963 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1964 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1965 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1966 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1967 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1968 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1969 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1970 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1971 case 4:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1972 if ( (activePlayer->pActiveSkills[PLAYER_SKILL_UNARMED] & 63) < 0xA )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1973 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1974 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1975 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1976 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1977 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1978 case PLAYER_SKILL_UNARMED:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1979 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1980 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1981 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1982 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1983 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1984 case 3:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1985 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1986 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1987 case 4:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
1988 if ( (activePlayer->pActiveSkills[PLAYER_SKILL_DODGE] & 63) < 0xA )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1989 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1990 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1991 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1992 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1993 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1994 case PLAYER_SKILL_LEARNING:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1995 switch (masteryLevelBeingTaught)
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1996 {
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1997 case 2:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1998 gold_transaction_amount = 2000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
1999 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2000 case 3:
2239
699bd6ee5ad0 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Grumpy7
parents: 2238
diff changeset
2001 if ( activePlayer->GetBaseIntelligence() < 50 )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2002 return pNPCTopics[127].pText;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2003 gold_transaction_amount = 5000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2004 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2005 case 4:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2006 gold_transaction_amount = 8000;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2007 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2008 }
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2009 break;
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2010 default:
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2011 Error("Unknown skill");
955
Ritor1
parents: 917
diff changeset
2012 }
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
2013 if ( gold_transaction_amount > pParty->uNumGold )
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2014 return pNPCTopics[124].pText; //You don't have enough gold!
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2015 contract_approved = 1;
2238
f66d8be6ad5b _4B254D_SkillMasteryTeacher unrolling switches
Grumpy7
parents: 2237
diff changeset
2016 if ( masteryLevelBeingTaught == 2 )
0
Ritor1
parents:
diff changeset
2017 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2018 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],// ^Pr[%s] ^Pr[%s] ^I[%lu] ^L[;;]
955
Ritor1
parents: 917
diff changeset
2019 pGlobalTXT_LocalizationStrings[433], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//
0
Ritor1
parents:
diff changeset
2020 }
2249
708aa31cad56 dword_F8B1B0_MasteryBeingTaught adding 2 else ifs
Grumpy7
parents: 2247
diff changeset
2021 else if ( masteryLevelBeingTaught == 3 )
0
Ritor1
parents:
diff changeset
2022 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2023 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],
955
Ritor1
parents: 917
diff changeset
2024 pGlobalTXT_LocalizationStrings[432], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//
0
Ritor1
parents:
diff changeset
2025 }
2249
708aa31cad56 dword_F8B1B0_MasteryBeingTaught adding 2 else ifs
Grumpy7
parents: 2247
diff changeset
2026 else if ( masteryLevelBeingTaught == 4 )
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2027 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],
955
Ritor1
parents: 917
diff changeset
2028 pGlobalTXT_LocalizationStrings[225], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2029 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
2030 }
Ritor1
parents:
diff changeset
2031
Ritor1
parents:
diff changeset
2032 //----- (004B3E1E) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
2033 void sub_4B3E1E()
0
Ritor1
parents:
diff changeset
2034 {
Ritor1
parents:
diff changeset
2035 NPCData *v0; // ST40_4@1
Ritor1
parents:
diff changeset
2036 signed int v1; // edi@1
165
Ritor1
parents: 152
diff changeset
2037 //GUIWindow *v2; // ecx@1
0
Ritor1
parents:
diff changeset
2038
167
90521fb9766c NPCDialogue fix
Ritor1
parents: 165
diff changeset
2039 __debugbreak();
602
628694cd5744 Margaret working
zipi
parents: 569
diff changeset
2040 v0 = GetNPCData(sDialogue_SpeakingActorNPC_ID);
0
Ritor1
parents:
diff changeset
2041 v1 = 0;
Ritor1
parents:
diff changeset
2042 pDialogueWindow->eWindowType = WINDOW_MainMenu;
Ritor1
parents:
diff changeset
2043 pDialogueWindow->Release();
2215
e9625ad08541 fog fix and change 640,480 - window->GetWidth(), window->GetHeight()
Ritor1
parents: 2197
diff changeset
2044 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Dialogue, 1, 0);
291
0ea5fbd16edb NPC mostly done
Gloval
parents: 290
diff changeset
2045 if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
0
Ritor1
parents:
diff changeset
2046 {
2373
b4a79e3ef2f0 Arena dialogue and other
Ritor1
parents: 2369
diff changeset
2047 pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);//
0
Ritor1
parents:
diff changeset
2048 v1 = 1;
Ritor1
parents:
diff changeset
2049 }
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
2050 pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//
972
c8a0f6d89c70 Some inqury on selecting Knight bug.
Nomad
parents: 964
diff changeset
2051 pDialogueWindow->_41D08F_set_keyboard_control_group(v1 + 1, 1, 0, 1);
0
Ritor1
parents:
diff changeset
2052 }
Ritor1
parents:
diff changeset
2053
Ritor1
parents:
diff changeset
2054
Ritor1
parents:
diff changeset
2055 //----- (004B3FE5) --------------------------------------------------------
2246
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
2056 //Originally called _4B254D_SkillMasteryTeacher to have contract_approved assigned, to be able to set some button name.
0be4f17b7986 shop stealing cleaned up a bit
Grumpy7
parents: 2241
diff changeset
2057 //But it the name gets immediately overwritten
2240
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
2058 void _4B3FE5_training_dialogue(int a4)
0
Ritor1
parents:
diff changeset
2059 {
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
2060 const char *v2; // edi@1
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2061
2245
8817c398b792 for RasterLine2D
Ritor1
parents: 2241
diff changeset
2062 //__debugbreak();
2240
1fc4223bddf6 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Grumpy7
parents: 2239
diff changeset
2063 uDialogueType = DIALOGUE_SKILL_TRAINER;
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
2064 current_npc_text = (char *)pNPCTopics[a4 + 168].pText;
2241
9df0477a5e2b restoring deleted line in mm7_4.cpp
Grumpy7
parents: 2240
diff changeset
2065 _4B254D_SkillMasteryTeacher(a4); //might be needed because of contract_approved ?
0
Ritor1
parents:
diff changeset
2066 pDialogueWindow->Release();
2215
e9625ad08541 fog fix and change 640,480 - window->GetWidth(), window->GetHeight()
Ritor1
parents: 2197
diff changeset
2067 pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), 350, WINDOW_MainMenu, a4, 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2068 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471, 445, 169, 35, 1, 0, UIMSG_Escape, 0, 0,
948
5a2dbb00c399 Code cleaning.
Nomad
parents: 940
diff changeset
2069 pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
2070 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2071 v2 = "";
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2072 if ( contract_approved )
0
Ritor1
parents:
diff changeset
2073 v2 = pGlobalTXT_LocalizationStrings[535];
2245
8817c398b792 for RasterLine2D
Ritor1
parents: 2241
diff changeset
2074 pDialogueWindow->CreateButton(480, 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
972
c8a0f6d89c70 Some inqury on selecting Knight bug.
Nomad
parents: 964
diff changeset
2075 pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
747
585490c29945 House dialogue ids appended
Nomad
parents: 746
diff changeset
2076 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
0
Ritor1
parents:
diff changeset
2077 }
Ritor1
parents:
diff changeset
2078 // F8B19C: using guessed type int dword_F8B19C;
Ritor1
parents:
diff changeset
2079 // F8B1A8: using guessed type int dword_F8B1A8;
Ritor1
parents:
diff changeset
2080
Ritor1
parents:
diff changeset
2081 //----- (004B46A5) --------------------------------------------------------
1006
e865f349aa41 ui cleanup
Gloval
parents: 990
diff changeset
2082 void __fastcall DrawTextAtStatusBar( const char *Str, int a5 )
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
2083 {
471
c43f156a95c9 ArmorShopDialog crash fixed. All shops show its items
Gloval
parents: 470
diff changeset
2084 pRenderer->DrawTextureRGB(0, 352, pTexture_StatusBar);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2085 pPrimaryWindow->DrawText(pFontLucida, pFontLucida->AlignText_Center(450, Str) + 11, 357, a5, Str, 0, 0, 0);
0
Ritor1
parents:
diff changeset
2086 }
Ritor1
parents:
diff changeset
2087
Ritor1
parents:
diff changeset
2088 //----- (004B46F8) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2089 __int64 GetExperienceRequiredForLevel(int level)
0
Ritor1
parents:
diff changeset
2090 {
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2091 __int64 v1; // eax@1
0
Ritor1
parents:
diff changeset
2092 int i; // edx@1
Ritor1
parents:
diff changeset
2093
Ritor1
parents:
diff changeset
2094 v1 = 0;
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2095 for ( i = 0; i < level; ++i )
0
Ritor1
parents:
diff changeset
2096 v1 += i + 1;
Ritor1
parents:
diff changeset
2097 return 1000 * v1;
Ritor1
parents:
diff changeset
2098 }
Ritor1
parents:
diff changeset
2099
Ritor1
parents:
diff changeset
2100 //----- (004BC49B) --------------------------------------------------------
651
2bf48d11d742 Training hall UI fixed
Nomad
parents: 648
diff changeset
2101 void OnSelectNPCDialogueOption(DIALOGUE_TYPE newDialogueType)
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 651
diff changeset
2102 {
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2103 NPCData *speakingNPC; // ebp@1
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2104 int npc_event_id; // ecx@10
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2105 char *v13; // [sp-8h] [bp-18h]@60
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
2106
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2107 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2108 uDialogueType = newDialogueType;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2109 if (!speakingNPC->uFlags)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2110 speakingNPC->uFlags = 1;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2111 if(newDialogueType == DIALOGUE_PROFESSION_DETAILS)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2112 dialogue_show_profession_details = ~dialogue_show_profession_details;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2113 else if(newDialogueType == DIALOGUE_76)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2114 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2115 if (speakingNPC->Hired())
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2116 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2117 if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2118 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2119 for ( uint i = 0; i < (unsigned int)pNPCStats->uNumNewNPCs; ++i )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2120 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2121 if ( pNPCStats->pNewNPCData[i].uFlags & 0x80 && !strcmp(speakingNPC->pName, pNPCStats->pNewNPCData[i].pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2122 pNPCStats->pNewNPCData[i].uFlags &= 0x7Fu;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2123 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2124 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2125 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2126 memset(&pParty->pHirelings[0], 0, sizeof(NPCData));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2127 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2128 memset(&pParty->pHirelings[1], 0, sizeof(NPCData));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2129 pParty->hirelingScrollPosition = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2130 pParty->CountHirelings();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2131 dword_591084 = 0;
2402
8cee51ce4382 included directx 11
Ritor1
parents: 2374
diff changeset
2132 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2133 dword_7241C8 = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2134 return;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2135 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2136 if ( pParty->pHirelings[0].pName && pParty->pHirelings[1].pName )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2137 ShowStatusBarString(pGlobalTXT_LocalizationStrings[533], 2);// ""I cannot join you, you're party is full""
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2138 else
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2139 {
2115
90cc547a7927 Fixing hireling prices
Grumpy7
parents: 2103
diff changeset
2140 if ( speakingNPC->uProfession != 51 ) //burglars have no hiring price
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2141 {
2115
90cc547a7927 Fixing hireling prices
Grumpy7
parents: 2103
diff changeset
2142 if ( pParty->uNumGold < pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice )
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2143 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2144 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);// "You don't have enough gold"
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2145 dialogue_show_profession_details = false;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2146 uDialogueType = 13;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2147 if ( uActiveCharacter )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2148 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NotEnoughGold, 0);
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2149 if ( !dword_7241C8 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2150 pGame->Draw();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2151 dword_7241C8 = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2152 return;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2153 }
2115
90cc547a7927 Fixing hireling prices
Grumpy7
parents: 2103
diff changeset
2154 Party::TakeGold(pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2155 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2156 LOBYTE(speakingNPC->uFlags) |= 0x80u;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2157 if ( pParty->pHirelings[0].pName )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2158 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2159 memcpy(&pParty->pHirelings[1], speakingNPC, sizeof(pParty->pHirelings[1]));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2160 v13 = pParty->pHireling2Name;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2161 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2162 else
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2163 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2164 memcpy(&pParty->pHirelings[0], speakingNPC, sizeof(pParty->pHirelings[0]));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2165 v13 = pParty->pHireling1Name;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2166 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2167 strcpy(v13, speakingNPC->pName);
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2168 pParty->hirelingScrollPosition = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2169 pParty->CountHirelings();
2402
8cee51ce4382 included directx 11
Ritor1
parents: 2374
diff changeset
2170 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2171 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2172 pDialogue_SpeakingActor->uAIState = Removed;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2173 if ( uActiveCharacter )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2174 pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0);
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2175 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2176 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2177 else if ( (signed int)newDialogueType > DIALOGUE_84 && (signed int)newDialogueType <= DIALOGUE_ARENA_SELECT_CHAMPION ) //
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2178 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2179 ArenaFight();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2180 return;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2181 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2182 else if(newDialogueType == DIALOGUE_USE_NPC_ABILITY)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2183 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2184 if (UseNPCSkill((NPCProf)speakingNPC->uProfession) == 0)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2185 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2186 if ( speakingNPC->uProfession != GateMaster )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2187 speakingNPC->bHasUsedTheAbility = 1;
2402
8cee51ce4382 included directx 11
Ritor1
parents: 2374
diff changeset
2188 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2189 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2190 else
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2191 ShowStatusBarString(pGlobalTXT_LocalizationStrings[140], 2); //"Your packs are already full!"
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2192 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2193 else if(newDialogueType == DIALOGUE_13)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2194 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2195 if (!speakingNPC->Hired())
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2196 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2197 sub_4B3E1E();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2198 dialogue_show_profession_details = false;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2199 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2200 else
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2201 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2202 for ( uint i = 0; i < (signed int)pNPCStats->uNumNewNPCs; ++i )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2203 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2204 if ( pNPCStats->pNewNPCData[i].uFlags & 0x80 && !strcmp(speakingNPC->pName, pNPCStats->pNewNPCData[i].pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2205 pNPCStats->pNewNPCData[i].uFlags &= 0x7Fu;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2206 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2207 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2208 memset(&pParty->pHirelings[0], 0, sizeof(NPCData));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2209 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2210 memset(&pParty->pHirelings[1], 0, sizeof(NPCData));
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2211 pParty->hirelingScrollPosition = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2212 pParty->CountHirelings();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2213 dword_591084 = 0;
2402
8cee51ce4382 included directx 11
Ritor1
parents: 2374
diff changeset
2214 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 1, 0);
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2215 dword_7241C8 = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2216 return;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2217 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2218 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2219 else if(newDialogueType >= DIALOGUE_EVT_A && newDialogueType <= DIALOGUE_EVT_F)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2220 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2221 switch(newDialogueType)
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2222 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2223 case DIALOGUE_EVT_A: npc_event_id = speakingNPC->evt_A; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2224 case DIALOGUE_EVT_B: npc_event_id = speakingNPC->evt_B; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2225 case DIALOGUE_EVT_C: npc_event_id = speakingNPC->evt_C; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2226 case DIALOGUE_EVT_D: npc_event_id = speakingNPC->evt_D; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2227 case DIALOGUE_EVT_E: npc_event_id = speakingNPC->evt_E; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2228 case DIALOGUE_EVT_F: npc_event_id = speakingNPC->evt_F; break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2229 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2230 if ( (npc_event_id >= 200) && (npc_event_id <= 310) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2231 _4B3FE5_training_dialogue(npc_event_id); //200-310
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2232 else if (( npc_event_id >= 400) && (npc_event_id <= 410) )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2233 { //400-410
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2234 dword_F8B1D8 = newDialogueType;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2235 DrawJoinGuildWindow(npc_event_id - 400);
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2236 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2237 else
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2238 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2239 switch ( npc_event_id )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2240 {
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2241 case 139:
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2242 OracleDialogue();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2243 break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2244 case 311:
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2245 CheckBountyRespawnAndAward();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2246 break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2247 case 399:
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2248 Arena_SelectionFightLevel();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2249 break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2250 default:
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2251 activeLevelDecoration = (LevelDecoration*)1;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2252 current_npc_text = 0;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2253 EventProcessor(npc_event_id, 0, 1);
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2343
diff changeset
2254 activeLevelDecoration = nullptr;
2102
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2255 break;
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2256 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2257 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2258 }
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2259 if ( !dword_7241C8 )
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2260 pGame->Draw();
0db53678ff48 RasterLine2D, DIALOGUE_EVT_A etc.
Ritor1
parents: 2086
diff changeset
2261 dword_7241C8 = 0;
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
2262 }
0
Ritor1
parents:
diff changeset
2263