annotate mm7_4.cpp @ 2046:da35dc35d635

GetRangedAttack
author Ritor1
date Tue, 26 Nov 2013 18:45:03 +0600
parents 7a9477135943
children 2ccf638342d6
rev   line source
1165
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1110
diff changeset
1 #ifdef _MSC_VER
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1110
diff changeset
2 #define _CRT_SECURE_NO_WARNINGS
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1110
diff changeset
3 #endif
29a8defbad9e temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
Grumpy7
parents: 1110
diff changeset
4
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
5 #include "Texture.h"
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
6 #include "mm7_data.h"
1016
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
7 #include "VideoPlayer.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
8 #include "Sprites.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
9 #include "BSPModel.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
10 #include "Mouse.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
11 #include "stru6.h"
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
12
c45d51b3f4f4 Included header files cleanup
Grumpy7
parents: 990
diff changeset
13 #include "LightmapBuilder.h"
341
a8ee15a20bea EnterHouse
Nomad
parents: 336
diff changeset
14 #include "MM7.h"
0
Ritor1
parents:
diff changeset
15 #include "MapInfo.h"
Ritor1
parents:
diff changeset
16 #include "Game.h"
Ritor1
parents:
diff changeset
17 #include "GUIWindow.h"
Ritor1
parents:
diff changeset
18 #include "GUIFont.h"
Ritor1
parents:
diff changeset
19 #include "Party.h"
Ritor1
parents:
diff changeset
20 #include "AudioPlayer.h"
Ritor1
parents:
diff changeset
21 #include "Outdoor.h"
1277
1803172dffd9 header stuff
Grumpy7
parents: 1275
diff changeset
22 #include "Outdoor_stuff.h"
0
Ritor1
parents:
diff changeset
23 #include "LOD.h"
Ritor1
parents:
diff changeset
24 #include "Actor.h"
Ritor1
parents:
diff changeset
25 #include "Events.h"
Ritor1
parents:
diff changeset
26 #include "Viewport.h"
Ritor1
parents:
diff changeset
27 #include "FrameTableInc.h"
2037
7a9477135943 Renamed Math.h -> OurMath.h (file resolution was sometimes ambiguous)
Nomad
parents: 2030
diff changeset
28 #include "OurMath.h"
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
29 #include "SpriteObject.h"
0
Ritor1
parents:
diff changeset
30 #include "ObjectList.h"
Ritor1
parents:
diff changeset
31 #include "DecorationList.h"
Ritor1
parents:
diff changeset
32 #include "Time.h"
Ritor1
parents:
diff changeset
33 #include "IconFrameTable.h"
Ritor1
parents:
diff changeset
34 #include "PlayerFrameTable.h"
Ritor1
parents:
diff changeset
35 #include "Awards.h"
Ritor1
parents:
diff changeset
36 #include "TurnEngine.h"
Ritor1
parents:
diff changeset
37 #include "Events2D.h"
Ritor1
parents:
diff changeset
38 #include "stru159.h"
189
038a4d09406f new texts file, fix text rendender error
Gloval
parents: 180
diff changeset
39 #include "texts.h"
0
Ritor1
parents:
diff changeset
40 #include "Log.h"
1299
8c2f689b5f0b folder UI
Ritor1
parents: 1295
diff changeset
41 #include "UI\UIHouses.h"
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1254
diff changeset
42 #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
43 #include "Level/Decoration.h"
0
Ritor1
parents:
diff changeset
44
Ritor1
parents:
diff changeset
45 //----- (0046CC4B) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
46 void check_event_triggers()
0
Ritor1
parents:
diff changeset
47 {
Ritor1
parents:
diff changeset
48 LevelDecoration *v1; // esi@2
Ritor1
parents:
diff changeset
49
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
50 for (size_t i = 0; i < num_event_triggers; i++)
0
Ritor1
parents:
diff changeset
51 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
52 v1 = &pLevelDecorations[event_triggers[i]];
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
53
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
54 if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_TOUCH
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
55 && v1->vPosition.GetDistanceTo(pParty->vPosition) < v1->uTriggerRange)
0
Ritor1
parents:
diff changeset
56 {
1514
965af46e8793 Rename LevelDecoration::field_16_event_id to LevelDecoration::uEventID.
yoctozepto
parents: 1513
diff changeset
57 EventProcessor(v1->uEventID, PID(OBJECT_Decoration,i), 1);
0
Ritor1
parents:
diff changeset
58 }
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
59 else if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_MONSTER)
0
Ritor1
parents:
diff changeset
60 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
61 for (size_t j = 0; j < uNumActors; j++)
0
Ritor1
parents:
diff changeset
62 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
63 if (v1->vPosition.GetDistanceTo(pActors[j].vPosition) < v1->uTriggerRange)
1514
965af46e8793 Rename LevelDecoration::field_16_event_id to LevelDecoration::uEventID.
yoctozepto
parents: 1513
diff changeset
64 EventProcessor(v1->uEventID, 0, 1);
0
Ritor1
parents:
diff changeset
65 }
Ritor1
parents:
diff changeset
66 }
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
67 else if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_OBJECT)
0
Ritor1
parents:
diff changeset
68 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
69 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
70 {
1513
4055b09160ae Clean and decouple. (2)
yoctozepto
parents: 1489
diff changeset
71 if (v1->vPosition.GetDistanceTo(pSpriteObjects[j].vPosition) < v1->uTriggerRange)
1514
965af46e8793 Rename LevelDecoration::field_16_event_id to LevelDecoration::uEventID.
yoctozepto
parents: 1513
diff changeset
72 EventProcessor(v1->uEventID, 0, 1);
0
Ritor1
parents:
diff changeset
73 }
Ritor1
parents:
diff changeset
74 }
Ritor1
parents:
diff changeset
75 }
Ritor1
parents:
diff changeset
76 }
Ritor1
parents:
diff changeset
77 // 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
Ritor1
parents:
diff changeset
78
Ritor1
parents:
diff changeset
79 //----- (0046D8E3) --------------------------------------------------------
Ritor1
parents:
diff changeset
80 int __fastcall sub_46D8E3(int a1, signed int a2, int a3, int a4)
Ritor1
parents:
diff changeset
81 {
Ritor1
parents:
diff changeset
82 int v4; // ebx@1
Ritor1
parents:
diff changeset
83 unsigned int v5; // ecx@1
Ritor1
parents:
diff changeset
84 BSPModel *v6; // edi@3
Ritor1
parents:
diff changeset
85 ODMFace *v7; // esi@10
Ritor1
parents:
diff changeset
86 unsigned __int8 v8; // al@10
676
ecfb1b3c9a39 BLV: when standing right on the portal (orange wall) everything looks fine
Nomad
parents: 659
diff changeset
87 signed __int16 *v9; // eax@18
0
Ritor1
parents:
diff changeset
88 int v10; // edx@19
Ritor1
parents:
diff changeset
89 int v11; // ecx@21
Ritor1
parents:
diff changeset
90 int v12; // ecx@23
Ritor1
parents:
diff changeset
91 signed int v13; // eax@25
Ritor1
parents:
diff changeset
92 int v14; // edx@27
Ritor1
parents:
diff changeset
93 int v15; // edx@29
Ritor1
parents:
diff changeset
94 int v16; // ST18_4@29
Ritor1
parents:
diff changeset
95 signed int v17; // edx@29
Ritor1
parents:
diff changeset
96 signed __int64 v18; // qtt@29
Ritor1
parents:
diff changeset
97 int v19; // eax@35
Ritor1
parents:
diff changeset
98 signed int v20; // ecx@37
Ritor1
parents:
diff changeset
99 signed int v22; // ebx@42
Ritor1
parents:
diff changeset
100 unsigned int v23; // esi@43
Ritor1
parents:
diff changeset
101 int v24; // edx@44
Ritor1
parents:
diff changeset
102 int v25; // eax@44
Ritor1
parents:
diff changeset
103 int v26; // [sp+Ch] [bp-38h]@7
Ritor1
parents:
diff changeset
104 int v27; // [sp+10h] [bp-34h]@21
Ritor1
parents:
diff changeset
105 int v28; // [sp+18h] [bp-2Ch]@21
Ritor1
parents:
diff changeset
106 int v29; // [sp+1Ch] [bp-28h]@2
Ritor1
parents:
diff changeset
107 unsigned int v30; // [sp+20h] [bp-24h]@8
Ritor1
parents:
diff changeset
108 signed int v31; // [sp+24h] [bp-20h]@1
Ritor1
parents:
diff changeset
109 signed int v32; // [sp+28h] [bp-1Ch]@1
Ritor1
parents:
diff changeset
110 int v33; // [sp+2Ch] [bp-18h]@7
Ritor1
parents:
diff changeset
111 bool v34; // [sp+30h] [bp-14h]@21
Ritor1
parents:
diff changeset
112 bool v35; // [sp+34h] [bp-10h]@23
Ritor1
parents:
diff changeset
113 signed int v36; // [sp+38h] [bp-Ch]@17
Ritor1
parents:
diff changeset
114 signed int v37; // [sp+38h] [bp-Ch]@21
Ritor1
parents:
diff changeset
115 signed int v38; // [sp+38h] [bp-Ch]@42
Ritor1
parents:
diff changeset
116 signed int v39; // [sp+3Ch] [bp-8h]@1
Ritor1
parents:
diff changeset
117 signed int v40; // [sp+40h] [bp-4h]@1
Ritor1
parents:
diff changeset
118
Ritor1
parents:
diff changeset
119 dword_720ED0[0] = -1;
Ritor1
parents:
diff changeset
120 dword_720E80[0] = -1;
Ritor1
parents:
diff changeset
121 v4 = a1;
Ritor1
parents:
diff changeset
122 v5 = 0;
Ritor1
parents:
diff changeset
123 v40 = a2;
Ritor1
parents:
diff changeset
124 v31 = v4;
Ritor1
parents:
diff changeset
125 v39 = 1;
Ritor1
parents:
diff changeset
126 dword_720F20[0] = 10000;
Ritor1
parents:
diff changeset
127 if ( (signed int)pOutdoor->uNumBModels > 0 )
Ritor1
parents:
diff changeset
128 {
Ritor1
parents:
diff changeset
129 v29 = 0;
1807
Ritor1
parents: 1754
diff changeset
130 for ( v32 = 0; v32 < (signed int)pOutdoor->uNumBModels; ++v32 )
0
Ritor1
parents:
diff changeset
131 {
Ritor1
parents:
diff changeset
132 v6 = &pOutdoor->pBModels[v29];
Ritor1
parents:
diff changeset
133 if ( v4 <= pOutdoor->pBModels[v29].sMaxX )
Ritor1
parents:
diff changeset
134 {
Ritor1
parents:
diff changeset
135 if ( v4 >= v6->sMinX )
Ritor1
parents:
diff changeset
136 {
Ritor1
parents:
diff changeset
137 if ( v40 <= v6->sMaxY )
Ritor1
parents:
diff changeset
138 {
Ritor1
parents:
diff changeset
139 if ( v40 >= v6->sMinY )
Ritor1
parents:
diff changeset
140 {
Ritor1
parents:
diff changeset
141 v33 = v5;
Ritor1
parents:
diff changeset
142 v26 = v6->uNumFaces;
Ritor1
parents:
diff changeset
143 if ( (signed int)v6->uNumFaces > (signed int)v5 )
Ritor1
parents:
diff changeset
144 {
Ritor1
parents:
diff changeset
145 v30 = v5;
Ritor1
parents:
diff changeset
146 while ( 1 )
Ritor1
parents:
diff changeset
147 {
Ritor1
parents:
diff changeset
148 v7 = (ODMFace *)((char *)v6->pFaces + v30);
Ritor1
parents:
diff changeset
149 v8 = v7->uPolygonType;
Ritor1
parents:
diff changeset
150 if ( (v8 == 5 || v8 == 6)
Ritor1
parents:
diff changeset
151 && !(BYTE3(v7->uAttributes) & 0x20)
Ritor1
parents:
diff changeset
152 && v4 <= v7->pBoundingBox.x2
Ritor1
parents:
diff changeset
153 && v4 >= v7->pBoundingBox.x1
Ritor1
parents:
diff changeset
154 && v40 <= v7->pBoundingBox.y2
Ritor1
parents:
diff changeset
155 && v40 >= v7->pBoundingBox.y1 )
Ritor1
parents:
diff changeset
156 {
Ritor1
parents:
diff changeset
157 v36 = v5;
Ritor1
parents:
diff changeset
158 if ( v7->uNumVertices )
Ritor1
parents:
diff changeset
159 {
Ritor1
parents:
diff changeset
160 v9 = v7->pXInterceptDisplacements;
Ritor1
parents:
diff changeset
161 do
Ritor1
parents:
diff changeset
162 {
Ritor1
parents:
diff changeset
163 v10 = 2 * v36;
Ritor1
parents:
diff changeset
164 word_720DB0_xs[2 * v36] = *v9 + LOWORD(v6->pVertices.pVertices[*(v9 - 60)].x);
Ritor1
parents:
diff changeset
165 word_720CE0_ys[2 * v36] = v9[20] + LOWORD(v6->pVertices.pVertices[*(v9 - 60)].y);
Ritor1
parents:
diff changeset
166 word_720DB0_xs[2 * v36++ + 1] = *v9 + LOWORD(v6->pVertices.pVertices[*(v9 - 59)].x);
Ritor1
parents:
diff changeset
167 word_720CE0_ys[v10 + 1] = v9[20] + LOWORD(v6->pVertices.pVertices[*(v9 - 59)].y);
Ritor1
parents:
diff changeset
168 ++v9;
Ritor1
parents:
diff changeset
169 }
Ritor1
parents:
diff changeset
170 while ( v36 < v7->uNumVertices );
Ritor1
parents:
diff changeset
171 v4 = v31;
Ritor1
parents:
diff changeset
172 }
Ritor1
parents:
diff changeset
173 v27 = 2 * v7->uNumVertices;
Ritor1
parents:
diff changeset
174 word_720DB0_xs[2 * v7->uNumVertices] = word_720DB0_xs[0];
Ritor1
parents:
diff changeset
175 word_720CE0_ys[v27] = word_720CE0_ys[0];
Ritor1
parents:
diff changeset
176 v11 = 0;
Ritor1
parents:
diff changeset
177 v34 = word_720CE0_ys[0] >= v40;
Ritor1
parents:
diff changeset
178 v37 = 0;
Ritor1
parents:
diff changeset
179 v28 = 0;
Ritor1
parents:
diff changeset
180 if ( v27 > 0 )
Ritor1
parents:
diff changeset
181 {
Ritor1
parents:
diff changeset
182 do
Ritor1
parents:
diff changeset
183 {
Ritor1
parents:
diff changeset
184 if ( v37 >= 2 )
Ritor1
parents:
diff changeset
185 break;
Ritor1
parents:
diff changeset
186 v12 = v11;
Ritor1
parents:
diff changeset
187 v4 = v31;
Ritor1
parents:
diff changeset
188 v35 = word_720CE0_ys[v12 + 1] >= v40;
Ritor1
parents:
diff changeset
189 if ( v34 != v35 )
Ritor1
parents:
diff changeset
190 {
Ritor1
parents:
diff changeset
191 v13 = word_720DB0_xs[v12 + 1] >= v31 ? 0 : 2;
1110
cf6cd674c398 bitwise operator ambiguity reduced
Grumpy7
parents: 1104
diff changeset
192 v14 = v13 | (word_720DB0_xs[v12] < v31);
0
Ritor1
parents:
diff changeset
193 if ( v14 != 3 )
Ritor1
parents:
diff changeset
194 {
Ritor1
parents:
diff changeset
195 if ( !v14
Ritor1
parents:
diff changeset
196 || (v15 = word_720CE0_ys[v12],
Ritor1
parents:
diff changeset
197 v16 = word_720CE0_ys[v12 + 1] - v15,
Ritor1
parents:
diff changeset
198 v17 = v40 - v15,
Ritor1
parents:
diff changeset
199 LODWORD(v18) = v17 << 16,
Ritor1
parents:
diff changeset
200 HIDWORD(v18) = v17 >> 16,
Ritor1
parents:
diff changeset
201 (signed int)(((unsigned __int64)(((signed int)word_720DB0_xs[v12 + 1]
Ritor1
parents:
diff changeset
202 - (signed int)word_720DB0_xs[v12])
Ritor1
parents:
diff changeset
203 * v18
Ritor1
parents:
diff changeset
204 / v16) >> 16)
Ritor1
parents:
diff changeset
205 + word_720DB0_xs[v12]) >= v31) )
Ritor1
parents:
diff changeset
206 ++v37;
Ritor1
parents:
diff changeset
207 }
Ritor1
parents:
diff changeset
208 }
Ritor1
parents:
diff changeset
209 v11 = v28 + 1;
Ritor1
parents:
diff changeset
210 v34 = v35;
Ritor1
parents:
diff changeset
211 ++v28;
Ritor1
parents:
diff changeset
212 }
Ritor1
parents:
diff changeset
213 while ( v28 < v27 );
Ritor1
parents:
diff changeset
214 if ( v37 == 1 )
Ritor1
parents:
diff changeset
215 {
Ritor1
parents:
diff changeset
216 if ( v39 >= 20 )
Ritor1
parents:
diff changeset
217 break;
Ritor1
parents:
diff changeset
218 if ( v7->uPolygonType == 5 )
Ritor1
parents:
diff changeset
219 v19 = v6->pVertices.pVertices[v7->pVertexIDs[0]].z;
Ritor1
parents:
diff changeset
220 else
Ritor1
parents:
diff changeset
221 v19 = ((unsigned __int64)(v7->zCalc1 * (signed __int64)v4) >> 16)
Ritor1
parents:
diff changeset
222 + ((unsigned __int64)(v7->zCalc2 * (signed __int64)v40) >> 16)
Ritor1
parents:
diff changeset
223 + HIWORD(v7->zCalc3);
Ritor1
parents:
diff changeset
224 v20 = v39++;
Ritor1
parents:
diff changeset
225 dword_720F20[v20] = v19;
Ritor1
parents:
diff changeset
226 dword_720ED0[v20] = v32;
Ritor1
parents:
diff changeset
227 dword_720E80[v20] = v33;
Ritor1
parents:
diff changeset
228 }
Ritor1
parents:
diff changeset
229 }
Ritor1
parents:
diff changeset
230 }
Ritor1
parents:
diff changeset
231 ++v33;
Ritor1
parents:
diff changeset
232 v30 += 308;
Ritor1
parents:
diff changeset
233 if ( v33 >= v26 )
Ritor1
parents:
diff changeset
234 break;
Ritor1
parents:
diff changeset
235 v5 = 0;
Ritor1
parents:
diff changeset
236 }
Ritor1
parents:
diff changeset
237 }
Ritor1
parents:
diff changeset
238 }
Ritor1
parents:
diff changeset
239 }
Ritor1
parents:
diff changeset
240 }
Ritor1
parents:
diff changeset
241 }
1807
Ritor1
parents: 1754
diff changeset
242 //++v32;
0
Ritor1
parents:
diff changeset
243 ++v29;
Ritor1
parents:
diff changeset
244 v5 = 0;
Ritor1
parents:
diff changeset
245 }
1807
Ritor1
parents: 1754
diff changeset
246 //while ( v32 < (signed int)pOutdoor->uNumBModels );
0
Ritor1
parents:
diff changeset
247 if ( !v39 )
Ritor1
parents:
diff changeset
248 {
Ritor1
parents:
diff changeset
249 *(int *)a4 = 0;
Ritor1
parents:
diff changeset
250 return dword_720F20[0];
Ritor1
parents:
diff changeset
251 }
Ritor1
parents:
diff changeset
252 }
Ritor1
parents:
diff changeset
253 v22 = 0;
Ritor1
parents:
diff changeset
254 v38 = v5;
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
255 if ( v39 > (signed int)v5 )
0
Ritor1
parents:
diff changeset
256 {
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
257 v23 = 0;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
258 do
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
259 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
260 v24 = dword_720F20[v5 / 4];
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
261 v25 = *(int *)((char *)dword_720F20.data() + v23);
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
262 if ( v24 == v25 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
263 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
264 v22 = v38;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
265 v23 = v5;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
266 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
267 else if ( v25 > a3 + 15 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
268 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
269 if ( v24 < v25 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
270 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
271 v22 = v38;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
272 v23 = v5;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
273 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
274 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
275 else if ( v24 > v25 && v24 <= a3 + 15 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
276 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
277 v22 = v38;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
278 v23 = v5;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
279 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
280 ++v38;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
281 v5 += 4;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
282 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
283 while ( v38 < v39 );
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
284 if ( v22 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
285 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
286 *(int *)a4 = dword_720E80[v22] | (dword_720ED0[v22] << 6);
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
287 return dword_720F20[v22];
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
288 }
0
Ritor1
parents:
diff changeset
289 }
Ritor1
parents:
diff changeset
290 *(int *)a4 = 0;
Ritor1
parents:
diff changeset
291 return dword_720F20[v22];
Ritor1
parents:
diff changeset
292 }
Ritor1
parents:
diff changeset
293
Ritor1
parents:
diff changeset
294 //----- (0046DEF2) --------------------------------------------------------
Ritor1
parents:
diff changeset
295 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID)
Ritor1
parents:
diff changeset
296 {
Ritor1
parents:
diff changeset
297 unsigned int result; // eax@1
Ritor1
parents:
diff changeset
298
Ritor1
parents:
diff changeset
299 result = uLayingItemID;
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
300 if ( pObjectList->pObjects[pSpriteObjects[uLayingItemID].uObjectDescID].uFlags & 0x10 )
0
Ritor1
parents:
diff changeset
301 result = _46BFFA_check_object_intercept(uLayingItemID, a2);
Ritor1
parents:
diff changeset
302 return result;
Ritor1
parents:
diff changeset
303 }
Ritor1
parents:
diff changeset
304
Ritor1
parents:
diff changeset
305 //----- (0046E0B2) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
306 void _46E0B2_collide_against_decorations()
0
Ritor1
parents:
diff changeset
307 {
Ritor1
parents:
diff changeset
308 BLVSector *v0; // ebp@1
Ritor1
parents:
diff changeset
309 LevelDecoration *v1; // edi@2
Ritor1
parents:
diff changeset
310 DecorationDesc *v2; // esi@3
Ritor1
parents:
diff changeset
311 int v3; // edx@4
Ritor1
parents:
diff changeset
312 int v4; // eax@4
Ritor1
parents:
diff changeset
313 int v5; // ecx@6
Ritor1
parents:
diff changeset
314 int v6; // ebx@8
Ritor1
parents:
diff changeset
315 int v7; // esi@8
Ritor1
parents:
diff changeset
316 int v8; // ebx@10
Ritor1
parents:
diff changeset
317 int v9; // esi@11
Ritor1
parents:
diff changeset
318 int v10; // edi@12
Ritor1
parents:
diff changeset
319 int v11; // eax@12
Ritor1
parents:
diff changeset
320 int v12; // esi@14
Ritor1
parents:
diff changeset
321 unsigned int v13; // eax@17
Ritor1
parents:
diff changeset
322 signed int i; // [sp+4h] [bp-14h]@1
Ritor1
parents:
diff changeset
323 int v15; // [sp+8h] [bp-10h]@10
Ritor1
parents:
diff changeset
324 int v16; // [sp+Ch] [bp-Ch]@10
Ritor1
parents:
diff changeset
325 int v17; // [sp+10h] [bp-8h]@10
Ritor1
parents:
diff changeset
326 int v18; // [sp+14h] [bp-4h]@8
Ritor1
parents:
diff changeset
327
Ritor1
parents:
diff changeset
328 v0 = &pIndoor->pSectors[stru_721530.uSectorID];
Ritor1
parents:
diff changeset
329 for ( i = 0; i < v0->uNumDecorations; ++i )
Ritor1
parents:
diff changeset
330 {
Ritor1
parents:
diff changeset
331 v1 = &pLevelDecorations[v0->pDecorationIDs[i]];
1489
a27cdb3d753e Cleanup of LevelDecoration and related.
yoctozepto
parents: 1477
diff changeset
332 if (!(v1->uFlags & LEVEL_DECORATION_INVISIBLE))
0
Ritor1
parents:
diff changeset
333 {
Ritor1
parents:
diff changeset
334 v2 = &pDecorationList->pDecorations[v1->uDecorationDescID];
380
2f67762d04f6 DecorationDesc: flags -> methods
Nomad
parents: 373
diff changeset
335 if (!v2->CanMoveThrough())
0
Ritor1
parents:
diff changeset
336 {
Ritor1
parents:
diff changeset
337 v3 = v2->uRadius;
Ritor1
parents:
diff changeset
338 v4 = v1->vPosition.x;
Ritor1
parents:
diff changeset
339 if ( stru_721530.sMaxX <= v4 + v3 )
Ritor1
parents:
diff changeset
340 {
Ritor1
parents:
diff changeset
341 if ( stru_721530.sMinX >= v4 - v3 )
Ritor1
parents:
diff changeset
342 {
Ritor1
parents:
diff changeset
343 v5 = v1->vPosition.y;
Ritor1
parents:
diff changeset
344 if ( stru_721530.sMaxY <= v5 + v3 )
Ritor1
parents:
diff changeset
345 {
Ritor1
parents:
diff changeset
346 if ( stru_721530.sMinY >= v5 - v3 )
Ritor1
parents:
diff changeset
347 {
Ritor1
parents:
diff changeset
348 v6 = v2->uDecorationHeight;
Ritor1
parents:
diff changeset
349 v7 = v1->vPosition.z;
Ritor1
parents:
diff changeset
350 v18 = v6;
Ritor1
parents:
diff changeset
351 if ( stru_721530.sMaxZ <= v7 + v6 )
Ritor1
parents:
diff changeset
352 {
Ritor1
parents:
diff changeset
353 if ( stru_721530.sMinZ >= v7 )
Ritor1
parents:
diff changeset
354 {
Ritor1
parents:
diff changeset
355 v16 = v4 - stru_721530.normal.x;
Ritor1
parents:
diff changeset
356 v15 = v5 - stru_721530.normal.y;
Ritor1
parents:
diff changeset
357 v8 = stru_721530.prolly_normal_d + v3;
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
358 v17 = ((v4 - stru_721530.normal.x) * stru_721530.direction.y
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
359 - (v5 - stru_721530.normal.y) * stru_721530.direction.x) >> 16;
0
Ritor1
parents:
diff changeset
360 if ( abs(v17) <= stru_721530.prolly_normal_d + v3 )
Ritor1
parents:
diff changeset
361 {
1546
9a6567c6c76c stru141 & misc cleaning
Nomad
parents: 1545
diff changeset
362 v9 = (v16 * stru_721530.direction.x + v15 * stru_721530.direction.y) >> 16;
0
Ritor1
parents:
diff changeset
363 if ( v9 > 0 )
Ritor1
parents:
diff changeset
364 {
Ritor1
parents:
diff changeset
365 v10 = v1->vPosition.z;
1643
7182930263b3 fixpoint functions renaming
zipi
parents: 1640
diff changeset
366 v11 = stru_721530.normal.z + fixpoint_mul(stru_721530.direction.z, v9);
0
Ritor1
parents:
diff changeset
367 if ( v11 >= v10 )
Ritor1
parents:
diff changeset
368 {
Ritor1
parents:
diff changeset
369 if ( v11 <= v18 + v10 )
Ritor1
parents:
diff changeset
370 {
295
640a176c030f sub_42ECB5
Nomad
parents: 267
diff changeset
371 v12 = v9 - integer_sqrt(v8 * v8 - v17 * v17);
0
Ritor1
parents:
diff changeset
372 if ( v12 < 0 )
Ritor1
parents:
diff changeset
373 v12 = 0;
Ritor1
parents:
diff changeset
374 if ( v12 < stru_721530.field_7C )
Ritor1
parents:
diff changeset
375 {
Ritor1
parents:
diff changeset
376 stru_721530.field_7C = v12;
Ritor1
parents:
diff changeset
377 v13 = 8 * v0->pDecorationIDs[i];
Ritor1
parents:
diff changeset
378 LOBYTE(v13) = v13 | 5;
Ritor1
parents:
diff changeset
379 stru_721530.uFaceID = v13;
Ritor1
parents:
diff changeset
380 }
Ritor1
parents:
diff changeset
381 }
Ritor1
parents:
diff changeset
382 }
Ritor1
parents:
diff changeset
383 }
Ritor1
parents:
diff changeset
384 }
Ritor1
parents:
diff changeset
385 }
Ritor1
parents:
diff changeset
386 }
Ritor1
parents:
diff changeset
387 }
Ritor1
parents:
diff changeset
388 }
Ritor1
parents:
diff changeset
389 }
Ritor1
parents:
diff changeset
390 }
Ritor1
parents:
diff changeset
391 }
Ritor1
parents:
diff changeset
392 }
Ritor1
parents:
diff changeset
393 }
Ritor1
parents:
diff changeset
394 }
Ritor1
parents:
diff changeset
395
Ritor1
parents:
diff changeset
396 //----- (00487DA9) --------------------------------------------------------
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
397 void sub_487DA9()
0
Ritor1
parents:
diff changeset
398 {
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
399 for (int i = 0; i < 20000; ++i)
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
400 array_77EC08[i].field_108 = 0;
0
Ritor1
parents:
diff changeset
401 }
Ritor1
parents:
diff changeset
402
Ritor1
parents:
diff changeset
403 //----- (0048A959) --------------------------------------------------------
2006
30c2b575d25c signed fixes
zipi
parents: 1980
diff changeset
404 signed int ReplaceHSV(unsigned int uColor, float h_replace, float s_replace, float v_replace)
0
Ritor1
parents:
diff changeset
405 {
Ritor1
parents:
diff changeset
406 float r = ((uColor & 0x00FF0000) >> 16) / 255.0f,
Ritor1
parents:
diff changeset
407 g = ((uColor & 0x0000FF00) >> 8) / 255.0f,
Ritor1
parents:
diff changeset
408 b = (uColor & 0x000000FF) / 255.0f;
Ritor1
parents:
diff changeset
409
Ritor1
parents:
diff changeset
410 float h, s, v;
Ritor1
parents:
diff changeset
411 RGB2HSV(&h, &s, r, g, b, &v);
Ritor1
parents:
diff changeset
412
Ritor1
parents:
diff changeset
413 if ( h_replace != -1.0 )
Ritor1
parents:
diff changeset
414 h = h_replace;
Ritor1
parents:
diff changeset
415 if ( s_replace != -1.0 )
Ritor1
parents:
diff changeset
416 s = s_replace;
Ritor1
parents:
diff changeset
417 if ( v_replace != -1.0 )
Ritor1
parents:
diff changeset
418 v = v_replace;
Ritor1
parents:
diff changeset
419 HSV2RGB(&r, &g, &b, h, s, v);
Ritor1
parents:
diff changeset
420
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
421 return (((uint)round(r * 255.0f) & 0xFF) << 16) |
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
422 (((uint)round(g * 255.0f) & 0xFF) << 8) |
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
423 (((uint)round(b * 255.0f) & 0xFF));
0
Ritor1
parents:
diff changeset
424 }
Ritor1
parents:
diff changeset
425
Ritor1
parents:
diff changeset
426 //----- (0048B561) --------------------------------------------------------
1029
c94d6a37d298 Pointing a face with mouse fixed.
Nomad
parents: 1026
diff changeset
427 int fixpoint_from_float(float val)
0
Ritor1
parents:
diff changeset
428 {
1029
c94d6a37d298 Pointing a face with mouse fixed.
Nomad
parents: 1026
diff changeset
429 // float X.Yf -> int XXXX YYYY
c94d6a37d298 Pointing a face with mouse fixed.
Nomad
parents: 1026
diff changeset
430 int left = floorf((val - 0.5f) + 0.5f);
c94d6a37d298 Pointing a face with mouse fixed.
Nomad
parents: 1026
diff changeset
431 int right = floorf((val - left) * 65536.0f);
c94d6a37d298 Pointing a face with mouse fixed.
Nomad
parents: 1026
diff changeset
432 return (left << 16) | right;
0
Ritor1
parents:
diff changeset
433 }
Ritor1
parents:
diff changeset
434
1640
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
435 int fixpoint_from_int(int lhv, int rhv)
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
436 {
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
437 return (lhv << 16) | rhv;
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
438 }
afc1c3514dd5 Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
Nomad
parents: 1638
diff changeset
439
0
Ritor1
parents:
diff changeset
440 //----- (00491E3A) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
441 void sub_491E3A()
0
Ritor1
parents:
diff changeset
442 {
Ritor1
parents:
diff changeset
443 Player *v0; // ebx@1
Ritor1
parents:
diff changeset
444 signed int v1; // esi@3
Ritor1
parents:
diff changeset
445 char *v2; // eax@4
Ritor1
parents:
diff changeset
446 unsigned int v3; // eax@7
Ritor1
parents:
diff changeset
447 unsigned int v4; // edx@8
Ritor1
parents:
diff changeset
448 char *v5; // ecx@9
Ritor1
parents:
diff changeset
449 int v6; // edi@17
Ritor1
parents:
diff changeset
450 Texture *v7; // ebx@18
Ritor1
parents:
diff changeset
451 struct IDirect3DTexture2 **v8; // eax@19
Ritor1
parents:
diff changeset
452 struct IDirect3DTexture2 *v9; // eax@20
Ritor1
parents:
diff changeset
453 struct IDirectDrawSurface **v10; // eax@22
Ritor1
parents:
diff changeset
454 struct IDirectDrawSurface *v11; // eax@23
Ritor1
parents:
diff changeset
455 int v12; // eax@26
Ritor1
parents:
diff changeset
456
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
457 v0 = pParty->pPlayers.data();
0
Ritor1
parents:
diff changeset
458 do
Ritor1
parents:
diff changeset
459 {
203
0c64754c7fd4 Voices work (at least in party creation screen)
Nomad
parents: 198
diff changeset
460 if (SoundSetAction[24][0])
0
Ritor1
parents:
diff changeset
461 {
Ritor1
parents:
diff changeset
462 v1 = 0;
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
463 if ( (signed int)pSoundList->sNumSounds <= 0 )
0
Ritor1
parents:
diff changeset
464 {
Ritor1
parents:
diff changeset
465 LABEL_7:
Ritor1
parents:
diff changeset
466 v3 = 0;
Ritor1
parents:
diff changeset
467 }
Ritor1
parents:
diff changeset
468 else
Ritor1
parents:
diff changeset
469 {
Ritor1
parents:
diff changeset
470 v2 = (char *)&pSoundList->pSounds->uSoundID;
203
0c64754c7fd4 Voices work (at least in party creation screen)
Nomad
parents: 198
diff changeset
471 while ( *(int *)v2 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4998 )
0
Ritor1
parents:
diff changeset
472 {
Ritor1
parents:
diff changeset
473 ++v1;
Ritor1
parents:
diff changeset
474 v2 += 120;
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
475 if ( v1 >= (signed int)pSoundList->sNumSounds )
0
Ritor1
parents:
diff changeset
476 goto LABEL_7;
Ritor1
parents:
diff changeset
477 }
Ritor1
parents:
diff changeset
478 v3 = v1;
Ritor1
parents:
diff changeset
479 }
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
480 pSoundList->UnloadSound(v3, 1);
0
Ritor1
parents:
diff changeset
481 v4 = 0;
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
482 if ( (signed int)pSoundList->sNumSounds <= 0 )
0
Ritor1
parents:
diff changeset
483 {
Ritor1
parents:
diff changeset
484 LABEL_12:
Ritor1
parents:
diff changeset
485 v4 = 0;
Ritor1
parents:
diff changeset
486 }
Ritor1
parents:
diff changeset
487 else
Ritor1
parents:
diff changeset
488 {
Ritor1
parents:
diff changeset
489 v5 = (char *)&pSoundList->pSounds->uSoundID;
203
0c64754c7fd4 Voices work (at least in party creation screen)
Nomad
parents: 198
diff changeset
490 while ( *(int *)v5 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4999 )
0
Ritor1
parents:
diff changeset
491 {
Ritor1
parents:
diff changeset
492 ++v4;
Ritor1
parents:
diff changeset
493 v5 += 120;
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
494 if ( (signed int)v4 >= (signed int)pSoundList->sNumSounds )
0
Ritor1
parents:
diff changeset
495 goto LABEL_12;
Ritor1
parents:
diff changeset
496 }
Ritor1
parents:
diff changeset
497 }
764
90bcfb56c8f9 sound cleaning
Gloval
parents: 761
diff changeset
498 pSoundList->UnloadSound(v4, 1);
0
Ritor1
parents:
diff changeset
499 }
Ritor1
parents:
diff changeset
500 ++v0;
Ritor1
parents:
diff changeset
501 }
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
502 while ( (signed int)v0 < (signed int)pParty->pHirelings.data() );
0
Ritor1
parents:
diff changeset
503 v6 = pIcons_LOD->uNumLoadedFiles - 1;
33
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
504 if ( v6 >= pIcons_LOD->pFacesLock )
0
Ritor1
parents:
diff changeset
505 {
Ritor1
parents:
diff changeset
506 v7 = &pIcons_LOD->pTextures[v6];
Ritor1
parents:
diff changeset
507 do
Ritor1
parents:
diff changeset
508 {
Ritor1
parents:
diff changeset
509 v7->Release();
Ritor1
parents:
diff changeset
510 v8 = pIcons_LOD->pHardwareTextures;
Ritor1
parents:
diff changeset
511 if ( v8 )
Ritor1
parents:
diff changeset
512 {
Ritor1
parents:
diff changeset
513 v9 = v8[v6];
Ritor1
parents:
diff changeset
514 if ( v9 )
Ritor1
parents:
diff changeset
515 {
Ritor1
parents:
diff changeset
516 v9->Release();
Ritor1
parents:
diff changeset
517 pIcons_LOD->pHardwareTextures[v6] = 0;
Ritor1
parents:
diff changeset
518 }
Ritor1
parents:
diff changeset
519 }
Ritor1
parents:
diff changeset
520 v10 = pIcons_LOD->pHardwareSurfaces;
Ritor1
parents:
diff changeset
521 if ( v10 )
Ritor1
parents:
diff changeset
522 {
Ritor1
parents:
diff changeset
523 v11 = v10[v6];
Ritor1
parents:
diff changeset
524 if ( v11 )
Ritor1
parents:
diff changeset
525 {
Ritor1
parents:
diff changeset
526 v11->Release();
Ritor1
parents:
diff changeset
527 pIcons_LOD->pHardwareSurfaces[v6] = 0;
Ritor1
parents:
diff changeset
528 }
Ritor1
parents:
diff changeset
529 }
Ritor1
parents:
diff changeset
530 --v6;
Ritor1
parents:
diff changeset
531 --v7;
Ritor1
parents:
diff changeset
532 }
33
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
533 while ( v6 >= pIcons_LOD->pFacesLock );
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
534 }
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
535 v12 = pIcons_LOD->pFacesLock;
a9e9c6989d04 20.01.13
Ritor1
parents: 8
diff changeset
536 pIcons_LOD->pFacesLock = 0;
0
Ritor1
parents:
diff changeset
537 pIcons_LOD->uNumLoadedFiles = v12;
Ritor1
parents:
diff changeset
538 }
Ritor1
parents:
diff changeset
539 // 4ED498: using guessed type char byte_4ED498;
Ritor1
parents:
diff changeset
540
Ritor1
parents:
diff changeset
541 //----- (00493938) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
542 int _493938_regenerate()
0
Ritor1
parents:
diff changeset
543 {
Ritor1
parents:
diff changeset
544 int v0; // edi@1
Ritor1
parents:
diff changeset
545 signed __int64 v1; // qax@1
Ritor1
parents:
diff changeset
546 int v2; // ecx@1
Ritor1
parents:
diff changeset
547 int result; // eax@1
Ritor1
parents:
diff changeset
548 int v4; // eax@2
Ritor1
parents:
diff changeset
549 int v5; // edi@5
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
550 bool cursed_flag; // ecx@5
0
Ritor1
parents:
diff changeset
551 char v7; // sf@5
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
552 int *v8; // ecx@10
0
Ritor1
parents:
diff changeset
553 int v9; // edi@15
Ritor1
parents:
diff changeset
554 signed int v10; // eax@15
Ritor1
parents:
diff changeset
555 __int16 *v11; // edx@16
Ritor1
parents:
diff changeset
556 int v12; // eax@20
Ritor1
parents:
diff changeset
557 int v13; // ebx@20
Ritor1
parents:
diff changeset
558 unsigned int *v14; // esi@21
Ritor1
parents:
diff changeset
559 unsigned int v15; // ecx@21
Ritor1
parents:
diff changeset
560 unsigned int v16; // eax@21
Ritor1
parents:
diff changeset
561 int v17; // edx@21
Ritor1
parents:
diff changeset
562 int v18; // eax@21
Ritor1
parents:
diff changeset
563 signed int v19; // eax@21
Ritor1
parents:
diff changeset
564 signed int v20; // ebx@25
Ritor1
parents:
diff changeset
565 Player *v21; // esi@25
Ritor1
parents:
diff changeset
566 ITEM_EQUIP_TYPE v22; // edi@30
Ritor1
parents:
diff changeset
567 //int v23; // edx@31
Ritor1
parents:
diff changeset
568 signed int v24; // ecx@32
Ritor1
parents:
diff changeset
569 signed int v25; // eax@33
Ritor1
parents:
diff changeset
570 int v26; // eax@35
Ritor1
parents:
diff changeset
571 int v27; // eax@36
Ritor1
parents:
diff changeset
572 int v28; // eax@37
Ritor1
parents:
diff changeset
573 int v29; // eax@40
Ritor1
parents:
diff changeset
574 int v30; // eax@41
Ritor1
parents:
diff changeset
575 signed int v31; // ecx@53
Ritor1
parents:
diff changeset
576 char *v32; // eax@53
Ritor1
parents:
diff changeset
577 char *v33; // edi@82
Ritor1
parents:
diff changeset
578 int v34; // ecx@88
Ritor1
parents:
diff changeset
579 int v35; // eax@88
Ritor1
parents:
diff changeset
580 char *v36; // edi@99
Ritor1
parents:
diff changeset
581 int v37; // edi@104
Ritor1
parents:
diff changeset
582 int v38; // edi@106
Ritor1
parents:
diff changeset
583 int v39; // edi@111
Ritor1
parents:
diff changeset
584 int v40; // ecx@113
Ritor1
parents:
diff changeset
585 char v41[400]; // [sp+4h] [bp-22Ch]@20
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
586 SpriteObject a1; // [sp+194h] [bp-9Ch]@15
0
Ritor1
parents:
diff changeset
587 Vec3_int_ a3; // [sp+204h] [bp-2Ch]@15
Ritor1
parents:
diff changeset
588 int v44; // [sp+210h] [bp-20h]@22
Ritor1
parents:
diff changeset
589 int v45; // [sp+214h] [bp-1Ch]@25
Ritor1
parents:
diff changeset
590 int v46; // [sp+218h] [bp-18h]@25
Ritor1
parents:
diff changeset
591 int v47; // [sp+21Ch] [bp-14h]@25
Ritor1
parents:
diff changeset
592 int v48; // [sp+220h] [bp-10h]@25
Ritor1
parents:
diff changeset
593 int v49; // [sp+224h] [bp-Ch]@24
Ritor1
parents:
diff changeset
594 int v50; // [sp+228h] [bp-8h]@25
Ritor1
parents:
diff changeset
595 int v51; // [sp+22Ch] [bp-4h]@2
Ritor1
parents:
diff changeset
596
Ritor1
parents:
diff changeset
597 v0 = (signed int)(signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60;
Ritor1
parents:
diff changeset
598 v1 = (signed __int64)((double)pParty->uLastRegenerationTime * 0.234375);
Ritor1
parents:
diff changeset
599 v2 = (signed int)v1 / 60;
Ritor1
parents:
diff changeset
600 result = (signed int)v1 / 60 + 5;
Ritor1
parents:
diff changeset
601 if ( v0 >= result )
Ritor1
parents:
diff changeset
602 {
Ritor1
parents:
diff changeset
603 v51 = 0;
Ritor1
parents:
diff changeset
604 v4 = (v0 - v2) / 5;
Ritor1
parents:
diff changeset
605 if (pParty->FlyActive())
Ritor1
parents:
diff changeset
606 {
Ritor1
parents:
diff changeset
607 if ( pParty->bFlying )
Ritor1
parents:
diff changeset
608 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
609 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
610 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
611 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower;
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
612 cursed_flag = pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster - 1].pConditions[0];//cursed
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
613 v7 = cursed_flag < v5;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
614 //cursed_flag -= v5;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
615 if ( !v7 )
0
Ritor1
parents:
diff changeset
616 {
Ritor1
parents:
diff changeset
617 pParty->uFlags &= 0xFFFFFFBFu;
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
618 pParty->bFlying = false;
0
Ritor1
parents:
diff changeset
619 v51 = 1;
Ritor1
parents:
diff changeset
620 }
Ritor1
parents:
diff changeset
621 }
Ritor1
parents:
diff changeset
622 }
Ritor1
parents:
diff changeset
623 }
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
624
0
Ritor1
parents:
diff changeset
625 if (pParty->WaterWalkActive())
Ritor1
parents:
diff changeset
626 {
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
627 if (pParty->uFlags & PARTY_FLAGS_1_STANDING_ON_WATER )
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
628 {
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
629 if ( !(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) )
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
630 { // taking on water
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
631 //__debugbreak();
2023
beb97b20c3ed ODM_ProcessPartyActions() continued refactoring
Ritor1
parents: 2006
diff changeset
632 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster - 1].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster + 2000];
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
633 v7 = *v8 < v4;
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
634 *v8 -= v4;
0
Ritor1
parents:
diff changeset
635 if ( v7 )
Ritor1
parents:
diff changeset
636 {
112
909822c91d47 pointer fixes
zipi
parents: 102
diff changeset
637 *v8 = 0;
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
638 pParty->uFlags &= ~PARTY_FLAGS_1_STANDING_ON_WATER;
0
Ritor1
parents:
diff changeset
639 v51 = 1;
Ritor1
parents:
diff changeset
640 }
Ritor1
parents:
diff changeset
641 }
Ritor1
parents:
diff changeset
642 }
Ritor1
parents:
diff changeset
643 }
569
f451efdb7c8b * Party buff icons drawing (right panel)
Nomad
parents: 566
diff changeset
644
0
Ritor1
parents:
diff changeset
645 if (pParty->ImmolationActive())
Ritor1
parents:
diff changeset
646 {
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
647 //SpriteObject::SpriteObject(&a1);
0
Ritor1
parents:
diff changeset
648 v9 = 0;
Ritor1
parents:
diff changeset
649 a3.z = 0;
Ritor1
parents:
diff changeset
650 a3.y = 0;
Ritor1
parents:
diff changeset
651 a3.x = 0;
Ritor1
parents:
diff changeset
652 a1.stru_24.Reset();
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
653 a1.spell_level = pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uPower;
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
654 a1.spell_skill = pParty->ImmolationSkillLevel();
0
Ritor1
parents:
diff changeset
655 v10 = 0;
515
cb0ad52d6a26 LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
Nomad
parents: 510
diff changeset
656 a1.uType = 1070;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
657 a1.spell_id = SPELL_FIRE_IMMOLATION;
0
Ritor1
parents:
diff changeset
658 if ( (signed int)pObjectList->uNumObjects <= 0 )
Ritor1
parents:
diff changeset
659 {
Ritor1
parents:
diff changeset
660 LABEL_19:
Ritor1
parents:
diff changeset
661 LOWORD(v10) = 0;
Ritor1
parents:
diff changeset
662 }
Ritor1
parents:
diff changeset
663 else
Ritor1
parents:
diff changeset
664 {
Ritor1
parents:
diff changeset
665 v11 = &pObjectList->pObjects->uObjectID;
924
a78f08dbeb88 CastSpellInfo
Ritor1
parents: 917
diff changeset
666 while ( stru_4E3ACC[8].uType != *v11 )
0
Ritor1
parents:
diff changeset
667 {
Ritor1
parents:
diff changeset
668 ++v10;
Ritor1
parents:
diff changeset
669 v11 += 28;
Ritor1
parents:
diff changeset
670 if ( v10 >= (signed int)pObjectList->uNumObjects )
Ritor1
parents:
diff changeset
671 goto LABEL_19;
Ritor1
parents:
diff changeset
672 }
Ritor1
parents:
diff changeset
673 }
Ritor1
parents:
diff changeset
674 a1.uObjectDescID = v10;
Ritor1
parents:
diff changeset
675 a1.field_60_distance_related_prolly_lod = 0;
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
676 v12 = 8 * pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uCaster;
303
3dcc9d945eeb DamageMonsterFromParty
Nomad
parents: 296
diff changeset
677 LOBYTE(v12) = v12 | OBJECT_Player;
0
Ritor1
parents:
diff changeset
678 a1.uAttributes = 0;
Ritor1
parents:
diff changeset
679 a1.uSectorID = 0;
Ritor1
parents:
diff changeset
680 a1.uSpriteFrameID = 0;
822
c232f160e6f3 Named SpriteObject spell-related fields.
Nomad
parents: 819
diff changeset
681 a1.spell_caster_pid = v12;
0
Ritor1
parents:
diff changeset
682 a1.uFacing = 0;
Ritor1
parents:
diff changeset
683 a1.uSoundID = 0;
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
684 v13 = _46A89E_immolation_effect((int)v41, 100, 307);
0
Ritor1
parents:
diff changeset
685 if ( v13 > 0 )
Ritor1
parents:
diff changeset
686 {
Ritor1
parents:
diff changeset
687 do
Ritor1
parents:
diff changeset
688 {
Ritor1
parents:
diff changeset
689 v14 = (unsigned int *)&v41[4 * v9];
Ritor1
parents:
diff changeset
690 v15 = *v14;
Ritor1
parents:
diff changeset
691 v16 = *v14;
Ritor1
parents:
diff changeset
692 a1.vPosition.x = pActors[v16].vPosition.x;
Ritor1
parents:
diff changeset
693 v17 = pActors[v16].vPosition.y;
Ritor1
parents:
diff changeset
694 a1.vPosition.z = pActors[v16].vPosition.z;
Ritor1
parents:
diff changeset
695 v18 = 8 * v15;
862
f4394e320312 * PID mistake fixed
zipi
parents: 860
diff changeset
696 LOBYTE(v18) = PID(OBJECT_Actor,v15);
0
Ritor1
parents:
diff changeset
697 a1.vPosition.y = v17;
823
c1da83d8223f More spell renames
Nomad
parents: 822
diff changeset
698 a1.spell_target_pid = v18;
0
Ritor1
parents:
diff changeset
699 v19 = a1.Create(0, 0, 0, 0);
862
f4394e320312 * PID mistake fixed
zipi
parents: 860
diff changeset
700 DamageMonsterFromParty(PID(OBJECT_Item,v19), *v14, &a3);
0
Ritor1
parents:
diff changeset
701 ++v9;
Ritor1
parents:
diff changeset
702 }
Ritor1
parents:
diff changeset
703 while ( v9 < v13 );
Ritor1
parents:
diff changeset
704 }
Ritor1
parents:
diff changeset
705 }
Ritor1
parents:
diff changeset
706 v44 = 0;
248
37dcbe8f3cca Dialogue stuff
Nomad
parents: 232
diff changeset
707 if (PartyHasDragon())
0
Ritor1
parents:
diff changeset
708 v44 = 1;
Ritor1
parents:
diff changeset
709 v49 = 0;
Ritor1
parents:
diff changeset
710 LABEL_25:
Ritor1
parents:
diff changeset
711 v20 = 0;
Ritor1
parents:
diff changeset
712 v21 = &pParty->pPlayers[v49];
Ritor1
parents:
diff changeset
713 v50 = 0;
Ritor1
parents:
diff changeset
714 v47 = 0;
Ritor1
parents:
diff changeset
715 v45 = 0;
Ritor1
parents:
diff changeset
716 v48 = 0;
Ritor1
parents:
diff changeset
717 v46 = 0;
255
0a37a56e9f02 sprintfex & classes enum
Nomad
parents: 254
diff changeset
718 if ( v44 && v21->classType == PLAYER_CLASS_WARLOCK )
0
Ritor1
parents:
diff changeset
719 v50 = 1;
135
9b0d651821f1 Party creation screen: sorcerer class icon fixed
Nomad
parents: 130
diff changeset
720 if ( v21->classType == PLAYER_CLASS_LICH )
0
Ritor1
parents:
diff changeset
721 v48 = 1;
Ritor1
parents:
diff changeset
722 v22 = (ITEM_EQUIP_TYPE)0;
Ritor1
parents:
diff changeset
723 while ( 1 )
Ritor1
parents:
diff changeset
724 {
Ritor1
parents:
diff changeset
725 if ( v21->HasItemEquipped(v22) )
Ritor1
parents:
diff changeset
726 {
Ritor1
parents:
diff changeset
727 //v23 = v21->pEquipment.pIndices;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
728 uint _idx = v21->pEquipment.pIndices[v22];
1384
b51332ab228f changed a few member variables in Player to slightly less confusing names
Grumpy7
parents: 1372
diff changeset
729 v24 = v21->pInventoryItemList[_idx].uItemID;
0
Ritor1
parents:
diff changeset
730 if ( v24 > 134 )
Ritor1
parents:
diff changeset
731 {
Ritor1
parents:
diff changeset
732 if ( v24 == 529 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
733 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
734 v20 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
735 v50 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
736 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
737 }
0
Ritor1
parents:
diff changeset
738 if ( v24 == 535 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
739 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
740 v20 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
741 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
742 }
0
Ritor1
parents:
diff changeset
743 if ( v24 == 515 )
Ritor1
parents:
diff changeset
744 {
Ritor1
parents:
diff changeset
745 v47 = 1;
Ritor1
parents:
diff changeset
746 }
Ritor1
parents:
diff changeset
747 else
Ritor1
parents:
diff changeset
748 {
Ritor1
parents:
diff changeset
749 if ( v24 == 532 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
750 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
751 v50 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
752 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
753 }
0
Ritor1
parents:
diff changeset
754 }
Ritor1
parents:
diff changeset
755 }
Ritor1
parents:
diff changeset
756 else
Ritor1
parents:
diff changeset
757 {
1384
b51332ab228f changed a few member variables in Player to slightly less confusing names
Grumpy7
parents: 1372
diff changeset
758 v25 = v21->pInventoryItemList[_idx].uSpecEnchantmentType;
0
Ritor1
parents:
diff changeset
759 if ( v25 <= 50 )
Ritor1
parents:
diff changeset
760 {
Ritor1
parents:
diff changeset
761 if ( v25 != 50 )
Ritor1
parents:
diff changeset
762 {
Ritor1
parents:
diff changeset
763 v26 = v25 - 37;
Ritor1
parents:
diff changeset
764 if ( v26 )
Ritor1
parents:
diff changeset
765 {
Ritor1
parents:
diff changeset
766 v27 = v26 - 1;
Ritor1
parents:
diff changeset
767 if ( !v27 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
768 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
769 v50 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
770 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
771 }
0
Ritor1
parents:
diff changeset
772 v28 = v27 - 6;
Ritor1
parents:
diff changeset
773 if ( v28 )
Ritor1
parents:
diff changeset
774 {
Ritor1
parents:
diff changeset
775 if ( v28 != 3 )
Ritor1
parents:
diff changeset
776 goto LABEL_51;
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
777 //LABEL_50:
0
Ritor1
parents:
diff changeset
778 v50 = 1;
Ritor1
parents:
diff changeset
779 goto LABEL_51;
Ritor1
parents:
diff changeset
780 }
Ritor1
parents:
diff changeset
781 }
Ritor1
parents:
diff changeset
782 }
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
783 //LABEL_44:
0
Ritor1
parents:
diff changeset
784 v20 = 1;
Ritor1
parents:
diff changeset
785 goto LABEL_51;
Ritor1
parents:
diff changeset
786 }
Ritor1
parents:
diff changeset
787 v29 = v25 - 54;
Ritor1
parents:
diff changeset
788 if ( !v29 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
789 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
790 v20 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
791 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
792 }
0
Ritor1
parents:
diff changeset
793 v30 = v29 - 1;
Ritor1
parents:
diff changeset
794 if ( !v30 )
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
795 {
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
796 v50 = 1;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
797 goto LABEL_51;
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
798 }
0
Ritor1
parents:
diff changeset
799 if ( v30 == 11 )
Ritor1
parents:
diff changeset
800 {
2030
47ab41698f9d sudden drop in flight fix
Ritor1
parents: 2023
diff changeset
801 //LABEL_43:
0
Ritor1
parents:
diff changeset
802 v20 = 1;
Ritor1
parents:
diff changeset
803 v50 = 1;
Ritor1
parents:
diff changeset
804 goto LABEL_51;
Ritor1
parents:
diff changeset
805 }
Ritor1
parents:
diff changeset
806 }
Ritor1
parents:
diff changeset
807 }
Ritor1
parents:
diff changeset
808 LABEL_51:
Ritor1
parents:
diff changeset
809 v22 = (ITEM_EQUIP_TYPE)((int)v22 + 1);
Ritor1
parents:
diff changeset
810 if ( (signed int)v22 >= 16 )
Ritor1
parents:
diff changeset
811 {
Ritor1
parents:
diff changeset
812 if ( v48 )
Ritor1
parents:
diff changeset
813 {
Ritor1
parents:
diff changeset
814 v31 = 0;
1826
bdac32c645c5 Changing arrays in class Player to std::array
Grumpy7
parents: 1808
diff changeset
815 v32 = (char *)v21->pInventoryItemList.data();
0
Ritor1
parents:
diff changeset
816 while ( *(int *)v32 != 601 || (unsigned __int8)v32[26] != v49 + 1 )
Ritor1
parents:
diff changeset
817 {
Ritor1
parents:
diff changeset
818 ++v31;
Ritor1
parents:
diff changeset
819 v32 += 36;
Ritor1
parents:
diff changeset
820 if ( v31 >= 138 )
Ritor1
parents:
diff changeset
821 goto LABEL_59;
Ritor1
parents:
diff changeset
822 }
Ritor1
parents:
diff changeset
823 v48 = 0;
Ritor1
parents:
diff changeset
824 v45 = 1;
Ritor1
parents:
diff changeset
825 }
Ritor1
parents:
diff changeset
826 LABEL_59:
Ritor1
parents:
diff changeset
827 if ( v21->pConditions[17] )
Ritor1
parents:
diff changeset
828 v46 = 1;
Ritor1
parents:
diff changeset
829 if ( v20 && !v21->pConditions[14] && !v21->pConditions[16] )
Ritor1
parents:
diff changeset
830 {
Ritor1
parents:
diff changeset
831 ++v21->sHealth;
Ritor1
parents:
diff changeset
832 if ( v21->sHealth > v21->GetMaxHealth() )
Ritor1
parents:
diff changeset
833 v21->sHealth = v21->GetMaxHealth();
Ritor1
parents:
diff changeset
834 if ( v21->pConditions[13] && v21->sHealth > 0 )
Ritor1
parents:
diff changeset
835 {
Ritor1
parents:
diff changeset
836 LODWORD(v21->pConditions[13]) = 0;
Ritor1
parents:
diff changeset
837 HIDWORD(v21->pConditions[13]) = 0;
Ritor1
parents:
diff changeset
838 }
Ritor1
parents:
diff changeset
839 v51 = 1;
Ritor1
parents:
diff changeset
840 }
Ritor1
parents:
diff changeset
841 if ( SHIDWORD(v21->pPlayerBuffs[12].uExpireTime) >= 0
Ritor1
parents:
diff changeset
842 && (SHIDWORD(v21->pPlayerBuffs[12].uExpireTime) > 0 || LODWORD(v21->pPlayerBuffs[12].uExpireTime))
Ritor1
parents:
diff changeset
843 && !v21->pConditions[14]
Ritor1
parents:
diff changeset
844 && !v21->pConditions[16] )
Ritor1
parents:
diff changeset
845 {
Ritor1
parents:
diff changeset
846 v21->sHealth += 5 * v21->pPlayerBuffs[12].uPower;
Ritor1
parents:
diff changeset
847 if ( v21->sHealth > v21->GetMaxHealth() )
Ritor1
parents:
diff changeset
848 v21->sHealth = v21->GetMaxHealth();
Ritor1
parents:
diff changeset
849 if ( v21->pConditions[13] && v21->sHealth > 0 )
Ritor1
parents:
diff changeset
850 {
Ritor1
parents:
diff changeset
851 LODWORD(v21->pConditions[13]) = 0;
Ritor1
parents:
diff changeset
852 HIDWORD(v21->pConditions[13]) = 0;
Ritor1
parents:
diff changeset
853 }
Ritor1
parents:
diff changeset
854 v51 = 1;
Ritor1
parents:
diff changeset
855 }
Ritor1
parents:
diff changeset
856 if ( v50 )
Ritor1
parents:
diff changeset
857 {
Ritor1
parents:
diff changeset
858 v33 = (char *)&v21->sMana;
Ritor1
parents:
diff changeset
859 ++*(int *)v33;
Ritor1
parents:
diff changeset
860 if ( v21->sMana > v21->GetMaxMana() )
Ritor1
parents:
diff changeset
861 *(int *)v33 = v21->GetMaxMana();
Ritor1
parents:
diff changeset
862 v51 = 1;
Ritor1
parents:
diff changeset
863 }
Ritor1
parents:
diff changeset
864 if ( v47 && !v21->pConditions[14] && !v21->pConditions[16] )
Ritor1
parents:
diff changeset
865 {
Ritor1
parents:
diff changeset
866 v34 = LODWORD(v21->pConditions[13]);
Ritor1
parents:
diff changeset
867 --v21->sHealth;
Ritor1
parents:
diff changeset
868 v35 = v21->sHealth;
Ritor1
parents:
diff changeset
869 if ( !(HIDWORD(v21->pConditions[13]) | v34) && v35 < 0 )
Ritor1
parents:
diff changeset
870 v21->pConditions[13] = pParty->uTimePlayed;
Ritor1
parents:
diff changeset
871 if ( v35 < 1 )
Ritor1
parents:
diff changeset
872 {
1595
a52a01aaf439 Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents: 1567
diff changeset
873 if ( v21->sHealth + v21->uEndurance + v21->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) >= 1
0
Ritor1
parents:
diff changeset
874 || (signed __int64)v21->pPlayerBuffs[11].uExpireTime > 0 )
Ritor1
parents:
diff changeset
875 {
Ritor1
parents:
diff changeset
876 v21->pConditions[13] = pParty->uTimePlayed;
Ritor1
parents:
diff changeset
877 }
Ritor1
parents:
diff changeset
878 else
Ritor1
parents:
diff changeset
879 {
Ritor1
parents:
diff changeset
880 if ( !v21->pConditions[14] )
Ritor1
parents:
diff changeset
881 v21->pConditions[14] = pParty->uTimePlayed;
Ritor1
parents:
diff changeset
882 }
Ritor1
parents:
diff changeset
883 }
Ritor1
parents:
diff changeset
884 v51 = 1;
Ritor1
parents:
diff changeset
885 }
Ritor1
parents:
diff changeset
886 if ( v45 )
Ritor1
parents:
diff changeset
887 {
Ritor1
parents:
diff changeset
888 v36 = (char *)&v21->sMana;
Ritor1
parents:
diff changeset
889 ++*(int *)v36;
Ritor1
parents:
diff changeset
890 if ( v21->sMana > v21->GetMaxMana() )
Ritor1
parents:
diff changeset
891 *(int *)v36 = v21->GetMaxMana();
Ritor1
parents:
diff changeset
892 }
Ritor1
parents:
diff changeset
893 if ( v48 && !v21->pConditions[14] && !v21->pConditions[16] )
Ritor1
parents:
diff changeset
894 {
Ritor1
parents:
diff changeset
895 v37 = v21->sHealth;
Ritor1
parents:
diff changeset
896 if ( v37 > v21->GetMaxHealth() / 2 )
Ritor1
parents:
diff changeset
897 v21->sHealth = v37 - 2;
Ritor1
parents:
diff changeset
898 v38 = v21->sMana;
Ritor1
parents:
diff changeset
899 if ( v38 > v21->GetMaxMana() / 2 )
Ritor1
parents:
diff changeset
900 v21->sMana = v38 - 2;
Ritor1
parents:
diff changeset
901 }
Ritor1
parents:
diff changeset
902 if ( v46 && !v21->pConditions[14] && !v21->pConditions[16] )
Ritor1
parents:
diff changeset
903 {
Ritor1
parents:
diff changeset
904 v39 = v21->sHealth;
Ritor1
parents:
diff changeset
905 if ( v39 > v21->GetMaxHealth() / 2 )
Ritor1
parents:
diff changeset
906 v21->sHealth = v39 - 1;
Ritor1
parents:
diff changeset
907 v40 = v21->sMana;
Ritor1
parents:
diff changeset
908 if ( v40 > 0 )
Ritor1
parents:
diff changeset
909 v21->sMana = v40 - 1;
Ritor1
parents:
diff changeset
910 }
Ritor1
parents:
diff changeset
911 ++v49;
Ritor1
parents:
diff changeset
912 if ( v49 >= 4 )
Ritor1
parents:
diff changeset
913 {
Ritor1
parents:
diff changeset
914 result = HIDWORD(pParty->uTimePlayed);
Ritor1
parents:
diff changeset
915 pParty->uLastRegenerationTime = pParty->uTimePlayed;
Ritor1
parents:
diff changeset
916 if ( !viewparams->bRedrawGameUI )
Ritor1
parents:
diff changeset
917 {
Ritor1
parents:
diff changeset
918 result = v51;
Ritor1
parents:
diff changeset
919 viewparams->bRedrawGameUI = v51;
Ritor1
parents:
diff changeset
920 }
Ritor1
parents:
diff changeset
921 return result;
Ritor1
parents:
diff changeset
922 }
Ritor1
parents:
diff changeset
923 goto LABEL_25;
Ritor1
parents:
diff changeset
924 }
Ritor1
parents:
diff changeset
925 }
Ritor1
parents:
diff changeset
926 }
Ritor1
parents:
diff changeset
927 return result;
Ritor1
parents:
diff changeset
928 }
Ritor1
parents:
diff changeset
929
Ritor1
parents:
diff changeset
930 //----- (00493F79) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
931 void init_summoned_item(stru351_summoned_item *_this, __int64 duration)
0
Ritor1
parents:
diff changeset
932 {
Ritor1
parents:
diff changeset
933 signed __int64 v2; // ST2C_8@1
Ritor1
parents:
diff changeset
934 signed __int64 v3; // qax@1
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
935 //signed __int64 v4; // ST1C_8@1
0
Ritor1
parents:
diff changeset
936 unsigned __int64 v5; // qax@1
Ritor1
parents:
diff changeset
937 unsigned int v6; // ebx@1
Ritor1
parents:
diff changeset
938
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
939 v2 = (signed __int64)((double)duration * 0.234375);
0
Ritor1
parents:
diff changeset
940 v3 = v2 / 60 / 60;
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
941 //v4 = v3;
0
Ritor1
parents:
diff changeset
942 v5 = (unsigned int)v3 / 0x18;
Ritor1
parents:
diff changeset
943 v6 = (unsigned int)(v5 / 7) >> 2;
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
944 _this->field_0_expire_second = v2 % 60;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
945 _this->field_4_expire_minute = v2 / 60 % 60;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
946 _this->field_8_expire_hour = v3 % 24;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
947 _this->field_10_expire_week = v5 / 7 & 3;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
948 _this->field_C_expire_day = (unsigned int)v5 % 0x1C;
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
949 _this->field_14_exprie_month = v6 % 0xC;
352
ec6cc5cefa4b Game starting age (1168) moved to a variable
Nomad
parents: 351
diff changeset
950 _this->field_18_expire_year = v6 / 0xC + game_starting_year;
0
Ritor1
parents:
diff changeset
951 }
Ritor1
parents:
diff changeset
952
Ritor1
parents:
diff changeset
953 //----- (00494035) --------------------------------------------------------
1031
f93d17337113 UI stuff.
Nomad
parents: 1029
diff changeset
954 void _494035_timed_effects__water_walking_damage__etc()
0
Ritor1
parents:
diff changeset
955 {
Ritor1
parents:
diff changeset
956 signed __int64 v0; // qax@1
Ritor1
parents:
diff changeset
957 signed __int64 v1; // ST30_8@1
Ritor1
parents:
diff changeset
958 signed __int64 v2; // ST38_8@1
Ritor1
parents:
diff changeset
959 unsigned __int64 v3; // qax@1
Ritor1
parents:
diff changeset
960 unsigned int v4; // edi@1
Ritor1
parents:
diff changeset
961 //signed int v5; // eax@4
Ritor1
parents:
diff changeset
962 //char *v6; // ecx@5
Ritor1
parents:
diff changeset
963 //Player *v7; // esi@8
Ritor1
parents:
diff changeset
964 //char *v8; // ecx@12
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
965 //Player *pPlayer; // esi@15
0
Ritor1
parents:
diff changeset
966 //void *v10; // esi@25
Ritor1
parents:
diff changeset
967 unsigned int v11; // ecx@27
Ritor1
parents:
diff changeset
968 signed int v12; // edi@29
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
969 //Player *v13; // ecx@30
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
970 //Player *v14; // esi@35
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
971 //double v15; // st7@35
0
Ritor1
parents:
diff changeset
972 Player **v16; // esi@43
Ritor1
parents:
diff changeset
973 Player *v17; // edi@44
Ritor1
parents:
diff changeset
974 double v18; // st7@44
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
975 //float v19; // ST28_4@48
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
976 //double v20; // ST38_8@48
0
Ritor1
parents:
diff changeset
977 Player *v21; // esi@51
Ritor1
parents:
diff changeset
978 signed int v22; // edi@53
Ritor1
parents:
diff changeset
979 int v23; // eax@59
Ritor1
parents:
diff changeset
980 int v24; // ecx@60
Ritor1
parents:
diff changeset
981 int v25; // eax@63
Ritor1
parents:
diff changeset
982 int v26; // ecx@64
Ritor1
parents:
diff changeset
983 int v27; // eax@67
Ritor1
parents:
diff changeset
984 int v28; // ecx@68
Ritor1
parents:
diff changeset
985 int v29; // eax@71
Ritor1
parents:
diff changeset
986 int v30; // ecx@72
Ritor1
parents:
diff changeset
987 int v31; // eax@75
Ritor1
parents:
diff changeset
988 int v32; // ecx@76
Ritor1
parents:
diff changeset
989 int v33; // eax@79
Ritor1
parents:
diff changeset
990 int v34; // ecx@80
Ritor1
parents:
diff changeset
991 int v35; // eax@83
Ritor1
parents:
diff changeset
992 int v36; // ecx@84
Ritor1
parents:
diff changeset
993 int v37; // eax@87
Ritor1
parents:
diff changeset
994 int v38; // ecx@88
Ritor1
parents:
diff changeset
995 int v39; // eax@91
Ritor1
parents:
diff changeset
996 int v40; // ecx@92
Ritor1
parents:
diff changeset
997 int v41; // eax@95
Ritor1
parents:
diff changeset
998 int v42; // ecx@96
Ritor1
parents:
diff changeset
999 bool v43; // ebx@102
Ritor1
parents:
diff changeset
1000 //SpellBuff *v44; // edi@104
Ritor1
parents:
diff changeset
1001 //signed int v45; // ebp@104
Ritor1
parents:
diff changeset
1002 bool v46; // edi@111
Ritor1
parents:
diff changeset
1003 //SpellBuff *v47; // esi@113
Ritor1
parents:
diff changeset
1004 //Player **v48; // esi@119
Ritor1
parents:
diff changeset
1005 //signed int v49; // edi@121
Ritor1
parents:
diff changeset
1006 //char *v50; // esi@122
Ritor1
parents:
diff changeset
1007 signed int v51; // edx@128
Ritor1
parents:
diff changeset
1008 signed int v52; // ecx@130
Ritor1
parents:
diff changeset
1009 int v53; // eax@131
Ritor1
parents:
diff changeset
1010 Player *v54; // eax@141
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1011 //unsigned int v55; // [sp-8h] [bp-38h]@18
0
Ritor1
parents:
diff changeset
1012 unsigned int v56; // [sp-8h] [bp-38h]@55
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1013 //int v57; // [sp-4h] [bp-34h]@18
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1014 //int v58; // [sp-4h] [bp-34h]@33
0
Ritor1
parents:
diff changeset
1015 int v59; // [sp-4h] [bp-34h]@55
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1016 //unsigned int v60; // [sp+10h] [bp-20h]@1
0
Ritor1
parents:
diff changeset
1017 unsigned int v61; // [sp+14h] [bp-1Ch]@1
Ritor1
parents:
diff changeset
1018 Player **v62; // [sp+14h] [bp-1Ch]@50
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1019 //unsigned int a2; // [sp+18h] [bp-18h]@1
0
Ritor1
parents:
diff changeset
1020 signed int a2a; // [sp+18h] [bp-18h]@47
Ritor1
parents:
diff changeset
1021 signed int v65; // [sp+1Ch] [bp-14h]@47
Ritor1
parents:
diff changeset
1022
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1023 //a2 = pParty->uCurrentHour;
0
Ritor1
parents:
diff changeset
1024 v61 = pParty->uDaysPlayed;
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1025 //auto prev_time = pEventTimer->uTimeElapsed;
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1026 pParty->uTimePlayed += pEventTimer->uTimeElapsed;
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1027 v0 = (signed __int64)(pParty->uTimePlayed * 0.234375) / 60;
0
Ritor1
parents:
diff changeset
1028 v1 = v0;
Ritor1
parents:
diff changeset
1029 v0 /= 60i64;
Ritor1
parents:
diff changeset
1030 v2 = v0;
Ritor1
parents:
diff changeset
1031 v3 = (unsigned int)v0 / 24;
Ritor1
parents:
diff changeset
1032 v4 = (unsigned int)(v3 / 7) >> 2;
Ritor1
parents:
diff changeset
1033 pParty->uCurrentTimeSecond = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) % 60;
Ritor1
parents:
diff changeset
1034 pParty->uCurrentMinute = v1 % 60;
Ritor1
parents:
diff changeset
1035 pParty->uCurrentMonthWeek = v3 / 7 & 3;
Ritor1
parents:
diff changeset
1036 pParty->uCurrentHour = v2 % 24;
Ritor1
parents:
diff changeset
1037 pParty->uDaysPlayed = (unsigned int)v3 % 28;
Ritor1
parents:
diff changeset
1038 pParty->uCurrentMonth = v4 % 12;
352
ec6cc5cefa4b Game starting age (1168) moved to a variable
Nomad
parents: 351
diff changeset
1039 pParty->uCurrentYear = v4 / 0xC + game_starting_year;
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1040 if ( pParty->uCurrentHour >= 3 && (pParty->uCurrentHour < 3 || pParty->uDaysPlayed > v61) ) // new day dawns
0
Ritor1
parents:
diff changeset
1041 {
Ritor1
parents:
diff changeset
1042 pParty->pHirelings[0].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
1043 pParty->pHirelings[1].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
1044
Ritor1
parents:
diff changeset
1045 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
Ritor1
parents:
diff changeset
1046 pNPCStats->pNewNPCData[i].bHasUsedTheAbility = false;
Ritor1
parents:
diff changeset
1047
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1048 ++pParty->days_played_without_rest;
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1049 if (pParty->days_played_without_rest > 1)
0
Ritor1
parents:
diff changeset
1050 {
Ritor1
parents:
diff changeset
1051 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
1052 pParty->pPlayers[i].SetCondWeakWithBlockCheck(0);
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1053
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1054 if (pParty->uNumFoodRations)
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1055 Party::TakeFood(1);
0
Ritor1
parents:
diff changeset
1056 else
Ritor1
parents:
diff changeset
1057 for (uint i = 0; i < 4; ++i)
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1058 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
1059
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1060 if (pParty->days_played_without_rest > 3)
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1061 for (uint i = 0; i < 4; ++i)
0
Ritor1
parents:
diff changeset
1062 {
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
1063 Player* player = &pParty->pPlayers[i];
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1064
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1065 player->Zero();
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1066
1362
d6cf8ead9242 Condition checking functions slightly renamed, some final changes in Player::SetCondition
Grumpy7
parents: 1361
diff changeset
1067 if (!player->IsPertified() && !player->IsEradicated() && !player->IsDead())
0
Ritor1
parents:
diff changeset
1068 {
767
45615cacad31 Fog fixed
Nomad
parents: 766
diff changeset
1069 if (rand() % 100 < 5 * pParty->days_played_without_rest)
1361
b3ac17fd12de Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents: 1358
diff changeset
1070 player->SetCondDeadWithBlockCheck(0);
767
45615cacad31 Fog fixed
Nomad
parents: 766
diff changeset
1071 if (rand() % 100 < 10 * pParty->days_played_without_rest)
1361
b3ac17fd12de Moved condition checking to a separate class, extracted it from player::SetCondition
Grumpy7
parents: 1358
diff changeset
1072 player->SetCondInsaneWithBlockCheck(0);
0
Ritor1
parents:
diff changeset
1073 }
Ritor1
parents:
diff changeset
1074 }
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1075 }
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1076 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
0
Ritor1
parents:
diff changeset
1077 pOutdoor->SetFog();
Ritor1
parents:
diff changeset
1078
Ritor1
parents:
diff changeset
1079 for (uint i = 0; i < 4; ++i)
Ritor1
parents:
diff changeset
1080 pParty->pPlayers[i].uNumDivineInterventionCastsThisDay = 0;
Ritor1
parents:
diff changeset
1081 }
766
a464d28566a6 days_played_without_rest
Nomad
parents: 763
diff changeset
1082
0
Ritor1
parents:
diff changeset
1083 v11 = LODWORD(pParty->uTimePlayed);
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1084 if ( pParty->uFlags & 4 && pParty->field_6FC < (signed __int64)pParty->uTimePlayed )//water damage error
0
Ritor1
parents:
diff changeset
1085 {
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1086 //v12 = 1;
0
Ritor1
parents:
diff changeset
1087 pParty->field_6FC = LODWORD(pParty->uTimePlayed) + 128;
Ritor1
parents:
diff changeset
1088 viewparams->bRedrawGameUI = 1;
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1089 //while ( 1 )
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1090 for ( v12 = 1; v12 <= 4; ++v12 )
0
Ritor1
parents:
diff changeset
1091 {
1080
9456f2ed5ff9 getskillbonus continue cleaning
Gloval
parents: 1037
diff changeset
1092 if ( pPlayers[v12]->WearsItem(ITEM_RELIC_HARECS_LEATHER, EQUIP_ARMOUR)
99
b7ff791b1333 spells tab fix, small fixes
zipi
parents: 90
diff changeset
1093 || pPlayers[v12]->HasEnchantedItemEquipped(71)
b7ff791b1333 spells tab fix, small fixes
zipi
parents: 90
diff changeset
1094 || pPlayers[v12]->pPlayerBuffs[23].uExpireTime > 0 )
0
Ritor1
parents:
diff changeset
1095 {
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1096 //v58 = 0;
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1097 pPlayers[v12]->PlayEmotion(CHARACTER_EXPRESSION_37, 0);
0
Ritor1
parents:
diff changeset
1098 }
Ritor1
parents:
diff changeset
1099 else
Ritor1
parents:
diff changeset
1100 {
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1101 //v58 = 0;
1620
61ea994a1812 sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped to Player::HasUnderwaterSuitEquipped, sub_43EDB9_get_some_race_sex_relation_2 to ShouldLoadTexturesForRaceAndGender, Player_has_item to Player::HasItem
Grumpy7
parents: 1603
diff changeset
1102 if ( !pPlayers[v12]->HasUnderwaterSuitEquipped() )
0
Ritor1
parents:
diff changeset
1103 {
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1104 //v14 = pPlayers[v12];
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1105 //v15 = (double)pPlayers[v12]->GetMaxHealth() * 0.1;
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1106 pPlayers[v12]->ReceiveDamage((signed __int64)pPlayers[v12]->GetMaxHealth() * 0.1, DMGT_FIRE);
0
Ritor1
parents:
diff changeset
1107 if ( pParty->uFlags & 4 )
Ritor1
parents:
diff changeset
1108 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1109 strcpy(GameUI_Footer_TimedString.data(), pGlobalTXT_LocalizationStrings[660]);
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 775
diff changeset
1110 GameUI_Footer_TimeLeft = 128;
0
Ritor1
parents:
diff changeset
1111 }
Ritor1
parents:
diff changeset
1112 }
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1113 else
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1114 pPlayers[v12]->PlayEmotion(CHARACTER_EXPRESSION_37, 0);
0
Ritor1
parents:
diff changeset
1115 }
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1116 //++v12;
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1117 //if ( v12 > 4 )
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1118 //{
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1119 //v11 = LODWORD(pParty->uTimePlayed);
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1120 //break;
0
Ritor1
parents:
diff changeset
1121 }
1424
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1122 v11 = LODWORD(pParty->uTimePlayed);
5930342f092b fall to the water
Ritor1
parents: 1419
diff changeset
1123 //}
0
Ritor1
parents:
diff changeset
1124 }
Ritor1
parents:
diff changeset
1125 if ( pParty->uFlags & 0x200 && pParty->field_6FC < (signed __int64)__PAIR__(HIDWORD(pParty->uTimePlayed), v11) )
Ritor1
parents:
diff changeset
1126 {
Ritor1
parents:
diff changeset
1127 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1128 pParty->field_6FC = v11 + 128;
Ritor1
parents:
diff changeset
1129 v16 = &pPlayers[1];
Ritor1
parents:
diff changeset
1130 do
Ritor1
parents:
diff changeset
1131 {
Ritor1
parents:
diff changeset
1132 v17 = *v16;
Ritor1
parents:
diff changeset
1133 v18 = (double)(*v16)->GetMaxHealth() * 0.1;
1036
7f8be9f9769e player recieve damage
Gloval
parents: 1033
diff changeset
1134 v17->ReceiveDamage((signed __int64)v18, DMGT_FIRE);
0
Ritor1
parents:
diff changeset
1135 if ( pParty->uFlags & 0x200 )
Ritor1
parents:
diff changeset
1136 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1137 strcpy(GameUI_Footer_TimedString.data(), pGlobalTXT_LocalizationStrings[661]);
783
b27dd658ea77 Taveling by foot fixed.
Nomad
parents: 775
diff changeset
1138 GameUI_Footer_TimeLeft = 128;
0
Ritor1
parents:
diff changeset
1139 }
Ritor1
parents:
diff changeset
1140 ++v16;
Ritor1
parents:
diff changeset
1141 }
Ritor1
parents:
diff changeset
1142 while ( (signed int)v16 <= (signed int)&pPlayers[4] );
Ritor1
parents:
diff changeset
1143 }
Ritor1
parents:
diff changeset
1144 _493938_regenerate();
Ritor1
parents:
diff changeset
1145 v65 = 4;
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1146 a2a = pEventTimer->uTimeElapsed;
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1147 if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING )
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1148 {
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1149 //v19 = (double)(signed int)prev_time * 0.5;
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1150 //v20 = v19 + 6.7553994e15;
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1151 a2a *= 0.5f;
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1152 if (a2a < 1)
0
Ritor1
parents:
diff changeset
1153 a2a = 1;
Ritor1
parents:
diff changeset
1154 }
Ritor1
parents:
diff changeset
1155 v62 = &pPlayers[1];
Ritor1
parents:
diff changeset
1156 do
Ritor1
parents:
diff changeset
1157 {
Ritor1
parents:
diff changeset
1158 v21 = *v62;
Ritor1
parents:
diff changeset
1159 if ( (*v62)->uTimeToRecovery )
Ritor1
parents:
diff changeset
1160 v21->Recover(a2a);
Ritor1
parents:
diff changeset
1161 v22 = v21->sHealth;
1595
a52a01aaf439 Player::GetBaseResistance cleanup, setting default parameter to Player::GetItemsBonus
Grumpy7
parents: 1567
diff changeset
1162 if ( v21->GetItemsBonus(CHARACTER_ATTRIBUTE_ENDURANCE) + v22 + v21->uEndurance >= 1
0
Ritor1
parents:
diff changeset
1163 || (signed __int64)v21->pPlayerBuffs[11].uExpireTime > 0 )
Ritor1
parents:
diff changeset
1164 {
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1165 if ( v22 < 1 )
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1166 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1167 v59 = 0;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1168 v56 = 13;
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1169 v21->SetCondition(v56, v59);
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1170 }
0
Ritor1
parents:
diff changeset
1171 }
Ritor1
parents:
diff changeset
1172 else
Ritor1
parents:
diff changeset
1173 {
Ritor1
parents:
diff changeset
1174 v59 = 0;
Ritor1
parents:
diff changeset
1175 v56 = 14;
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1176 v21->SetCondition(v56, v59);
0
Ritor1
parents:
diff changeset
1177 }
Ritor1
parents:
diff changeset
1178 v23 = (int)&v21->field_E0;
Ritor1
parents:
diff changeset
1179 if ( v21->field_E0 )
Ritor1
parents:
diff changeset
1180 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1181 v24 = *(int *)v23 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1182 if ( v24 > 0 )
Ritor1
parents:
diff changeset
1183 {
Ritor1
parents:
diff changeset
1184 *(int *)v23 = v24;
Ritor1
parents:
diff changeset
1185 }
Ritor1
parents:
diff changeset
1186 else
Ritor1
parents:
diff changeset
1187 {
Ritor1
parents:
diff changeset
1188 *(int *)v23 = 0;
Ritor1
parents:
diff changeset
1189 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1190 }
Ritor1
parents:
diff changeset
1191 }
Ritor1
parents:
diff changeset
1192 v25 = (int)&v21->field_E4;
Ritor1
parents:
diff changeset
1193 if ( v21->field_E4 )
Ritor1
parents:
diff changeset
1194 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1195 v26 = *(int *)v25 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1196 if ( v26 > 0 )
Ritor1
parents:
diff changeset
1197 {
Ritor1
parents:
diff changeset
1198 *(int *)v25 = v26;
Ritor1
parents:
diff changeset
1199 }
Ritor1
parents:
diff changeset
1200 else
Ritor1
parents:
diff changeset
1201 {
Ritor1
parents:
diff changeset
1202 *(int *)v25 = 0;
Ritor1
parents:
diff changeset
1203 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1204 }
Ritor1
parents:
diff changeset
1205 }
Ritor1
parents:
diff changeset
1206 v27 = (int)&v21->field_E8;
Ritor1
parents:
diff changeset
1207 if ( v21->field_E8 )
Ritor1
parents:
diff changeset
1208 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1209 v28 = *(int *)v27 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1210 if ( v28 > 0 )
Ritor1
parents:
diff changeset
1211 {
Ritor1
parents:
diff changeset
1212 *(int *)v27 = v28;
Ritor1
parents:
diff changeset
1213 }
Ritor1
parents:
diff changeset
1214 else
Ritor1
parents:
diff changeset
1215 {
Ritor1
parents:
diff changeset
1216 *(int *)v27 = 0;
Ritor1
parents:
diff changeset
1217 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1218 }
Ritor1
parents:
diff changeset
1219 }
Ritor1
parents:
diff changeset
1220 v29 = (int)&v21->field_EC;
Ritor1
parents:
diff changeset
1221 if ( v21->field_EC )
Ritor1
parents:
diff changeset
1222 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1223 v30 = *(int *)v29 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1224 if ( v30 > 0 )
Ritor1
parents:
diff changeset
1225 {
Ritor1
parents:
diff changeset
1226 *(int *)v29 = v30;
Ritor1
parents:
diff changeset
1227 }
Ritor1
parents:
diff changeset
1228 else
Ritor1
parents:
diff changeset
1229 {
Ritor1
parents:
diff changeset
1230 *(int *)v29 = 0;
Ritor1
parents:
diff changeset
1231 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1232 }
Ritor1
parents:
diff changeset
1233 }
Ritor1
parents:
diff changeset
1234 v31 = (int)&v21->field_F0;
Ritor1
parents:
diff changeset
1235 if ( v21->field_F0 )
Ritor1
parents:
diff changeset
1236 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1237 v32 = *(int *)v31 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1238 if ( v32 > 0 )
Ritor1
parents:
diff changeset
1239 {
Ritor1
parents:
diff changeset
1240 *(int *)v31 = v32;
Ritor1
parents:
diff changeset
1241 }
Ritor1
parents:
diff changeset
1242 else
Ritor1
parents:
diff changeset
1243 {
Ritor1
parents:
diff changeset
1244 *(int *)v31 = 0;
Ritor1
parents:
diff changeset
1245 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1246 }
Ritor1
parents:
diff changeset
1247 }
Ritor1
parents:
diff changeset
1248 v33 = (int)&v21->field_F4;
Ritor1
parents:
diff changeset
1249 if ( v21->field_F4 )
Ritor1
parents:
diff changeset
1250 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1251 v34 = *(int *)v33 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1252 if ( v34 > 0 )
Ritor1
parents:
diff changeset
1253 {
Ritor1
parents:
diff changeset
1254 *(int *)v33 = v34;
Ritor1
parents:
diff changeset
1255 }
Ritor1
parents:
diff changeset
1256 else
Ritor1
parents:
diff changeset
1257 {
Ritor1
parents:
diff changeset
1258 *(int *)v33 = 0;
Ritor1
parents:
diff changeset
1259 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1260 }
Ritor1
parents:
diff changeset
1261 }
Ritor1
parents:
diff changeset
1262 v35 = (int)&v21->field_F8;
Ritor1
parents:
diff changeset
1263 if ( v21->field_F8 )
Ritor1
parents:
diff changeset
1264 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1265 v36 = *(int *)v35 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1266 if ( v36 > 0 )
Ritor1
parents:
diff changeset
1267 {
Ritor1
parents:
diff changeset
1268 *(int *)v35 = v36;
Ritor1
parents:
diff changeset
1269 }
Ritor1
parents:
diff changeset
1270 else
Ritor1
parents:
diff changeset
1271 {
Ritor1
parents:
diff changeset
1272 *(int *)v35 = 0;
Ritor1
parents:
diff changeset
1273 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1274 }
Ritor1
parents:
diff changeset
1275 }
Ritor1
parents:
diff changeset
1276 v37 = (int)&v21->field_FC;
Ritor1
parents:
diff changeset
1277 if ( v21->field_FC )
Ritor1
parents:
diff changeset
1278 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1279 v38 = *(int *)v37 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1280 if ( v38 > 0 )
Ritor1
parents:
diff changeset
1281 {
Ritor1
parents:
diff changeset
1282 *(int *)v37 = v38;
Ritor1
parents:
diff changeset
1283 }
Ritor1
parents:
diff changeset
1284 else
Ritor1
parents:
diff changeset
1285 {
Ritor1
parents:
diff changeset
1286 *(int *)v37 = 0;
Ritor1
parents:
diff changeset
1287 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1288 }
Ritor1
parents:
diff changeset
1289 }
Ritor1
parents:
diff changeset
1290 v39 = (int)&v21->field_100;
Ritor1
parents:
diff changeset
1291 if ( v21->field_100 )
Ritor1
parents:
diff changeset
1292 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1293 v40 = *(int *)v39 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1294 if ( v40 > 0 )
Ritor1
parents:
diff changeset
1295 {
Ritor1
parents:
diff changeset
1296 *(int *)v39 = v40;
Ritor1
parents:
diff changeset
1297 }
Ritor1
parents:
diff changeset
1298 else
Ritor1
parents:
diff changeset
1299 {
Ritor1
parents:
diff changeset
1300 *(int *)v39 = 0;
Ritor1
parents:
diff changeset
1301 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1302 }
Ritor1
parents:
diff changeset
1303 }
Ritor1
parents:
diff changeset
1304 v41 = (int)&v21->field_104;
Ritor1
parents:
diff changeset
1305 if ( v21->field_104 )
Ritor1
parents:
diff changeset
1306 {
816
cfc65feef029 * Player Recovery Times
Nomad
parents: 809
diff changeset
1307 v42 = *(int *)v41 - pEventTimer->uTimeElapsed;
0
Ritor1
parents:
diff changeset
1308 if ( v42 > 0 )
Ritor1
parents:
diff changeset
1309 {
Ritor1
parents:
diff changeset
1310 *(int *)v41 = v42;
Ritor1
parents:
diff changeset
1311 }
Ritor1
parents:
diff changeset
1312 else
Ritor1
parents:
diff changeset
1313 {
Ritor1
parents:
diff changeset
1314 *(int *)v41 = 0;
Ritor1
parents:
diff changeset
1315 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1316 }
Ritor1
parents:
diff changeset
1317 }
Ritor1
parents:
diff changeset
1318 if ( v21->pConditions[2] | v21->pConditions[12] | v21->pConditions[13] | v21->pConditions[14] | v21->pConditions[15] | v21->pConditions[16] )
Ritor1
parents:
diff changeset
1319 --v65;
Ritor1
parents:
diff changeset
1320 v43 = (signed __int64)v21->pPlayerBuffs[7].uExpireTime > 0;
Ritor1
parents:
diff changeset
1321
Ritor1
parents:
diff changeset
1322 for (uint k = 0; k < 24; ++k)
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1339
diff changeset
1323 v21->pPlayerBuffs[k].IsBuffExpiredToTime(pParty->uTimePlayed);
0
Ritor1
parents:
diff changeset
1324
Ritor1
parents:
diff changeset
1325 if ( v43 && (signed __int64)v21->pPlayerBuffs[7].uExpireTime <= 0 )
Ritor1
parents:
diff changeset
1326 v21->SetCondition(1u, 0);
Ritor1
parents:
diff changeset
1327 ++v62;
Ritor1
parents:
diff changeset
1328 }
Ritor1
parents:
diff changeset
1329 while ( (signed int)v62 <= (signed int)&pPlayers[4] );
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
1330 v46 = (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0;
0
Ritor1
parents:
diff changeset
1331
Ritor1
parents:
diff changeset
1332 for (uint i = 0; i < 20; ++i)
Ritor1
parents:
diff changeset
1333 {
1340
22cb507446a4 turnengine refactoring continue
Gloval
parents: 1339
diff changeset
1334 if (pParty->pPartyBuffs[i].IsBuffExpiredToTime(pParty->uTimePlayed) == 1)
0
Ritor1
parents:
diff changeset
1335 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1336 }
Ritor1
parents:
diff changeset
1337
1167
15ad868d972f pPartyBuffs - change plain numbers to enums
Grumpy7
parents: 1165
diff changeset
1338 if ( v46 && (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime <= 0 )
0
Ritor1
parents:
diff changeset
1339 {
Ritor1
parents:
diff changeset
1340 for (uint i = 0; i < 4; ++i)
Ritor1
parents:
diff changeset
1341 pParty->pPlayers[i].SetCondition(1, 0);
Ritor1
parents:
diff changeset
1342 }
Ritor1
parents:
diff changeset
1343
Ritor1
parents:
diff changeset
1344 for (uint i = 0; i < 2; ++i)
Ritor1
parents:
diff changeset
1345 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
1346 SpellBuff* pBuf = &pParty->pPartyBuffs[dword_4EE07C[i]];
0
Ritor1
parents:
diff changeset
1347 if (pBuf->uExpireTime == 0)
Ritor1
parents:
diff changeset
1348 continue;
Ritor1
parents:
diff changeset
1349
Ritor1
parents:
diff changeset
1350 if ( !(pBuf->uFlags & 1) )
Ritor1
parents:
diff changeset
1351 {
Ritor1
parents:
diff changeset
1352 if (!pPlayers[pBuf->uCaster]->CanAct())
Ritor1
parents:
diff changeset
1353 {
Ritor1
parents:
diff changeset
1354 pBuf->Reset();
Ritor1
parents:
diff changeset
1355 if (dword_4EE07C[i] == 7 )
Ritor1
parents:
diff changeset
1356 pParty->bFlying = false;
Ritor1
parents:
diff changeset
1357 }
Ritor1
parents:
diff changeset
1358 }
Ritor1
parents:
diff changeset
1359 }
Ritor1
parents:
diff changeset
1360
Ritor1
parents:
diff changeset
1361 v51 = v65;
Ritor1
parents:
diff changeset
1362 if ( v65 )
Ritor1
parents:
diff changeset
1363 goto LABEL_135;
151
9abdd40a107b pCurrentScreen
Ritor1
parents: 150
diff changeset
1364 if ( pCurrentScreen != SCREEN_REST )
0
Ritor1
parents:
diff changeset
1365 {
Ritor1
parents:
diff changeset
1366 v52 = (signed int)&pPlayers[1];
Ritor1
parents:
diff changeset
1367 while ( 1 )
Ritor1
parents:
diff changeset
1368 {
Ritor1
parents:
diff changeset
1369 v53 = *(int *)v52;
Ritor1
parents:
diff changeset
1370 if ( *(_QWORD *)(*(int *)v52 + 16) )
Ritor1
parents:
diff changeset
1371 break;
Ritor1
parents:
diff changeset
1372 v52 += 4;
Ritor1
parents:
diff changeset
1373 if ( v52 > (signed int)&pPlayers[4] )
Ritor1
parents:
diff changeset
1374 goto LABEL_135;
Ritor1
parents:
diff changeset
1375 }
Ritor1
parents:
diff changeset
1376 *(int *)(v53 + 16) = 0;
Ritor1
parents:
diff changeset
1377 *(int *)(v53 + 20) = 0;
Ritor1
parents:
diff changeset
1378 v51 = 1;
Ritor1
parents:
diff changeset
1379 LABEL_135:
151
9abdd40a107b pCurrentScreen
Ritor1
parents: 150
diff changeset
1380 if ( pCurrentScreen != SCREEN_REST
0
Ritor1
parents:
diff changeset
1381 && (!v51 || dword_5C35C0) )
981
a6ef7125f6e4 Autonotes & GameState
Nomad
parents: 978
diff changeset
1382 uGameState = GAME_STATE_PARTY_DIED;
0
Ritor1
parents:
diff changeset
1383 }
Ritor1
parents:
diff changeset
1384 if ( uActiveCharacter )
Ritor1
parents:
diff changeset
1385 {
151
9abdd40a107b pCurrentScreen
Ritor1
parents: 150
diff changeset
1386 if ( pCurrentScreen != SCREEN_REST )
0
Ritor1
parents:
diff changeset
1387 {
Ritor1
parents:
diff changeset
1388 v54 = pPlayers[uActiveCharacter];
Ritor1
parents:
diff changeset
1389 if ( v54->pConditions[2]
Ritor1
parents:
diff changeset
1390 || v54->pConditions[12]
Ritor1
parents:
diff changeset
1391 || v54->pConditions[13]
Ritor1
parents:
diff changeset
1392 || v54->pConditions[14]
Ritor1
parents:
diff changeset
1393 || v54->pConditions[15]
Ritor1
parents:
diff changeset
1394 || v54->pConditions[16] )
Ritor1
parents:
diff changeset
1395 {
Ritor1
parents:
diff changeset
1396 viewparams->bRedrawGameUI = 1;
Ritor1
parents:
diff changeset
1397 uActiveCharacter = pParty->GetNextActiveCharacter();
Ritor1
parents:
diff changeset
1398 }
Ritor1
parents:
diff changeset
1399 }
Ritor1
parents:
diff changeset
1400 }
Ritor1
parents:
diff changeset
1401 }
Ritor1
parents:
diff changeset
1402
Ritor1
parents:
diff changeset
1403 //----- (00494820) --------------------------------------------------------
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
1404 unsigned int __fastcall _494820_training_time(unsigned int a1)
0
Ritor1
parents:
diff changeset
1405 {
Ritor1
parents:
diff changeset
1406 signed int v1; // eax@1
Ritor1
parents:
diff changeset
1407
Ritor1
parents:
diff changeset
1408 v1 = 5;
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
1409 if ( a1 % 24 >= 5 )
0
Ritor1
parents:
diff changeset
1410 v1 = 29;
758
9f7db515a8d7 Training Hall & levelling up fixed
Nomad
parents: 749
diff changeset
1411 return v1 - a1 % 24;
0
Ritor1
parents:
diff changeset
1412 }
Ritor1
parents:
diff changeset
1413
Ritor1
parents:
diff changeset
1414 //----- (00494836) --------------------------------------------------------
Ritor1
parents:
diff changeset
1415 int stru339_spell_sound::_494836(int uSoundID, int a6)
Ritor1
parents:
diff changeset
1416 {
Ritor1
parents:
diff changeset
1417 int v3; // esi@1
Ritor1
parents:
diff changeset
1418 int result; // eax@1
Ritor1
parents:
diff changeset
1419 stru339_spell_sound *v5; // ebx@1
Ritor1
parents:
diff changeset
1420 int *v6; // edi@2
Ritor1
parents:
diff changeset
1421 unsigned int v7; // eax@3
Ritor1
parents:
diff changeset
1422 int v8; // [sp+Ch] [bp-8h]@3
Ritor1
parents:
diff changeset
1423 int v9; // [sp+10h] [bp-4h]@2
Ritor1
parents:
diff changeset
1424 int a2a; // [sp+1Ch] [bp+8h]@1
1793
4dee76d79c78 dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents: 1754
diff changeset
1425 return 0;
0
Ritor1
parents:
diff changeset
1426 v3 = 0;
Ritor1
parents:
diff changeset
1427 result = word_4EE088_sound_ids[uSoundID];
Ritor1
parents:
diff changeset
1428 v5 = this;
Ritor1
parents:
diff changeset
1429 a2a = word_4EE088_sound_ids[uSoundID];
Ritor1
parents:
diff changeset
1430 if ( result )
Ritor1
parents:
diff changeset
1431 {
Ritor1
parents:
diff changeset
1432 v9 = 0;
Ritor1
parents:
diff changeset
1433 v6 = this->pSoundsOffsets;
Ritor1
parents:
diff changeset
1434 do
Ritor1
parents:
diff changeset
1435 {
Ritor1
parents:
diff changeset
1436 v7 = a2a++;
Ritor1
parents:
diff changeset
1437 result = pSoundList->LoadSound(v7, (char *)v5 + v3, 44744 - v3, &v8, a6);
Ritor1
parents:
diff changeset
1438 if ( !result )
Ritor1
parents:
diff changeset
1439 break;
Ritor1
parents:
diff changeset
1440 a6 += 4;
Ritor1
parents:
diff changeset
1441 result = v8 + 256;
Ritor1
parents:
diff changeset
1442 *v6 = v3;
Ritor1
parents:
diff changeset
1443 v3 += result;
Ritor1
parents:
diff changeset
1444 ++v9;
Ritor1
parents:
diff changeset
1445 *(v6 - 2) = result;
Ritor1
parents:
diff changeset
1446 ++v6;
Ritor1
parents:
diff changeset
1447 }
Ritor1
parents:
diff changeset
1448 while ( v9 < 2 );
Ritor1
parents:
diff changeset
1449 }
Ritor1
parents:
diff changeset
1450 return result;
Ritor1
parents:
diff changeset
1451 }
Ritor1
parents:
diff changeset
1452 // 4EE088: using guessed type __int16 word_4EE088_sound_ids[];
Ritor1
parents:
diff changeset
1453
Ritor1
parents:
diff changeset
1454 //----- (00494AED) --------------------------------------------------------
130
1c471f3629fb Party expressions update
Nomad
parents: 121
diff changeset
1455 unsigned int PlayerFrameTable::GetFrameIdByExpression(CHARACTER_EXPRESSION_ID expression)
0
Ritor1
parents:
diff changeset
1456 {
Ritor1
parents:
diff changeset
1457 unsigned int _uNumFrames; // edx@1
Ritor1
parents:
diff changeset
1458 unsigned int result; // eax@1
Ritor1
parents:
diff changeset
1459 PlayerFrame *v4; // ecx@2
Ritor1
parents:
diff changeset
1460
Ritor1
parents:
diff changeset
1461 _uNumFrames = this->uNumFrames;
Ritor1
parents:
diff changeset
1462 result = 0;
Ritor1
parents:
diff changeset
1463 if ( (signed int)this->uNumFrames <= 0 )
Ritor1
parents:
diff changeset
1464 {
Ritor1
parents:
diff changeset
1465 result = 0;
Ritor1
parents:
diff changeset
1466 }
Ritor1
parents:
diff changeset
1467 else
Ritor1
parents:
diff changeset
1468 {
Ritor1
parents:
diff changeset
1469 v4 = this->pFrames;
130
1c471f3629fb Party expressions update
Nomad
parents: 121
diff changeset
1470 while ( v4->expression != expression )
0
Ritor1
parents:
diff changeset
1471 {
Ritor1
parents:
diff changeset
1472 ++result;
Ritor1
parents:
diff changeset
1473 ++v4;
Ritor1
parents:
diff changeset
1474 if ( (signed int)result >= (signed int)_uNumFrames )
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1475 return 0;
0
Ritor1
parents:
diff changeset
1476 }
Ritor1
parents:
diff changeset
1477 }
Ritor1
parents:
diff changeset
1478 return result;
Ritor1
parents:
diff changeset
1479 }
Ritor1
parents:
diff changeset
1480
Ritor1
parents:
diff changeset
1481 //----- (00494B10) --------------------------------------------------------
Ritor1
parents:
diff changeset
1482 PlayerFrame *PlayerFrameTable::GetFrameBy_x(unsigned int uFramesetID, unsigned int uFrameID)
Ritor1
parents:
diff changeset
1483 {
Ritor1
parents:
diff changeset
1484 unsigned int v3; // esi@1
Ritor1
parents:
diff changeset
1485 PlayerFrame *v4; // edi@1
Ritor1
parents:
diff changeset
1486 PlayerFrame *v5; // ecx@1
Ritor1
parents:
diff changeset
1487 __int16 v6; // dx@2
Ritor1
parents:
diff changeset
1488 int v7; // edx@3
Ritor1
parents:
diff changeset
1489 char *i; // eax@3
Ritor1
parents:
diff changeset
1490 int v9; // ecx@5
Ritor1
parents:
diff changeset
1491 PlayerFrame *result; // eax@6
Ritor1
parents:
diff changeset
1492
Ritor1
parents:
diff changeset
1493 v3 = uFramesetID;
Ritor1
parents:
diff changeset
1494 v4 = this->pFrames;
Ritor1
parents:
diff changeset
1495 v5 = &v4[uFramesetID];
Ritor1
parents:
diff changeset
1496 if ( v5->uFlags & 1 && (v6 = v5->uAnimLength) != 0 )
Ritor1
parents:
diff changeset
1497 {
Ritor1
parents:
diff changeset
1498 v7 = ((signed int)uFrameID >> 3) % (unsigned __int16)v6;
Ritor1
parents:
diff changeset
1499 for ( i = (char *)&v5->uAnimTime; ; i += 10 )
Ritor1
parents:
diff changeset
1500 {
Ritor1
parents:
diff changeset
1501 v9 = *(short *)i;
Ritor1
parents:
diff changeset
1502 if ( v7 <= v9 )
Ritor1
parents:
diff changeset
1503 break;
Ritor1
parents:
diff changeset
1504 v7 -= v9;
Ritor1
parents:
diff changeset
1505 ++v3;
Ritor1
parents:
diff changeset
1506 }
Ritor1
parents:
diff changeset
1507 result = &v4[v3];
Ritor1
parents:
diff changeset
1508 }
Ritor1
parents:
diff changeset
1509 else
Ritor1
parents:
diff changeset
1510 {
Ritor1
parents:
diff changeset
1511 result = &v4[uFramesetID];
Ritor1
parents:
diff changeset
1512 }
Ritor1
parents:
diff changeset
1513 return result;
Ritor1
parents:
diff changeset
1514 }
Ritor1
parents:
diff changeset
1515
Ritor1
parents:
diff changeset
1516 //----- (00494B5E) --------------------------------------------------------
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1517 PlayerFrame *PlayerFrameTable::GetFrameBy_y(int *pFramesetID, int *pAnimTime, int a4)
0
Ritor1
parents:
diff changeset
1518 {
Ritor1
parents:
diff changeset
1519 PlayerFrameTable *v4; // edi@1
Ritor1
parents:
diff changeset
1520 int v5; // esi@1
Ritor1
parents:
diff changeset
1521 int v6; // eax@2
Ritor1
parents:
diff changeset
1522
Ritor1
parents:
diff changeset
1523 v4 = this;
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1524 v5 = a4 + *pAnimTime;
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1525 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
1526 {
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1527 *pAnimTime = v5;
0
Ritor1
parents:
diff changeset
1528 }
Ritor1
parents:
diff changeset
1529 else
Ritor1
parents:
diff changeset
1530 {
Ritor1
parents:
diff changeset
1531 v6 = rand() % 4 + 21;
554
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1532 *pFramesetID = v6;
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1533 *pAnimTime = 8 * v5 % v4->pFrames[v6].uAnimTime;
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1534 }
9caf59edb1ee Cave and Temple load and even doesn't crash (for a while).
Nomad
parents: 526
diff changeset
1535 return &v4->pFrames[*pFramesetID];
0
Ritor1
parents:
diff changeset
1536 }
Ritor1
parents:
diff changeset
1537
Ritor1
parents:
diff changeset
1538 //----- (00494BC3) --------------------------------------------------------
Ritor1
parents:
diff changeset
1539 void PlayerFrameTable::ToFile()
Ritor1
parents:
diff changeset
1540 {
Ritor1
parents:
diff changeset
1541 PlayerFrameTable *v1; // esi@1
Ritor1
parents:
diff changeset
1542 FILE *v2; // eax@1
Ritor1
parents:
diff changeset
1543 FILE *v3; // edi@1
Ritor1
parents:
diff changeset
1544
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
1545 PlayerFrameTable* Str = this;
0
Ritor1
parents:
diff changeset
1546
Ritor1
parents:
diff changeset
1547 v1 = Str;
Ritor1
parents:
diff changeset
1548 v2 = fopen("data\\dpft.bin", "wb");
Ritor1
parents:
diff changeset
1549 v3 = v2;
Ritor1
parents:
diff changeset
1550 if ( !v2 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1551 Error("Unable to save dpft.bin");
0
Ritor1
parents:
diff changeset
1552 fwrite(v1, 4u, 1u, v2);
Ritor1
parents:
diff changeset
1553 fwrite(v1->pFrames, 0xAu, v1->uNumFrames, v3);
Ritor1
parents:
diff changeset
1554 fclose(v3);
Ritor1
parents:
diff changeset
1555 }
Ritor1
parents:
diff changeset
1556
Ritor1
parents:
diff changeset
1557 //----- (00494C0F) --------------------------------------------------------
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1558 void PlayerFrameTable::FromFile(void *data_mm6, void *data_mm7, void *data_mm8)
0
Ritor1
parents:
diff changeset
1559 {
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1560 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
1561 num_mm7_frames = data_mm7 ? *(int *)data_mm7 : 0,
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1562 num_mm8_frames = data_mm8 ? *(int *)data_mm8 : 0;
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1563 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
1564 assert(uNumFrames);
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1565 assert(!num_mm8_frames);
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1566
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
1567 pFrames = (PlayerFrame *)malloc(uNumFrames * sizeof(PlayerFrame));
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1568 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
1569 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
1570 memcpy(pFrames + num_mm6_frames + num_mm7_frames, (char *)data_mm8 + 4, num_mm8_frames * sizeof(PlayerFrame));
0
Ritor1
parents:
diff changeset
1571 }
Ritor1
parents:
diff changeset
1572
Ritor1
parents:
diff changeset
1573 //----- (00494C5A) --------------------------------------------------------
Ritor1
parents:
diff changeset
1574 int PlayerFrameTable::FromFileTxt(const char *Args)
Ritor1
parents:
diff changeset
1575 {
Ritor1
parents:
diff changeset
1576 PlayerFrameTable *v2; // ebx@1
Ritor1
parents:
diff changeset
1577 FILE *v3; // eax@1
Ritor1
parents:
diff changeset
1578 int v4; // esi@3
Ritor1
parents:
diff changeset
1579 void *v5; // eax@10
Ritor1
parents:
diff changeset
1580 FILE *v6; // ST0C_4@12
Ritor1
parents:
diff changeset
1581 char *i; // eax@12
Ritor1
parents:
diff changeset
1582 __int16 v8; // ax@15
Ritor1
parents:
diff changeset
1583 const char *v9; // ST10_4@15
Ritor1
parents:
diff changeset
1584 unsigned __int16 v10; // ax@15
Ritor1
parents:
diff changeset
1585 const char *v11; // ST0C_4@15
Ritor1
parents:
diff changeset
1586 int j; // esi@15
Ritor1
parents:
diff changeset
1587 int v13; // eax@17
Ritor1
parents:
diff changeset
1588 int v14; // edx@22
Ritor1
parents:
diff changeset
1589 int v15; // ecx@23
Ritor1
parents:
diff changeset
1590 int v16; // eax@24
Ritor1
parents:
diff changeset
1591 signed int k; // eax@27
Ritor1
parents:
diff changeset
1592 PlayerFrame *v18; // edx@28
Ritor1
parents:
diff changeset
1593 int v19; // esi@28
Ritor1
parents:
diff changeset
1594 int l; // ecx@29
Ritor1
parents:
diff changeset
1595 char Buf; // [sp+Ch] [bp-2F8h]@3
Ritor1
parents:
diff changeset
1596 FrameTableTxtLine v23; // [sp+200h] [bp-104h]@4
Ritor1
parents:
diff changeset
1597 FrameTableTxtLine v24; // [sp+27Ch] [bp-88h]@4
Ritor1
parents:
diff changeset
1598 int v25; // [sp+2F8h] [bp-Ch]@3
Ritor1
parents:
diff changeset
1599 int v26; // [sp+2FCh] [bp-8h]@3
Ritor1
parents:
diff changeset
1600 FILE *File; // [sp+300h] [bp-4h]@1
Ritor1
parents:
diff changeset
1601 int Argsa; // [sp+30Ch] [bp+8h]@28
Ritor1
parents:
diff changeset
1602
Ritor1
parents:
diff changeset
1603 v2 = this;
Ritor1
parents:
diff changeset
1604 //TileTable::dtor((TileTable *)this);
Ritor1
parents:
diff changeset
1605 v3 = fopen(Args, "r");
Ritor1
parents:
diff changeset
1606 File = v3;
Ritor1
parents:
diff changeset
1607 if ( !v3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1608 Error("PlayerFrameTable::load - Unable to open file: %s.", Args);
0
Ritor1
parents:
diff changeset
1609 v4 = 0;
Ritor1
parents:
diff changeset
1610 v25 = 0;
Ritor1
parents:
diff changeset
1611 v26 = 1;
Ritor1
parents:
diff changeset
1612 if ( fgets(&Buf, 490, v3) )
Ritor1
parents:
diff changeset
1613 {
Ritor1
parents:
diff changeset
1614 do
Ritor1
parents:
diff changeset
1615 {
Ritor1
parents:
diff changeset
1616 *strchr(&Buf, 10) = 0;
703
a9c1fb7483c2 monster parser almost complete.
Gloval
parents: 701
diff changeset
1617 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
1618 if ( v24.uPropCount && *v24.pProperties[0] != 47 )
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1619 {
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1620 if ( v24.uPropCount < 3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1621 Error("PlayerFrameTable::load, too few arguments, %s line %i.", Args, v26);
0
Ritor1
parents:
diff changeset
1622 ++v25;
Ritor1
parents:
diff changeset
1623 }
Ritor1
parents:
diff changeset
1624 ++v26;
Ritor1
parents:
diff changeset
1625 }
Ritor1
parents:
diff changeset
1626 while ( fgets(&Buf, 490, File) );
Ritor1
parents:
diff changeset
1627 v4 = v25;
Ritor1
parents:
diff changeset
1628 }
Ritor1
parents:
diff changeset
1629 v2->uNumFrames = v4;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1567
diff changeset
1630 v5 = malloc(10 * v4);
0
Ritor1
parents:
diff changeset
1631 v2->pFrames = (PlayerFrame *)v5;
Ritor1
parents:
diff changeset
1632 if ( !v5 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1529
diff changeset
1633 Error("PlayerFrameTable::load - Out of Memory!");
0
Ritor1
parents:
diff changeset
1634 v6 = File;
Ritor1
parents:
diff changeset
1635 v2->uNumFrames = 0;
Ritor1
parents:
diff changeset
1636 fseek(v6, 0, 0);
Ritor1
parents:
diff changeset
1637 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
Ritor1
parents:
diff changeset
1638 {
Ritor1
parents:
diff changeset
1639 *strchr(&Buf, 10) = 0;
703
a9c1fb7483c2 monster parser almost complete.
Gloval
parents: 701
diff changeset
1640 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
1641 if ( v24.uPropCount && *v24.pProperties[0] != 47 )
0
Ritor1
parents:
diff changeset
1642 {
Ritor1
parents:
diff changeset
1643 v8 = atoi(v24.pProperties[0]);
Ritor1
parents:
diff changeset
1644 v9 = v24.pProperties[1];
130
1c471f3629fb Party expressions update
Nomad
parents: 121
diff changeset
1645 v2->pFrames[v2->uNumFrames].expression = (CHARACTER_EXPRESSION_ID)v8;
0
Ritor1
parents:
diff changeset
1646 v10 = atoi(v9);
Ritor1
parents:
diff changeset
1647 v11 = v24.pProperties[2];
Ritor1
parents:
diff changeset
1648 v2->pFrames[v2->uNumFrames].uTextureID = v10;
Ritor1
parents:
diff changeset
1649 v2->pFrames[v2->uNumFrames].uAnimTime = atoi(v11);
Ritor1
parents:
diff changeset
1650 v2->pFrames[v2->uNumFrames].uAnimLength = 0;
Ritor1
parents:
diff changeset
1651 v2->pFrames[v2->uNumFrames].uFlags = 0;
701
d5b16a44d9b3 frame_table parser, new files for UI func
Gloval
parents: 697
diff changeset
1652 for ( j = 3; j < v24.uPropCount; ++j )
0
Ritor1
parents:
diff changeset
1653 {
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
1654 if ( !_stricmp(v24.pProperties[j], "New") )
0
Ritor1
parents:
diff changeset
1655 {
Ritor1
parents:
diff changeset
1656 v13 = (int)&v2->pFrames[v2->uNumFrames].uFlags;
Ritor1
parents:
diff changeset
1657 *(char *)v13 |= 4u;
Ritor1
parents:
diff changeset
1658 }
Ritor1
parents:
diff changeset
1659 }
Ritor1
parents:
diff changeset
1660 ++v2->uNumFrames;
Ritor1
parents:
diff changeset
1661 }
Ritor1
parents:
diff changeset
1662 }
Ritor1
parents:
diff changeset
1663 fclose(File);
Ritor1
parents:
diff changeset
1664 v14 = 0;
Ritor1
parents:
diff changeset
1665 if ( (signed int)(v2->uNumFrames - 1) > 0 )
Ritor1
parents:
diff changeset
1666 {
Ritor1
parents:
diff changeset
1667 v15 = 0;
Ritor1
parents:
diff changeset
1668 do
Ritor1
parents:
diff changeset
1669 {
Ritor1
parents:
diff changeset
1670 v16 = (int)&v2->pFrames[v15];
Ritor1
parents:
diff changeset
1671 if ( !(*(char *)(v16 + 18) & 4) )
Ritor1
parents:
diff changeset
1672 *(char *)(v16 + 8) |= 1u;
Ritor1
parents:
diff changeset
1673 ++v14;
Ritor1
parents:
diff changeset
1674 ++v15;
Ritor1
parents:
diff changeset
1675 }
Ritor1
parents:
diff changeset
1676 while ( v14 < (signed int)(v2->uNumFrames - 1) );
Ritor1
parents:
diff changeset
1677 }
Ritor1
parents:
diff changeset
1678 for ( k = 0; k < (signed int)v2->uNumFrames; *(short *)(Argsa + 6) = v19 )
Ritor1
parents:
diff changeset
1679 {
Ritor1
parents:
diff changeset
1680 v18 = v2->pFrames;
Ritor1
parents:
diff changeset
1681 Argsa = (int)&v18[k];
Ritor1
parents:
diff changeset
1682 v19 = *(short *)(Argsa + 4);
Ritor1
parents:
diff changeset
1683 if ( *(char *)(Argsa + 8) & 1 )
Ritor1
parents:
diff changeset
1684 {
Ritor1
parents:
diff changeset
1685 ++k;
Ritor1
parents:
diff changeset
1686 for ( l = (int)&v18[k]; *(char *)(l + 8) & 1; l += 10 )
Ritor1
parents:
diff changeset
1687 {
Ritor1
parents:
diff changeset
1688 v19 += *(short *)(l + 4);
Ritor1
parents:
diff changeset
1689 ++k;
Ritor1
parents:
diff changeset
1690 }
Ritor1
parents:
diff changeset
1691 LOWORD(v19) = v18[k].uAnimTime + v19;
Ritor1
parents:
diff changeset
1692 }
Ritor1
parents:
diff changeset
1693 ++k;
Ritor1
parents:
diff changeset
1694 }
Ritor1
parents:
diff changeset
1695 return 1;
Ritor1
parents:
diff changeset
1696 }
Ritor1
parents:
diff changeset
1697
Ritor1
parents:
diff changeset
1698 //----- (00495366) --------------------------------------------------------
Ritor1
parents:
diff changeset
1699 char *__fastcall sub_495366(unsigned __int8 a1, unsigned __int8 a2)
Ritor1
parents:
diff changeset
1700 {
Ritor1
parents:
diff changeset
1701 int v2; // edi@1
Ritor1
parents:
diff changeset
1702 int v3; // edx@2
Ritor1
parents:
diff changeset
1703 int v4; // esi@3
Ritor1
parents:
diff changeset
1704 int v5; // ebx@5
Ritor1
parents:
diff changeset
1705 signed int v7; // [sp+Ch] [bp-14h]@1
Ritor1
parents:
diff changeset
1706 signed int v8; // [sp+10h] [bp-10h]@1
Ritor1
parents:
diff changeset
1707 int **v9; // [sp+14h] [bp-Ch]@4
Ritor1
parents:
diff changeset
1708 signed int v10; // [sp+18h] [bp-8h]@3
Ritor1
parents:
diff changeset
1709 unsigned __int8 v11; // [sp+1Ch] [bp-4h]@1
Ritor1
parents:
diff changeset
1710
Ritor1
parents:
diff changeset
1711 v2 = a1;
Ritor1
parents:
diff changeset
1712 v11 = a2;
Ritor1
parents:
diff changeset
1713 v8 = 0;
Ritor1
parents:
diff changeset
1714 v7 = 0;
Ritor1
parents:
diff changeset
1715 if ( dword_AE336C == a1 )
Ritor1
parents:
diff changeset
1716 {
Ritor1
parents:
diff changeset
1717 v3 = dword_AE3370;
Ritor1
parents:
diff changeset
1718 }
Ritor1
parents:
diff changeset
1719 else
Ritor1
parents:
diff changeset
1720 {
Ritor1
parents:
diff changeset
1721 v4 = a2;
Ritor1
parents:
diff changeset
1722 dword_AE336C = a1;
Ritor1
parents:
diff changeset
1723 v10 = 0;
Ritor1
parents:
diff changeset
1724 if ( (signed int)pNPCStats->uNumNPCNames[v4] <= 0 )
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1725 {
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1726 v3 = rand() % (signed int)pNPCStats->uNumNPCNames[v4];
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1727 }
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1728 else
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1729 {
0
Ritor1
parents:
diff changeset
1730 v9 = (int **)((char *)pNPCStats->pNPCNames + v4 * 4);
Ritor1
parents:
diff changeset
1731 do
Ritor1
parents:
diff changeset
1732 {
Ritor1
parents:
diff changeset
1733 v5 = tolower(*(char *)*v9);
Ritor1
parents:
diff changeset
1734 if ( v5 == tolower(v2) )
Ritor1
parents:
diff changeset
1735 {
Ritor1
parents:
diff changeset
1736 if ( v8 )
Ritor1
parents:
diff changeset
1737 v7 = v10;
Ritor1
parents:
diff changeset
1738 else
Ritor1
parents:
diff changeset
1739 v8 = v10;
Ritor1
parents:
diff changeset
1740 }
Ritor1
parents:
diff changeset
1741 ++v10;
Ritor1
parents:
diff changeset
1742 v9 += 2;
Ritor1
parents:
diff changeset
1743 }
Ritor1
parents:
diff changeset
1744 while ( v10 < (signed int)pNPCStats->uNumNPCNames[v4] );
Ritor1
parents:
diff changeset
1745 if ( v8 && v8 != v7 )
Ritor1
parents:
diff changeset
1746 v3 = v8 + rand() % (v7 - v8);
Ritor1
parents:
diff changeset
1747 else
Ritor1
parents:
diff changeset
1748 v3 = rand() % (signed int)pNPCStats->uNumNPCNames[v4];
1419
9a1adf08f4ed more label cleaning 2
zipi
parents: 1413
diff changeset
1749 }
0
Ritor1
parents:
diff changeset
1750 }
Ritor1
parents:
diff changeset
1751 dword_AE3370 = v3;
Ritor1
parents:
diff changeset
1752 return pNPCStats->pNPCNames[0][v11 + 2 * v3];
Ritor1
parents:
diff changeset
1753 }
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
1754
0
Ritor1
parents:
diff changeset
1755
Ritor1
parents:
diff changeset
1756 //----- (00495430) --------------------------------------------------------
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1757 const char * GetReputationString( signed int a1 )
607
cfca6297e4ae ArmorShop fixes
Gloval
parents: 606
diff changeset
1758 {
566
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1759 if (a1 >= 25)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1760 return pGlobalTXT_LocalizationStrings[379]; // Hated
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1761 else if (a1 >= 6)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1762 return pGlobalTXT_LocalizationStrings[392]; // Unfriendly
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1763 else if (a1 >= -5)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1764 return pGlobalTXT_LocalizationStrings[399]; // Neutral;
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1765 else if (a1 >= -24)
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1766 return pGlobalTXT_LocalizationStrings[402]; // Friendly
0
Ritor1
parents:
diff changeset
1767 else
566
fcbb3c281217 QuickRef reputation string fix
Nomad
parents: 554
diff changeset
1768 return pGlobalTXT_LocalizationStrings[434]; // Respected;
0
Ritor1
parents:
diff changeset
1769 }
Ritor1
parents:
diff changeset
1770
Ritor1
parents:
diff changeset
1771 //----- (00495461) --------------------------------------------------------
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1772 char *BuildDialogueString(const char *lpsz, unsigned __int8 uPlayerID, ItemGen *a3, char *a4, int a5, __int64 *a6)
0
Ritor1
parents:
diff changeset
1773 {
Ritor1
parents:
diff changeset
1774 Player *pPlayer; // ebx@3
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
1775 const char *pText; // esi@7
0
Ritor1
parents:
diff changeset
1776 int v17; // eax@10
Ritor1
parents:
diff changeset
1777 signed __int64 v18; // qax@18
Ritor1
parents:
diff changeset
1778 unsigned __int8 *v20; // ebx@32
Ritor1
parents:
diff changeset
1779 int v21; // ecx@34
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1780 int pReputation; // eax@45
0
Ritor1
parents:
diff changeset
1781 int v29; // eax@68
Ritor1
parents:
diff changeset
1782 __int16 v55[56]; // [sp+10h] [bp-128h]@34
351
5f36449527c6 stru351 -> summoned/spell-enchanted item
Nomad
parents: 348
diff changeset
1783 stru351_summoned_item v56; // [sp+80h] [bp-B8h]@107
0
Ritor1
parents:
diff changeset
1784 char a1[100]; // [sp+B8h] [bp-80h]@3
Ritor1
parents:
diff changeset
1785 int v63; // [sp+12Ch] [bp-Ch]@32
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1786
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1787 if ( IsBadStringPtrA(lpsz, 1) )
0
Ritor1
parents:
diff changeset
1788 return "Invalid String Passed";
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1789
0
Ritor1
parents:
diff changeset
1790 a1[0] = 0;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1791 pPlayer = &pParty->pPlayers[uPlayerID];
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
1792 memset(pTmpBuf2.data(), 0, sizeof(pTmpBuf2));
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1793
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1794 NPCData *npc = nullptr;
0
Ritor1
parents:
diff changeset
1795 if ( dword_5C35D4 )
1211
fd3bea473c0c fix HouseNpcdata array addresiing
Gloval
parents: 1209
diff changeset
1796 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
1797 else
602
628694cd5744 Margaret working
zipi
parents: 569
diff changeset
1798 npc = GetNPCData(sDialogue_SpeakingActorNPC_ID);
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1799
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1800 //pText = a4;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
1801 uint len = strlen(lpsz);
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1802 for (int i = 0, dst = 0; i < len; ++i)
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1803 {
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1804 char c = lpsz[i];
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1805 if (c != '%')
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1806 pTmpBuf2[dst++] = c;
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1807 else
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1808 {
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1809 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
1810
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1811 switch ( v17 )
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1812 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1813 case 1://Ïîäðîáíåå
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1814 strcat(pTmpBuf2.data(), npc->pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1815 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1816 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1817 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1818 case 2:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1819 strcat(pTmpBuf2.data(), pPlayer->pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1820 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1821 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1822 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1823 case 3:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1824 case 4:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1825 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1826 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1827 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1828 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1829 case 5:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1830 v18 = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1831 pText = pGlobalTXT_LocalizationStrings[397];// "evening"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1832 if ( SHIDWORD(v18) <= 0 && SHIDWORD(v18) >= 0 && (unsigned int)v18 >= 5 && SHIDWORD(v18) <= 0 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1833 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1834 if ( SHIDWORD(v18) >= 0 && (unsigned int)v18 >= 11 )
0
Ritor1
parents:
diff changeset
1835 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1836 if ( v18 < 20 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1837 pText = pGlobalTXT_LocalizationStrings[396];// "day"
0
Ritor1
parents:
diff changeset
1838 }
Ritor1
parents:
diff changeset
1839 else
Ritor1
parents:
diff changeset
1840 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1841 pText = pGlobalTXT_LocalizationStrings[395];// "morning"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1842 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1843 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1844 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1845 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1846 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1847 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1848 case 6:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1849 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1850 pText = pGlobalTXT_LocalizationStrings[387];// "lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1851 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1852 pText = pGlobalTXT_LocalizationStrings[385];// "sir"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1853 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1854 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1855 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1856 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1857 case 7:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1858 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1859 pText = pGlobalTXT_LocalizationStrings[389];// "Lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1860 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1861 pText = pGlobalTXT_LocalizationStrings[386];// "Sir"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1862 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1863 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1864 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1865 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1866 case 8:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1867 v63 = 0;
1460
ff2118028c71 renaming _guilds_member_bits to _achieved_awards_bits
Gloval
parents: 1453
diff changeset
1868 v20 = (unsigned __int8 *)pPlayer->_achieved_awards_bits;
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
1869 for ( uint _i = 0; _i < 28; ++_i )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1870 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1871 if ( (unsigned __int16)_449B57_test_bit(v20, word_4EE150[i]) )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1872 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1873 v21 = v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1874 ++v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1875 v55[v63] = word_4EE150[i];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1876 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1877 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1878 if ( v63 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1879 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1880 if ( dword_A74CDC == -1 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1881 dword_A74CDC = rand() % v63;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1882 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
1883 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1884 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1885 pText = (char *)pNPCTopics[55].pText;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1886 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1887 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1888 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1889 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1890 case 9:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1891 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1892 pText = pGlobalTXT_LocalizationStrings[384];// "her"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1893 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1894 pText = pGlobalTXT_LocalizationStrings[383];// "his"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1895 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1896 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1897 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1898 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1899 case 10:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1900 if ( pPlayer->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1901 pText = pGlobalTXT_LocalizationStrings[389];// "Lady"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1902 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1903 pText = pGlobalTXT_LocalizationStrings[388];// "Lord"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1904 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1905 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1906 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1907 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1908 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
1909 pReputation = pParty->GetPartyReputation();
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1910 if ( pReputation >= 25 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1911 pText = pGlobalTXT_LocalizationStrings[379];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1912 else//v25 < 25
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1913 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1914 if ( pReputation < 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1915 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1916 if ( pReputation >= -5 )//6 >= v25 >= -5
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1917 pText = pGlobalTXT_LocalizationStrings[399];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1918 else// v25 < -5
0
Ritor1
parents:
diff changeset
1919 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1920 if ( pReputation < -24 )//-24 > v25
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1921 pText = pGlobalTXT_LocalizationStrings[434];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1922 else// -5 > v25 > -24
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1923 pText = pGlobalTXT_LocalizationStrings[402];
0
Ritor1
parents:
diff changeset
1924 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1925 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1926 else//25 > v25 > 6
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1927 pText = pGlobalTXT_LocalizationStrings[392];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1928 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1929 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1930 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1931 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1932 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1933 case 12:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1934 pReputation = npc->rep;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1935 if ( pReputation >= 25 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1936 pText = pGlobalTXT_LocalizationStrings[379];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1937 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1938 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1939 if ( pReputation < 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1940 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1941 if ( pReputation >= -5 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1942 pText = pGlobalTXT_LocalizationStrings[399];
0
Ritor1
parents:
diff changeset
1943 else
Ritor1
parents:
diff changeset
1944 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1945 if ( pReputation < -24 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1946 pText = pGlobalTXT_LocalizationStrings[434];
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1947 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1948 pText = pGlobalTXT_LocalizationStrings[402];
0
Ritor1
parents:
diff changeset
1949 }
Ritor1
parents:
diff changeset
1950 }
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1951 else
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1952 pText = pGlobalTXT_LocalizationStrings[392];
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
1953 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1954 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1955 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1956 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1957 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1958 case 13:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1959 strcat(pTmpBuf2.data(), sub_495366(pPlayer->pName[0], pPlayer->uSex));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1960 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1961 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1962 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1963 case 14:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1964 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1965 pText = pGlobalTXT_LocalizationStrings[391];// "sister"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1966 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1967 pText = pGlobalTXT_LocalizationStrings[390];// "brother"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1968 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1969 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1970 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1971 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1972 case 15:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1973 strcat(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[393]);// "daughter"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1974 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1975 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1976 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1977 case 16:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1978 if ( npc->uSex )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1979 pText = pGlobalTXT_LocalizationStrings[391];// "sister"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1980 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1981 pText = pGlobalTXT_LocalizationStrings[390];// "brother"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1982 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1983 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1984 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1985 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1986 case 17://òåêñò íà¸ìíîãî ÍÏÑ
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1987 {
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
1988 uint pay_percentage = pNPCStats->pProfessions[npc->uProfession - 1].uHirePrice / 100;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1989 if ( !pay_percentage )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1990 pay_percentage = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1991 sprintf(a1, "%lu", pay_percentage);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1992 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1993 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1994 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1995 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1996 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1997 case 18:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1998 case 19:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
1999 case 20:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2000 case 21:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2001 case 22:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2002 case 26:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2003 strncpy(a1, lpsz + i + 1, 2);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2004 sprintf(a1, "%lu", atoi(a1));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2005 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2006 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2007 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2008 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2009 case 23:
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
2010 if ( pMapStats->GetMapInfo(pCurrentMapName) )
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1461
diff changeset
2011 pText = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)].pName;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2012 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2013 pText = pGlobalTXT_LocalizationStrings[394];// "Unknown"
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2014 strcat(pTmpBuf2.data(), pText);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2015 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2016 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2017 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2018 case 24://íàçâàíèå òîâàðà â ïðîäàæå
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2019 sprintfex(a1, format_4E2D80, TargetColor(255, 255, 155), a3->GetDisplayName());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2020 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2021 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2022 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2023 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2024 case 25:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2025 v29 = pPlayer->GetBaseBuyingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
0
Ritor1
parents:
diff changeset
2026 switch ( a5 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2027 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2028 case 3:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2029 v29 = pPlayer->GetBaseSellingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2030 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2031 case 4:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2032 v29 = pPlayer->GetBaseIdentifyPrice(p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2033 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2034 case 5:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2035 v29 = pPlayer->GetBaseRepairPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2036 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2037 case 6:
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2038 v29 = pPlayer->GetBaseSellingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier) / 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2039 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2040 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2041 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2042 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2043 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2044 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2045 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2046 case 27://òåêñò ïðîäàæè
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2047 v29 = pPlayer->GetBuyingPrice(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2048 if ( a5 == 3 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2049 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2050 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
2051 if (a3->IsBroken())
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2052 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2053 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2054 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2055 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2056 i += 2;
0
Ritor1
parents:
diff changeset
2057 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2058 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2059 if ( a5 != 4 )
0
Ritor1
parents:
diff changeset
2060 {
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2061 if ( a5 == 5 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2062 v29 = pPlayer->GetPriceRepair(a3->GetValue(), p2DEvents[(signed int)a4 - 1].fPriceMultiplier);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2063 else
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2064 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2065 if ( a5 == 6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2066 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2067 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
2068 if (a3->IsBroken())
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2069 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2070 if (!v29)
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2071 v29 = 1;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2072 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2073 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2074 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2075 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2076 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2077 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2078 }
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2079 sprintfex(a1, "%lu", v29);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2080 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2081 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2082 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2083 break;
0
Ritor1
parents:
diff changeset
2084 }
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2085 sprintfex(a1, "%lu", pPlayer->GetPriceIdentification(p2DEvents[(signed int)a4 - 1].fPriceMultiplier));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2086 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2087 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2088 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2089 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2090 case 28://ïðîôåññèÿ
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2091 strcat(pTmpBuf2.data(), (char *)p2DEvents[(signed int)a4 - 1].pProprieterTitle);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2092 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2093 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2094 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2095 case 29:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2096 sprintfex(a1, "%lu", pPlayer->GetPriceIdentification(p2DEvents[(signed int)a4 - 1].fPriceMultiplier));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2097 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2098 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2099 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2100 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2101 case 30:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2102 if ( !a6 )
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2103 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2104 strcat(pTmpBuf2.data(), a4);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2105 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2106 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2107 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2108 }
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2109 init_summoned_item(&v56, *a6);
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2110 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
2111 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2112 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2113 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2114 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2115 case 31:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2116 case 32:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2117 case 33:
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2118 case 34:
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2119 strcat(pTmpBuf2.data(), pParty->pPlayers[v17 - 31].pName);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2120 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2121 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2122 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2123 default:
0
Ritor1
parents:
diff changeset
2124 if ( v17 <= 50 || v17 > 70 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2125 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2126 strncpy(a1, lpsz + i + 1, 2);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2127 sprintf(a1, "%lu", atoi(a1));
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2128 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2129 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2130 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2131 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2132 }
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2133 if ( v17 - 51 >= 20 )
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2134 {
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2135 strcat(pTmpBuf2.data(), a4);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2136 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2137 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2138 break;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2139 }
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
2140 init_summoned_item(&v56, pParty->PartyTimes._s_times[v17-51]);
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2141 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
2142 strcat(pTmpBuf2.data(), a1);
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2143 dst = strlen(pTmpBuf2.data());
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2144 i += 2;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1424
diff changeset
2145 break;
254
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2146 }
d1af3319bc44 BuilDialogueString: replaces %xx in dialogue strings by appropriate values
Nomad
parents: 250
diff changeset
2147 }
0
Ritor1
parents:
diff changeset
2148 }
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2149 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
2150 }
Ritor1
parents:
diff changeset
2151
Ritor1
parents:
diff changeset
2152 //----- (0049B04D) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2153 void stru154::GetFacePlaneAndClassify(ODMFace *a2, BSPVertexBuffer *a3)
0
Ritor1
parents:
diff changeset
2154 {
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2155 //stru154 *v3; // edi@1
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2156 //signed int v4; // eax@1
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2157 //signed int result; // eax@9
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2158 //signed int v6; // [sp-8h] [bp-18h]@8
0
Ritor1
parents:
diff changeset
2159 Vec3_float_ v; // [sp+4h] [bp-Ch]@1
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2160 float v7;
0
Ritor1
parents:
diff changeset
2161
Ritor1
parents:
diff changeset
2162 v.x = 0.0;
Ritor1
parents:
diff changeset
2163 v.y = 0.0;
Ritor1
parents:
diff changeset
2164 v.z = 0.0;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2165 GetFacePlane(a2, a3, &v, &v7);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2166
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2167 if (fabsf(a2->pFacePlane.vNormal.z) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2168 polygonType = POLYGON_VerticalWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2169 else if (fabsf(a2->pFacePlane.vNormal.x) < 1e-6f &&
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2170 fabsf(a2->pFacePlane.vNormal.y) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2171 polygonType = POLYGON_Floor;
0
Ritor1
parents:
diff changeset
2172 else
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2173 polygonType = POLYGON_InBetweenFloorAndWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2174
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2175 face_plane.vNormal.x = v.x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2176 face_plane.vNormal.y = v.y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2177 face_plane.vNormal.z = v.z;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2178 face_plane.dist = v7;
0
Ritor1
parents:
diff changeset
2179 }
Ritor1
parents:
diff changeset
2180
Ritor1
parents:
diff changeset
2181 //----- (0049B0C9) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2182 void stru154::ClassifyPolygon(Vec3_float_ *pNormal, float dist)
0
Ritor1
parents:
diff changeset
2183 {
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2184 if (fabsf(pNormal->z) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2185 polygonType = POLYGON_VerticalWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2186 else if (fabsf(pNormal->x) < 1e-6f &&
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2187 fabsf(pNormal->y) < 1e-6f)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2188 polygonType = POLYGON_Floor;
0
Ritor1
parents:
diff changeset
2189 else
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2190 polygonType = POLYGON_InBetweenFloorAndWall;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2191
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2192 face_plane.vNormal.x = pNormal->x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2193 face_plane.dist = dist;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2194 face_plane.vNormal.y = pNormal->y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2195 face_plane.vNormal.z = pNormal->z;
0
Ritor1
parents:
diff changeset
2196 }
Ritor1
parents:
diff changeset
2197
Ritor1
parents:
diff changeset
2198 //----- (0049B13D) --------------------------------------------------------
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2199 void stru154::GetFacePlane(ODMFace *pFace, BSPVertexBuffer *pVertices, Vec3_float_ *pOutNormal, float *pOutDist)
0
Ritor1
parents:
diff changeset
2200 {
Ritor1
parents:
diff changeset
2201 ODMFace *v5; // ebx@1
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2202 //int v6; // eax@1
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2203 //unsigned __int16 *v7; // ebx@2
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2204 //Vec3_int_ *v8; // eax@3
0
Ritor1
parents:
diff changeset
2205 Vec3_int_ *v9; // ecx@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2206 //double v10; // st7@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2207 //int v11; // ecx@3
0
Ritor1
parents:
diff changeset
2208 Vec3_int_ *v12; // ecx@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2209 //double v13; // st7@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2210 //double v14; // st6@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2211 //double v15; // st5@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2212 //int v16; // ecx@3
0
Ritor1
parents:
diff changeset
2213 Vec3_int_ *v17; // eax@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2214 //double v18; // st5@3
0
Ritor1
parents:
diff changeset
2215 Vec3_float_ *v19; // eax@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2216 //int result; // eax@8
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2217 //float v21; // ecx@10
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2218 //double v22; // st7@10
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2219 //double v23; // st6@10
0
Ritor1
parents:
diff changeset
2220 Vec3_float_ v2; // [sp+4h] [bp-64h]@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2221 //float v25; // [sp+18h] [bp-50h]@3
0
Ritor1
parents:
diff changeset
2222 float v26; // [sp+1Ch] [bp-4Ch]@3
Ritor1
parents:
diff changeset
2223 float v27; // [sp+20h] [bp-48h]@3
Ritor1
parents:
diff changeset
2224 float v28; // [sp+24h] [bp-44h]@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2225 //float v29; // [sp+2Ch] [bp-3Ch]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2226 //float v30; // [sp+30h] [bp-38h]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2227 //float v31; // [sp+34h] [bp-34h]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2228 //float v32; // [sp+38h] [bp-30h]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2229 //float v33; // [sp+3Ch] [bp-2Ch]@3
0
Ritor1
parents:
diff changeset
2230 Vec3_float_ v1; // [sp+40h] [bp-28h]@1
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2231 //float v35; // [sp+4Ch] [bp-1Ch]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2232 //float v36; // [sp+50h] [bp-18h]@3
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2233 //float v37; // [sp+54h] [bp-14h]@3
0
Ritor1
parents:
diff changeset
2234 Vec3_float_ v38; // [sp+58h] [bp-10h]@3
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2235 //int v39; // [sp+64h] [bp-4h]@1
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2236
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2237 //v39 = 0;
0
Ritor1
parents:
diff changeset
2238 v1.x = 0.0;
Ritor1
parents:
diff changeset
2239 v5 = pFace;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2240 //v6 = pFace->uNumVertices;
0
Ritor1
parents:
diff changeset
2241 v1.y = 0.0;
Ritor1
parents:
diff changeset
2242 v1.z = 0.0;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2243
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2244 if (pFace->uNumVertices >= 2)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2245 {
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2246 int i = 0;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2247 while ( i < pFace->uNumVertices - 2 )
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2248 {
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2249 v9 = &pVertices->pVertices[pFace->pVertexIDs[i]];
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2250 v12 = &pVertices->pVertices[pFace->pVertexIDs[i + 1]];
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2251 v17 = &pVertices->pVertices[pFace->pVertexIDs[i + 2]];
1093
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 1080
diff changeset
2252 i++;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2253 v1.x = v12->x - v9->x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2254 v26 = v17->x - v12->x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2255 v1.y = v12->y - v9->y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2256 v27 = v17->y - v12->y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2257 v1.z = v12->z - v9->z;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2258 v28 = v17->z - v12->z;
0
Ritor1
parents:
diff changeset
2259 v19 = Vec3_float_::Cross(&v1, &v2, v26, v27, v28);
Ritor1
parents:
diff changeset
2260 v38.x = v19->x;
Ritor1
parents:
diff changeset
2261 v38.y = v19->y;
Ritor1
parents:
diff changeset
2262 v38.z = v19->z;
734
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2263 if ( v38.x != 0.0 || v38.y != 0.0 || v38.z != 0.0)
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2264 {
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2265 v38.Normalize();
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2266
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2267 pOutNormal->x = v38.x;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2268 pOutNormal->y = v38.y;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2269 pOutNormal->z = v38.z;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2270
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2271 *pOutDist = -(v9->x * v38.x + v9->y * v38.y + v9->z * v38.z);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2272 return;
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2273 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2274 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2275 }
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2276
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2277 pOutNormal->x = (double)(v5->pFacePlane.vNormal.x & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.vNormal.x >> 16);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2278 pOutNormal->y = (double)(v5->pFacePlane.vNormal.y & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.vNormal.y >> 16);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2279 pOutNormal->z = (double)(v5->pFacePlane.vNormal.z & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.vNormal.z >> 16);
2f4e33c1ed24 stru154
Nomad
parents: 731
diff changeset
2280 *pOutDist = (double)(v5->pFacePlane.dist & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.dist >> 16);
0
Ritor1
parents:
diff changeset
2281 }
Ritor1
parents:
diff changeset
2282
Ritor1
parents:
diff changeset
2283 //----- (0049D700) --------------------------------------------------------
Ritor1
parents:
diff changeset
2284 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim)
Ritor1
parents:
diff changeset
2285 {
Ritor1
parents:
diff changeset
2286 unsigned int v1; // eax@1
Ritor1
parents:
diff changeset
2287 int v2; // ecx@1
Ritor1
parents:
diff changeset
2288 unsigned int v3; // eax@1
Ritor1
parents:
diff changeset
2289
Ritor1
parents:
diff changeset
2290 v1 = uDim;
Ritor1
parents:
diff changeset
2291 v2 = 0;
Ritor1
parents:
diff changeset
2292 v3 = v1 - 1;
Ritor1
parents:
diff changeset
2293 while ( v3 & 1 )
Ritor1
parents:
diff changeset
2294 {
Ritor1
parents:
diff changeset
2295 v3 >>= 1;
Ritor1
parents:
diff changeset
2296 ++v2;
Ritor1
parents:
diff changeset
2297 }
Ritor1
parents:
diff changeset
2298 return v3 == 0 ? v2 : 0;
Ritor1
parents:
diff changeset
2299 }
Ritor1
parents:
diff changeset
2300
Ritor1
parents:
diff changeset
2301 //----- (004A19D8) --------------------------------------------------------
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2302 unsigned int BlendColors(unsigned int a1, unsigned int a2)
0
Ritor1
parents:
diff changeset
2303 {
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2304 /*signed __int64 v2; // ST10_8@1
0
Ritor1
parents:
diff changeset
2305 double v3; // st7@1
Ritor1
parents:
diff changeset
2306 float v4; // ST24_4@1
Ritor1
parents:
diff changeset
2307 double v5; // ST10_8@1
Ritor1
parents:
diff changeset
2308 int v6; // ST1C_4@1
Ritor1
parents:
diff changeset
2309 float v7; // ST24_4@1
Ritor1
parents:
diff changeset
2310 double v8; // ST10_8@1
Ritor1
parents:
diff changeset
2311 unsigned __int8 v9; // ST20_1@1
Ritor1
parents:
diff changeset
2312 float v10; // ST24_4@1
Ritor1
parents:
diff changeset
2313 double v11; // ST10_8@1
Ritor1
parents:
diff changeset
2314 float v12; // ST24_4@1
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2315 double v13; // ST08_8@1*/
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2316
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2317 uint alpha = (uint)floorf(0.5f + (a1 >> 24) / 255.0f *
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2318 (a2 >> 24) / 255.0f * 255.0f),
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2319 red = (uint)floorf(0.5f + ((a1 >> 16) & 0xFF) / 255.0f *
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2320 ((a2 >> 16) & 0xFF) / 255.0f * 255.0f),
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2321 green = (uint)floorf(0.5f + ((a1 >> 8) & 0xFF) / 255.0f *
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2322 ((a2 >> 8) & 0xFF) / 255.0f * 255.0f),
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2323 blue = (uint)floorf(0.5f + ((a1 >> 0) & 0xFF) / 255.0f *
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2324 ((a2 >> 0) & 0xFF) / 255.0f * 255.0f);
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2325 return (alpha << 24) | (red << 16) | (green << 8) | blue;
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2326 /*v2 = a1 >> 24;
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2327 v3 = (double)v2 / 255.0f;
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2328 HIDWORD(v2) = 0;
0
Ritor1
parents:
diff changeset
2329 LODWORD(v2) = a2 >> 24;
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2330 v4 = v3 * (double)v2 / 255.0f * 255.0;
0
Ritor1
parents:
diff changeset
2331 v5 = v4 + 6.7553994e15;
Ritor1
parents:
diff changeset
2332 v6 = LODWORD(v5);
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2333 v7 = (double)((a1 >> 16) & 0xFFi64) / 255.0f * (double)((a2 >> 16) & 0xFF) * 0.0039215689 * 255.0;
0
Ritor1
parents:
diff changeset
2334 v8 = v7 + 6.7553994e15;
Ritor1
parents:
diff changeset
2335 v9 = LOBYTE(v8);
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2336 v10 = (double)((unsigned __int16)a1 >> 8) / 255.0f * (double)((unsigned __int16)a2 >> 8) / 255.0f * 255.0;
0
Ritor1
parents:
diff changeset
2337 v11 = v10 + 6.7553994e15;
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2338 v12 = (double)(a1 & 0xFFi64) / 255.0f * (double)(unsigned __int8)a2 / 255.0f * 255.0;
0
Ritor1
parents:
diff changeset
2339 v13 = v12 + 6.7553994e15;
737
225d92620998 004A19D8 refactored
Nomad
parents: 735
diff changeset
2340 return LOBYTE(v13) | ((LOBYTE(v11) | (((v6 << 8) | v9) << 8)) << 8);*/
0
Ritor1
parents:
diff changeset
2341 }
Ritor1
parents:
diff changeset
2342
Ritor1
parents:
diff changeset
2343 //----- (004A46E6) --------------------------------------------------------
Ritor1
parents:
diff changeset
2344 int __fastcall sr_4A46E6_draw_particle_segment(unsigned int x, signed int y, signed int _z, int a4, unsigned int lightColor)
Ritor1
parents:
diff changeset
2345 {
Ritor1
parents:
diff changeset
2346 int v5; // eax@1
Ritor1
parents:
diff changeset
2347 int z; // eax@1
Ritor1
parents:
diff changeset
2348 unsigned int v7; // eax@9
Ritor1
parents:
diff changeset
2349 unsigned int v8; // ecx@9
Ritor1
parents:
diff changeset
2350 int v9; // eax@9
Ritor1
parents:
diff changeset
2351 unsigned int v10; // eax@10
Ritor1
parents:
diff changeset
2352 int *v11; // esi@10
Ritor1
parents:
diff changeset
2353 int *v12; // edi@10
Ritor1
parents:
diff changeset
2354 int v13; // ecx@10
Ritor1
parents:
diff changeset
2355 int v14; // edx@10
Ritor1
parents:
diff changeset
2356 unsigned int v15; // eax@22
Ritor1
parents:
diff changeset
2357 int *v16; // esi@22
Ritor1
parents:
diff changeset
2358 int *v17; // edi@22
Ritor1
parents:
diff changeset
2359 int v18; // ecx@22
Ritor1
parents:
diff changeset
2360 int v19; // edx@22
Ritor1
parents:
diff changeset
2361 unsigned __int16 *pTarget; // [sp+Ch] [bp-8h]@9
Ritor1
parents:
diff changeset
2362 int *pTargetZ; // [sp+10h] [bp-4h]@9
Ritor1
parents:
diff changeset
2363 unsigned int v22; // [sp+1Ch] [bp+8h]@9
Ritor1
parents:
diff changeset
2364 signed int v23; // [sp+20h] [bp+Ch]@1
Ritor1
parents:
diff changeset
2365
Ritor1
parents:
diff changeset
2366 v5 = a4;
Ritor1
parents:
diff changeset
2367 v23 = _z >> 16;
Ritor1
parents:
diff changeset
2368 z = x + v5;
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2369 if ( z >= (signed int)pViewport->uViewportTL_X
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2370 && (signed int)x <= (signed int)pViewport->uViewportBR_X
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2371 && y >= (signed int)pViewport->uViewportTL_Y
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2372 && y <= (signed int)pViewport->uViewportBR_Y )
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2373 {
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2374 if ( (signed int)x < (signed int)pViewport->uViewportTL_X )
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2375 x = pViewport->uViewportTL_X;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2376 if ( z > (signed int)pViewport->uViewportBR_X )
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2377 z = pViewport->uViewportBR_X;
0
Ritor1
parents:
diff changeset
2378 pTarget = &pRenderer->pTargetSurface[x + y * pRenderer->uTargetSurfacePitch];
Ritor1
parents:
diff changeset
2379 v22 = z - x;
Ritor1
parents:
diff changeset
2380 pTargetZ = &pRenderer->pActiveZBuffer[x + 640 * y];
Ritor1
parents:
diff changeset
2381 v7 = lightColor >> 3;
Ritor1
parents:
diff changeset
2382 v8 = lightColor & 0xF0;
Ritor1
parents:
diff changeset
2383 v9 = v7 & 0x1E0000;
Ritor1
parents:
diff changeset
2384 if ( pRenderer->uTargetGBits == 5 )
Ritor1
parents:
diff changeset
2385 {
Ritor1
parents:
diff changeset
2386 v10 = (v8 | (((unsigned __int16)(lightColor & 0xF000) | (unsigned int)v9) >> 3)) >> 4;
Ritor1
parents:
diff changeset
2387 v11 = (int *)pTarget;
Ritor1
parents:
diff changeset
2388 v12 = pTargetZ;
Ritor1
parents:
diff changeset
2389 v13 = v22;
Ritor1
parents:
diff changeset
2390 v14 = (v10 << 16) | v10;
Ritor1
parents:
diff changeset
2391 z = (unsigned __int8)pTarget & 2;
Ritor1
parents:
diff changeset
2392 if ( (unsigned __int8)pTarget & 2 )
Ritor1
parents:
diff changeset
2393 {
Ritor1
parents:
diff changeset
2394 z = (unsigned int)*pTargetZ >> 16;
Ritor1
parents:
diff changeset
2395 if ( z > v23 )
Ritor1
parents:
diff changeset
2396 {
Ritor1
parents:
diff changeset
2397 z = v14 + ((*pTarget & 0x7BDEu) >> 1);
Ritor1
parents:
diff changeset
2398 *pTarget = z;
Ritor1
parents:
diff changeset
2399 }
Ritor1
parents:
diff changeset
2400 v13 = v22 - 1;
Ritor1
parents:
diff changeset
2401 v11 = (int *)(pTarget + 1);
Ritor1
parents:
diff changeset
2402 v12 = pTargetZ + 1;
Ritor1
parents:
diff changeset
2403 }
Ritor1
parents:
diff changeset
2404 while ( v13 != 1 )
Ritor1
parents:
diff changeset
2405 {
Ritor1
parents:
diff changeset
2406 if ( v13 < 1 )
Ritor1
parents:
diff changeset
2407 return z;
Ritor1
parents:
diff changeset
2408 z = (unsigned int)*v12 >> 16;
Ritor1
parents:
diff changeset
2409 if ( z <= v23 )
Ritor1
parents:
diff changeset
2410 {
Ritor1
parents:
diff changeset
2411 v13 -= 2;
Ritor1
parents:
diff changeset
2412 ++v11;
Ritor1
parents:
diff changeset
2413 v12 += 2;
Ritor1
parents:
diff changeset
2414 }
Ritor1
parents:
diff changeset
2415 else
Ritor1
parents:
diff changeset
2416 {
Ritor1
parents:
diff changeset
2417 v12 += 2;
Ritor1
parents:
diff changeset
2418 z = v14 + ((*v11 & 0x7BDE7BDEu) >> 1);
Ritor1
parents:
diff changeset
2419 v13 -= 2;
Ritor1
parents:
diff changeset
2420 *v11 = z;
Ritor1
parents:
diff changeset
2421 ++v11;
Ritor1
parents:
diff changeset
2422 }
Ritor1
parents:
diff changeset
2423 }
Ritor1
parents:
diff changeset
2424 z = (unsigned int)*v12 >> 16;
Ritor1
parents:
diff changeset
2425 if ( z > v23 )
Ritor1
parents:
diff changeset
2426 {
Ritor1
parents:
diff changeset
2427 z = v14 + ((*(short *)v11 & 0x7BDEu) >> 1);
Ritor1
parents:
diff changeset
2428 *(short *)v11 = z;
Ritor1
parents:
diff changeset
2429 }
Ritor1
parents:
diff changeset
2430 }
Ritor1
parents:
diff changeset
2431 else
Ritor1
parents:
diff changeset
2432 {
Ritor1
parents:
diff changeset
2433 v15 = (v8 | (((unsigned __int16)(lightColor & 0xF800) | (unsigned int)v9) >> 2)) >> 4;
Ritor1
parents:
diff changeset
2434 v16 = (int *)pTarget;
Ritor1
parents:
diff changeset
2435 v17 = pTargetZ;
Ritor1
parents:
diff changeset
2436 v18 = v22;
Ritor1
parents:
diff changeset
2437 v19 = (v15 << 16) | v15;
Ritor1
parents:
diff changeset
2438 z = (unsigned __int8)pTarget & 2;
Ritor1
parents:
diff changeset
2439 if ( (unsigned __int8)pTarget & 2 )
Ritor1
parents:
diff changeset
2440 {
Ritor1
parents:
diff changeset
2441 z = (unsigned int)*pTargetZ >> 16;
Ritor1
parents:
diff changeset
2442 if ( z > v23 )
Ritor1
parents:
diff changeset
2443 {
Ritor1
parents:
diff changeset
2444 z = v19 + ((*pTarget & 0xF7DEu) >> 1);
Ritor1
parents:
diff changeset
2445 *pTarget = z;
Ritor1
parents:
diff changeset
2446 }
Ritor1
parents:
diff changeset
2447 v18 = v22 - 1;
Ritor1
parents:
diff changeset
2448 v16 = (int *)(pTarget + 1);
Ritor1
parents:
diff changeset
2449 v17 = pTargetZ + 1;
Ritor1
parents:
diff changeset
2450 }
Ritor1
parents:
diff changeset
2451 while ( v18 != 1 )
Ritor1
parents:
diff changeset
2452 {
Ritor1
parents:
diff changeset
2453 if ( v18 < 1 )
Ritor1
parents:
diff changeset
2454 return z;
Ritor1
parents:
diff changeset
2455 z = (unsigned int)*v17 >> 16;
Ritor1
parents:
diff changeset
2456 if ( z <= v23 )
Ritor1
parents:
diff changeset
2457 {
Ritor1
parents:
diff changeset
2458 v18 -= 2;
Ritor1
parents:
diff changeset
2459 ++v16;
Ritor1
parents:
diff changeset
2460 v17 += 2;
Ritor1
parents:
diff changeset
2461 }
Ritor1
parents:
diff changeset
2462 else
Ritor1
parents:
diff changeset
2463 {
Ritor1
parents:
diff changeset
2464 v17 += 2;
Ritor1
parents:
diff changeset
2465 z = v19 + ((*v16 & 0xF7DEF7DEu) >> 1);
Ritor1
parents:
diff changeset
2466 v18 -= 2;
Ritor1
parents:
diff changeset
2467 *v16 = z;
Ritor1
parents:
diff changeset
2468 ++v16;
Ritor1
parents:
diff changeset
2469 }
Ritor1
parents:
diff changeset
2470 }
Ritor1
parents:
diff changeset
2471 z = (unsigned int)*v17 >> 16;
Ritor1
parents:
diff changeset
2472 if ( z > v23 )
Ritor1
parents:
diff changeset
2473 {
Ritor1
parents:
diff changeset
2474 z = v19 + ((*(short *)v16 & 0xF7DEu) >> 1);
Ritor1
parents:
diff changeset
2475 *(short *)v16 = z;
Ritor1
parents:
diff changeset
2476 }
Ritor1
parents:
diff changeset
2477 }
Ritor1
parents:
diff changeset
2478 }
Ritor1
parents:
diff changeset
2479 return z;
Ritor1
parents:
diff changeset
2480 }
Ritor1
parents:
diff changeset
2481
Ritor1
parents:
diff changeset
2482 //----- (004A57E9) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
2483 void Present_ColorKey()
0
Ritor1
parents:
diff changeset
2484 {
Ritor1
parents:
diff changeset
2485 HRESULT v0; // eax@3
Ritor1
parents:
diff changeset
2486 HRESULT v1; // eax@3
Ritor1
parents:
diff changeset
2487 HRESULT v2; // eax@3
Ritor1
parents:
diff changeset
2488 HRESULT v3; // eax@3
Ritor1
parents:
diff changeset
2489 HRESULT v4; // eax@3
Ritor1
parents:
diff changeset
2490 RECT a2; // [sp+4h] [bp-14h]@3
Ritor1
parents:
diff changeset
2491 //CheckHRESULT_stru0 this; // [sp+14h] [bp-4h]@3
Ritor1
parents:
diff changeset
2492
Ritor1
parents:
diff changeset
2493 if ( !pRenderer->uNumSceneBegins )
Ritor1
parents:
diff changeset
2494 {
Ritor1
parents:
diff changeset
2495 if ( pRenderer->field_40110 )
Ritor1
parents:
diff changeset
2496 {
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2497 a2.bottom = pViewport->uViewportTL_Y;
0
Ritor1
parents:
diff changeset
2498 a2.left = 0;
Ritor1
parents:
diff changeset
2499 a2.top = 0;
Ritor1
parents:
diff changeset
2500 a2.right = 640;
Ritor1
parents:
diff changeset
2501 ErrD3D(pRenderer->pBackBuffer4->BltFast(0, 0, pRenderer->pColorKeySurface4, &a2, 16u));
Ritor1
parents:
diff changeset
2502 a2.right = 640;
Ritor1
parents:
diff changeset
2503 a2.left = 0;
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2504 a2.top = pViewport->uViewportBR_Y + 1;
0
Ritor1
parents:
diff changeset
2505 a2.bottom = 480;
Ritor1
parents:
diff changeset
2506 ErrD3D(pRenderer->pBackBuffer4->BltFast(
Ritor1
parents:
diff changeset
2507 0,
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2508 pViewport->uViewportBR_Y + 1,
0
Ritor1
parents:
diff changeset
2509 pRenderer->pColorKeySurface4,
Ritor1
parents:
diff changeset
2510 &a2,
Ritor1
parents:
diff changeset
2511 16u));
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2512 a2.right = pViewport->uViewportTL_X;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2513 a2.bottom = pViewport->uViewportBR_Y + 1;
0
Ritor1
parents:
diff changeset
2514 a2.left = 0;
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2515 a2.top = pViewport->uViewportTL_Y;
0
Ritor1
parents:
diff changeset
2516 ErrD3D(pRenderer->pBackBuffer4->BltFast(
Ritor1
parents:
diff changeset
2517 0,
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2518 pViewport->uViewportTL_Y,
0
Ritor1
parents:
diff changeset
2519 pRenderer->pColorKeySurface4,
Ritor1
parents:
diff changeset
2520 &a2,
Ritor1
parents:
diff changeset
2521 16u));
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2522 a2.left = pViewport->uViewportBR_X;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2523 a2.top = pViewport->uViewportTL_Y;
0
Ritor1
parents:
diff changeset
2524 a2.right = 640;
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2525 a2.bottom = pViewport->uViewportBR_Y + 1;
0
Ritor1
parents:
diff changeset
2526 ErrD3D(pRenderer->pBackBuffer4->BltFast(
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2527 pViewport->uViewportBR_X,
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2528 pViewport->uViewportTL_Y,
0
Ritor1
parents:
diff changeset
2529 pRenderer->pColorKeySurface4,
Ritor1
parents:
diff changeset
2530 &a2,
Ritor1
parents:
diff changeset
2531 16u));
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2532 a2.right = pViewport->uViewportBR_X;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2533 a2.bottom = pViewport->uViewportBR_Y + 1;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2534 a2.left = pViewport->uViewportTL_X;
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2535 a2.top = pViewport->uViewportTL_Y;
0
Ritor1
parents:
diff changeset
2536 ErrD3D(pRenderer->pBackBuffer4->BltFast(
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2537 pViewport->uViewportTL_X,
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2538 pViewport->uViewportTL_Y,
0
Ritor1
parents:
diff changeset
2539 pRenderer->pColorKeySurface4,
Ritor1
parents:
diff changeset
2540 &a2,
Ritor1
parents:
diff changeset
2541 17u));
Ritor1
parents:
diff changeset
2542 }
Ritor1
parents:
diff changeset
2543 }
Ritor1
parents:
diff changeset
2544 }
Ritor1
parents:
diff changeset
2545
Ritor1
parents:
diff changeset
2546 //----- (004A597D) --------------------------------------------------------
Ritor1
parents:
diff changeset
2547 void Present_NoColorKey()
Ritor1
parents:
diff changeset
2548 {
Ritor1
parents:
diff changeset
2549 //unsigned __int16 *v0; // eax@4
Ritor1
parents:
diff changeset
2550 unsigned __int16 *v1; // esi@4
Ritor1
parents:
diff changeset
2551 void *v2; // edi@4
Ritor1
parents:
diff changeset
2552 //signed int v4; // ebx@4
Ritor1
parents:
diff changeset
2553 //signed int v5; // ebx@6
Ritor1
parents:
diff changeset
2554 //void *v6; // edi@7
Ritor1
parents:
diff changeset
2555 //const void *v7; // esi@7
Ritor1
parents:
diff changeset
2556 signed int v8; // ebx@8
Ritor1
parents:
diff changeset
2557 int v9; // eax@10
Ritor1
parents:
diff changeset
2558 unsigned int v10; // esi@10
Ritor1
parents:
diff changeset
2559 unsigned __int32 v11; // edi@10
Ritor1
parents:
diff changeset
2560 //int v12; // ecx@10
Ritor1
parents:
diff changeset
2561 unsigned int v13; // ebx@10
Ritor1
parents:
diff changeset
2562 int v14; // eax@11
Ritor1
parents:
diff changeset
2563 int v15; // eax@13
Ritor1
parents:
diff changeset
2564 int v16; // eax@14
Ritor1
parents:
diff changeset
2565 int v17; // eax@16
Ritor1
parents:
diff changeset
2566 HRESULT v18; // eax@22
Ritor1
parents:
diff changeset
2567 DDSURFACEDESC2 Dst; // [sp+Ch] [bp-98h]@3
Ritor1
parents:
diff changeset
2568 int v20; // [sp+88h] [bp-1Ch]@10
Ritor1
parents:
diff changeset
2569 int v21; // [sp+8Ch] [bp-18h]@10
Ritor1
parents:
diff changeset
2570 __int32 v22; // [sp+90h] [bp-14h]@10
Ritor1
parents:
diff changeset
2571 //unsigned __int32 v23; // [sp+94h] [bp-10h]@10
Ritor1
parents:
diff changeset
2572 unsigned int v24; // [sp+98h] [bp-Ch]@4
Ritor1
parents:
diff changeset
2573 //unsigned int _this; // [sp+9Ch] [bp-8h]@10
Ritor1
parents:
diff changeset
2574 //LPVOID v26; // [sp+A0h] [bp-4h]@4
Ritor1
parents:
diff changeset
2575
Ritor1
parents:
diff changeset
2576 if ( !pRenderer->uNumSceneBegins )
Ritor1
parents:
diff changeset
2577 {
Ritor1
parents:
diff changeset
2578 if ( pRenderer->field_40110 )
Ritor1
parents:
diff changeset
2579 {
Ritor1
parents:
diff changeset
2580 memset(&Dst, 0, 0x7Cu);
Ritor1
parents:
diff changeset
2581 Dst.dwSize = 124;
168
ee11772d0ad2 New sky (turn on -new_sky console command)
Nomad
parents: 144
diff changeset
2582 if ( pRenderer->LockSurface_DDraw4(pRenderer->pBackBuffer4, &Dst, DDLOCK_WAIT) )
0
Ritor1
parents:
diff changeset
2583 {
Ritor1
parents:
diff changeset
2584 //v26 = Dst.lpSurface;
Ritor1
parents:
diff changeset
2585 pRenderer->pCurrentlyLockedSurfaceDataPtr = (unsigned __int16 *)Dst.lpSurface;
Ritor1
parents:
diff changeset
2586 v24 = pRenderer->uTargetGMask | pRenderer->uTargetBMask |
Ritor1
parents:
diff changeset
2587 ((pRenderer->uTargetGMask | pRenderer->uTargetBMask) << 16);
Ritor1
parents:
diff changeset
2588 pRenderer->pCurrentlyLockedSoftSurface = pRenderer->pTargetSurface;
Ritor1
parents:
diff changeset
2589 pRenderer->uCurrentlyLockedSurfacePitch = Dst.lPitch;
Ritor1
parents:
diff changeset
2590 v1 = pRenderer->pTargetSurface;
Ritor1
parents:
diff changeset
2591 v2 = Dst.lpSurface;
Ritor1
parents:
diff changeset
2592
Ritor1
parents:
diff changeset
2593
Ritor1
parents:
diff changeset
2594 /*for (uint y = 0; y < 480; ++y)
Ritor1
parents:
diff changeset
2595 {
Ritor1
parents:
diff changeset
2596 auto pDst = (unsigned short *)((char *)Dst.lpSurface + y * Dst.lPitch);
Ritor1
parents:
diff changeset
2597 for (uint x = 0; x < 640; ++x)
Ritor1
parents:
diff changeset
2598 pDst[x] = pRenderer->uTargetRMask | pRenderer->uTargetBMask;
Ritor1
parents:
diff changeset
2599 }*/
Ritor1
parents:
diff changeset
2600
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
2601 ushort* pSrc = pRenderer->pTargetSurface;
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
2602 short* pDst = (__int16 *)Dst.lpSurface;
0
Ritor1
parents:
diff changeset
2603
Ritor1
parents:
diff changeset
2604 for (uint y = 0; y < 8; ++y)
Ritor1
parents:
diff changeset
2605 memcpy(pDst + y * Dst.lPitch / 2,
Ritor1
parents:
diff changeset
2606
Ritor1
parents:
diff changeset
2607 pSrc + y * 640, 640 * sizeof(__int16));
Ritor1
parents:
diff changeset
2608
Ritor1
parents:
diff changeset
2609 for (uint y = 8; y < 352; ++y)
Ritor1
parents:
diff changeset
2610 {
Ritor1
parents:
diff changeset
2611 memcpy(pDst + y * Dst.lPitch / 2,
Ritor1
parents:
diff changeset
2612 pSrc + y * 640, 8 * sizeof(__int16));
819
9359c114f98c More on screenshot
Nomad
parents: 816
diff changeset
2613 memcpy(pDst + 8 + game_viewport_width/*462*/ + y * Dst.lPitch / 2,
9359c114f98c More on screenshot
Nomad
parents: 816
diff changeset
2614 pSrc + 8 + game_viewport_width/*462*/ + y * 640, 174/*172*/ * sizeof(__int16));
0
Ritor1
parents:
diff changeset
2615 }
Ritor1
parents:
diff changeset
2616
121
3471df3713e2 Teal line at game's viewport bottom fix
Nomad
parents: 112
diff changeset
2617 for (uint y = 352; y < 480; ++y)
0
Ritor1
parents:
diff changeset
2618 memcpy(pDst + y * Dst.lPitch / 2,
Ritor1
parents:
diff changeset
2619 pSrc + y * 640, 640 * sizeof(__int16));
Ritor1
parents:
diff changeset
2620
Ritor1
parents:
diff changeset
2621
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
2622 ushort* pSrc_x1y1 = pSrc + 640 * pViewport->uViewportTL_Y + pViewport->uViewportTL_X;
0
Ritor1
parents:
diff changeset
2623 //_this = (unsigned int)&pSrc[2 * (((signed int)pViewport->uViewportX >> 1) + 320 * pViewport->uViewportY)];
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
2624 short* pDst_x1y1 = pDst + Dst.lPitch * pViewport->uViewportTL_Y + pViewport->uViewportTL_X;
0
Ritor1
parents:
diff changeset
2625 //v23 = (unsigned __int32)((char *)v26 + 4 * (((signed int)pViewport->uViewportX >> 1) + (Dst.lPitch >> 2) * pViewport->uViewportY));
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2626 v9 = ((signed int)pViewport->uViewportTL_X >> 1) - ((signed int)pViewport->uViewportBR_X >> 1);
0
Ritor1
parents:
diff changeset
2627 //v20 = ((signed int)pViewport->uViewportZ >> 1) - ((signed int)pViewport->uViewportX >> 1);
Ritor1
parents:
diff changeset
2628 v22 = 4 * ((Dst.lPitch / 4) + v9);
Ritor1
parents:
diff changeset
2629 v21 = 4 * v9 + 1280;
Ritor1
parents:
diff changeset
2630
121
3471df3713e2 Teal line at game's viewport bottom fix
Nomad
parents: 112
diff changeset
2631 //auto uNumLines = pViewport->uViewportW - pViewport->uViewportY + 1;
0
Ritor1
parents:
diff changeset
2632 //v26 = (LPVOID)(pViewport->uViewportW - pViewport->uViewportY + 1);
Ritor1
parents:
diff changeset
2633 v10 = (int)pSrc_x1y1;
Ritor1
parents:
diff changeset
2634 v11 = (int)pDst_x1y1;
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1914
diff changeset
2635 int uHalfWidth = v20 = (pViewport->uViewportBR_X - pViewport->uViewportTL_X) / 2;
0
Ritor1
parents:
diff changeset
2636 v13 = v24;
Ritor1
parents:
diff changeset
2637
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2638 for (uint y = pViewport->uViewportTL_Y; y < pViewport->uViewportBR_Y + 1; ++y)
0
Ritor1
parents:
diff changeset
2639 {
Ritor1
parents:
diff changeset
2640 //memcpy(pDst + pViewport->uViewportX + y * Dst.lPitch / 2,
Ritor1
parents:
diff changeset
2641 // pSrc + pViewport->uViewportX + y * 640, (pViewport->uViewportZ - pViewport->uViewportX) * sizeof(__int16));
693
e0a1fccc89b1 map render fixes
Gloval
parents: 690
diff changeset
2642 for (uint x = pViewport->uViewportTL_X; x < pViewport->uViewportBR_X; ++x)
0
Ritor1
parents:
diff changeset
2643 {
Ritor1
parents:
diff changeset
2644 if (pSrc[y * 640 + x] != (pRenderer->uTargetGMask | pRenderer->uTargetBMask))
Ritor1
parents:
diff changeset
2645 pDst[y * Dst.lPitch / 2 + x] = pSrc[y * 640 + x];
Ritor1
parents:
diff changeset
2646 }
Ritor1
parents:
diff changeset
2647 }
Ritor1
parents:
diff changeset
2648
Ritor1
parents:
diff changeset
2649 ErrD3D(pRenderer->pBackBuffer4->Unlock(0));
Ritor1
parents:
diff changeset
2650
Ritor1
parents:
diff changeset
2651 /* while ( 1 )
Ritor1
parents:
diff changeset
2652 {
Ritor1
parents:
diff changeset
2653 while ( 1 )
Ritor1
parents:
diff changeset
2654 {
Ritor1
parents:
diff changeset
2655 v14 = *(int *)v10;
Ritor1
parents:
diff changeset
2656 v10 += 4;
Ritor1
parents:
diff changeset
2657 if ( v14 == v13 )
Ritor1
parents:
diff changeset
2658 break;
Ritor1
parents:
diff changeset
2659 if ( (short)v14 == (short)v13 )
Ritor1
parents:
diff changeset
2660 {
Ritor1
parents:
diff changeset
2661 *(int *)v11 = *(int *)v11 & 0xFFFF | v14 & 0xFFFF0000;
Ritor1
parents:
diff changeset
2662 v11 += 4;
Ritor1
parents:
diff changeset
2663 --uHalfWidth;
Ritor1
parents:
diff changeset
2664 if ( !uHalfWidth )
Ritor1
parents:
diff changeset
2665 goto LABEL_21;
Ritor1
parents:
diff changeset
2666 }
Ritor1
parents:
diff changeset
2667 else
Ritor1
parents:
diff changeset
2668 {
Ritor1
parents:
diff changeset
2669 v15 = __ROL__(v14, 16);
Ritor1
parents:
diff changeset
2670 if ( (short)v15 == (short)v13 )
Ritor1
parents:
diff changeset
2671 {
Ritor1
parents:
diff changeset
2672 v17 = __ROR__(v15, 16);
Ritor1
parents:
diff changeset
2673 *(int *)v11 = *(int *)v11 & 0xFFFF0000 | (unsigned __int16)v17;
Ritor1
parents:
diff changeset
2674 v11 += 4;
Ritor1
parents:
diff changeset
2675 --uHalfWidth;
Ritor1
parents:
diff changeset
2676 if ( !uHalfWidth )
Ritor1
parents:
diff changeset
2677 goto LABEL_21;
Ritor1
parents:
diff changeset
2678 }
Ritor1
parents:
diff changeset
2679 else
Ritor1
parents:
diff changeset
2680 {
Ritor1
parents:
diff changeset
2681 v16 = __ROR__(v15, 16);
Ritor1
parents:
diff changeset
2682 *(int *)v11 = v16;
Ritor1
parents:
diff changeset
2683 v11 += 4;
Ritor1
parents:
diff changeset
2684 --uHalfWidth;
Ritor1
parents:
diff changeset
2685 if ( !uHalfWidth )
Ritor1
parents:
diff changeset
2686 goto LABEL_21;
Ritor1
parents:
diff changeset
2687 }
Ritor1
parents:
diff changeset
2688 }
Ritor1
parents:
diff changeset
2689 }
Ritor1
parents:
diff changeset
2690 v11 += 4;
Ritor1
parents:
diff changeset
2691 --uHalfWidth;
Ritor1
parents:
diff changeset
2692 if ( !uHalfWidth )
Ritor1
parents:
diff changeset
2693 {
Ritor1
parents:
diff changeset
2694 LABEL_21:
Ritor1
parents:
diff changeset
2695 v10 += v21;
Ritor1
parents:
diff changeset
2696 v11 += v22;
Ritor1
parents:
diff changeset
2697 uHalfWidth = v20;
Ritor1
parents:
diff changeset
2698 if ( !--uNumLines )
Ritor1
parents:
diff changeset
2699 {
Ritor1
parents:
diff changeset
2700 ErrD3D(pRenderer->pBackBuffer4->Unlock(0));
Ritor1
parents:
diff changeset
2701 return;
Ritor1
parents:
diff changeset
2702 }
Ritor1
parents:
diff changeset
2703 }
Ritor1
parents:
diff changeset
2704 }*/
Ritor1
parents:
diff changeset
2705 }
Ritor1
parents:
diff changeset
2706 }
Ritor1
parents:
diff changeset
2707 }
Ritor1
parents:
diff changeset
2708 }
Ritor1
parents:
diff changeset
2709
Ritor1
parents:
diff changeset
2710 //----- (004A7063) --------------------------------------------------------
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2711 unsigned int ModulateColor(unsigned int diffuse, float multiplier)
0
Ritor1
parents:
diff changeset
2712 {
1390
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2713 float alpha = multiplier * ((diffuse >> 24) & 0xFF);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2714 int a = (int)floorf(alpha + 0.5f);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2715 a = max(0, min(255, a));
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2716
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2717 float red = multiplier * ((diffuse >> 16) & 0xFF);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2718 int r = (int)floorf(red + 0.5f);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2719 r = max(0, min(255, r));
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2720
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2721 float green = multiplier * ((diffuse >> 8) & 0xFF);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2722 int g = (int)floorf(green + 0.5f);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2723 g = max(0, min(255, g));
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2724
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2725 float blue = multiplier * ((diffuse >> 0) & 0xFF);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2726 int b = (int)floorf(blue + 0.5f);
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2727 b = max(0, min(255, b));
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2728
613c77e51e38 Messed with spell effects drawing a bit.
Nomad
parents: 1384
diff changeset
2729 return (a << 24) | (r << 16) | (g << 8) | b;
0
Ritor1
parents:
diff changeset
2730 }
Ritor1
parents:
diff changeset
2731
Ritor1
parents:
diff changeset
2732
Ritor1
parents:
diff changeset
2733
Ritor1
parents:
diff changeset
2734 //----- (004B1447) --------------------------------------------------------
1754
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2735 void sub_4B1447_party_fine(int a1, int a2, int a3)
0
Ritor1
parents:
diff changeset
2736 {
Ritor1
parents:
diff changeset
2737 signed int v3; // esi@1
Ritor1
parents:
diff changeset
2738 char v4; // sf@8
Ritor1
parents:
diff changeset
2739 int v5; // eax@8
Ritor1
parents:
diff changeset
2740 unsigned __int64 v6; // qax@12
Ritor1
parents:
diff changeset
2741 DDM_DLV_Header *v7; // eax@14
Ritor1
parents:
diff changeset
2742
Ritor1
parents:
diff changeset
2743 v3 = 0;
Ritor1
parents:
diff changeset
2744 if ( a2 )
Ritor1
parents:
diff changeset
2745 {
1754
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2746 if ( a2 == 1 )
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2747 v3 = 2;
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2748 if ( a2 == 2 )
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2749 v3 = 2;
0
Ritor1
parents:
diff changeset
2750 goto LABEL_13;
Ritor1
parents:
diff changeset
2751 }
Ritor1
parents:
diff changeset
2752 else
Ritor1
parents:
diff changeset
2753 {
Ritor1
parents:
diff changeset
2754 v3 = 1;
Ritor1
parents:
diff changeset
2755 }
Ritor1
parents:
diff changeset
2756 if ( pParty->uFine < 4000000 )
Ritor1
parents:
diff changeset
2757 {
Ritor1
parents:
diff changeset
2758 v4 = a3 + pParty->uFine < 0;
Ritor1
parents:
diff changeset
2759 v5 = a3 + pParty->uFine;
Ritor1
parents:
diff changeset
2760 pParty->uFine += a3;
Ritor1
parents:
diff changeset
2761 if ( v4 )
Ritor1
parents:
diff changeset
2762 {
Ritor1
parents:
diff changeset
2763 v5 = 0;
Ritor1
parents:
diff changeset
2764 pParty->uFine = 0;
Ritor1
parents:
diff changeset
2765 }
Ritor1
parents:
diff changeset
2766 if ( v5 > 4000000 )
Ritor1
parents:
diff changeset
2767 pParty->uFine = 4000000;
Ritor1
parents:
diff changeset
2768 }
487
d5da524ec901 shop entering fixed
Gloval
parents: 484
diff changeset
2769
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
2770 pParty->PartyTimes._shop_ban_times[a1] = pParty->uTimePlayed + 368640;
487
d5da524ec901 shop entering fixed
Gloval
parents: 484
diff changeset
2771
0
Ritor1
parents:
diff changeset
2772 LABEL_13:
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 462
diff changeset
2773 pParty->InTheShopFlags[a1] = 1;
0
Ritor1
parents:
diff changeset
2774 if ( v3 )
Ritor1
parents:
diff changeset
2775 {
Ritor1
parents:
diff changeset
2776 v7 = &pOutdoor->ddm;
Ritor1
parents:
diff changeset
2777 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
Ritor1
parents:
diff changeset
2778 v7 = &pIndoor->dlv;
Ritor1
parents:
diff changeset
2779 v7->uReputation += v3;
Ritor1
parents:
diff changeset
2780 if ( v7->uReputation > 10000 )
Ritor1
parents:
diff changeset
2781 v7->uReputation = 10000;
Ritor1
parents:
diff changeset
2782 }
1754
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2783 for ( uint i = 1; i <= 4; ++i )
0
Ritor1
parents:
diff changeset
2784 {
Ritor1
parents:
diff changeset
2785 if ( pParty->uFine )
Ritor1
parents:
diff changeset
2786 {
1754
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2787 if ( !_449B57_test_bit(pPlayers[i]->_achieved_awards_bits, 1) )
421c29d4ab3e UITransition.cpp cleaning(continue)
Ritor1
parents: 1747
diff changeset
2788 _449B7E_toggle_bit(pPlayers[i]->_achieved_awards_bits, 1, 1);
0
Ritor1
parents:
diff changeset
2789 }
Ritor1
parents:
diff changeset
2790 }
Ritor1
parents:
diff changeset
2791 }
Ritor1
parents:
diff changeset
2792
Ritor1
parents:
diff changeset
2793 //----- (004B1523) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
2794 void sub_4B1523(int *_this)
0
Ritor1
parents:
diff changeset
2795 {
Ritor1
parents:
diff changeset
2796 int v1; // esi@1
Ritor1
parents:
diff changeset
2797 int v2; // edx@1
Ritor1
parents:
diff changeset
2798 unsigned int v3; // eax@2
Ritor1
parents:
diff changeset
2799 int v4; // eax@4
Ritor1
parents:
diff changeset
2800 LONG v5; // ecx@4
Ritor1
parents:
diff changeset
2801 int v6; // eax@10
Ritor1
parents:
diff changeset
2802 char *v7; // ST44_4@12
Ritor1
parents:
diff changeset
2803 unsigned __int16 v8; // ax@12
Ritor1
parents:
diff changeset
2804 GUIWindow a1; // [sp+Ch] [bp-68h]@4
Ritor1
parents:
diff changeset
2805 unsigned int v11; // [sp+60h] [bp-14h]@1
Ritor1
parents:
diff changeset
2806 POINT a2; // [sp+64h] [bp-10h]@1
Ritor1
parents:
diff changeset
2807 int v13; // [sp+6Ch] [bp-8h]@4
Ritor1
parents:
diff changeset
2808 int v14; // [sp+70h] [bp-4h]@4
Ritor1
parents:
diff changeset
2809
Ritor1
parents:
diff changeset
2810 v1 = *_this - 399;
Ritor1
parents:
diff changeset
2811 v2 = (*_this - 400) % 11 + 1;
Ritor1
parents:
diff changeset
2812 v11 = 4 * (*_this - 400) / 11;
1312
ae435824ac4d books code splitted to separate files
Gloval
parents: 1299
diff changeset
2813 // sprintf(pTmpBuf.data(), "%s%03d", spellbook_texture_filename_suffices[v11 / 4], v2); not used
0
Ritor1
parents:
diff changeset
2814 if ( pMouse->GetCursorPos(&a2)->y <= 320 )
Ritor1
parents:
diff changeset
2815 v3 = pMouse->GetCursorPos(&a2)->y + 30;
Ritor1
parents:
diff changeset
2816 else
Ritor1
parents:
diff changeset
2817 v3 = 30;
Ritor1
parents:
diff changeset
2818 a1.Hint = 0;
Ritor1
parents:
diff changeset
2819 a1.uFrameY = v3;
Ritor1
parents:
diff changeset
2820 a1.uFrameWidth = 328;
Ritor1
parents:
diff changeset
2821 a1.uFrameHeight = 68;
Ritor1
parents:
diff changeset
2822 a1.uFrameX = 90;
Ritor1
parents:
diff changeset
2823 a1.uFrameZ = 417;
Ritor1
parents:
diff changeset
2824 a1.uFrameW = v3 + 67;
Ritor1
parents:
diff changeset
2825 a2.y = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[431]);
Ritor1
parents:
diff changeset
2826 v14 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[433]);
Ritor1
parents:
diff changeset
2827 v13 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[432]);
Ritor1
parents:
diff changeset
2828 v4 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[96]);
Ritor1
parents:
diff changeset
2829 v5 = a2.y;
Ritor1
parents:
diff changeset
2830 if ( v14 > a2.y )
Ritor1
parents:
diff changeset
2831 v5 = v14;
Ritor1
parents:
diff changeset
2832 if ( v13 > v5 )
Ritor1
parents:
diff changeset
2833 v5 = v13;
Ritor1
parents:
diff changeset
2834 if ( v4 > v5 )
Ritor1
parents:
diff changeset
2835 v5 = v4;
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2836 sprintf(pTmpBuf2.data(), "%s\n\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s",
262
Ritor1
parents: 250
diff changeset
2837 pSpellStats->pInfos[v1].pDescription, pGlobalTXT_LocalizationStrings[431], // "Normal"
Ritor1
parents: 250
diff changeset
2838 v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pBasicSkillDesc, pGlobalTXT_LocalizationStrings[433], // "Expert"
Ritor1
parents: 250
diff changeset
2839 v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pExpertSkillDesc, pGlobalTXT_LocalizationStrings[432], // "Master"
Ritor1
parents: 250
diff changeset
2840 v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pMasterSkillDesc, pGlobalTXT_LocalizationStrings[96], // "Grand"
Ritor1
parents: 250
diff changeset
2841 v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pGrandmasterSkillDesc);
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2842 v6 = pFontSmallnum->CalcTextHeight(pTmpBuf2.data(), &a1, 0, 0);
0
Ritor1
parents:
diff changeset
2843 a1.uFrameHeight += v6;
Ritor1
parents:
diff changeset
2844 if ( (signed int)a1.uFrameHeight < 150 )
Ritor1
parents:
diff changeset
2845 a1.uFrameHeight = 150;
819
9359c114f98c More on screenshot
Nomad
parents: 816
diff changeset
2846 a1.uFrameWidth = game_viewport_width;
0
Ritor1
parents:
diff changeset
2847 a1.DrawMessageBox(0);
Ritor1
parents:
diff changeset
2848 a1.uFrameWidth -= 12;
Ritor1
parents:
diff changeset
2849 a1.uFrameHeight -= 12;
Ritor1
parents:
diff changeset
2850 v7 = pSpellStats->pInfos[v1].pName;
Ritor1
parents:
diff changeset
2851 a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1;
Ritor1
parents:
diff changeset
2852 a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1;
949
Nomad
parents: 948
diff changeset
2853 v8 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
0
Ritor1
parents:
diff changeset
2854 a1.DrawTitleText(pFontArrus, 0x78u, 0xCu, v8, v7, 3u);
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2855 a1.DrawText(pFontSmallnum, 120, 44, 0, pTmpBuf2.data(), 0, 0, 0);
0
Ritor1
parents:
diff changeset
2856 a1.uFrameZ = a1.uFrameX + 107;
Ritor1
parents:
diff changeset
2857 a1.uFrameWidth = 108;
Ritor1
parents:
diff changeset
2858 a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
1393
28f87f5234a1 More hardcoded UI colors moved to varibables.
Nomad
parents: 1391
diff changeset
2859 sprintfex(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2860 a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf.data(), 3);
0
Ritor1
parents:
diff changeset
2861 }
Ritor1
parents:
diff changeset
2862
Ritor1
parents:
diff changeset
2863 //----- (004B1ECE) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
2864 void OracleDialogue()
0
Ritor1
parents:
diff changeset
2865 {
Ritor1
parents:
diff changeset
2866 __int16 *v0; // edi@1
Ritor1
parents:
diff changeset
2867 int v1; // ebx@3
Ritor1
parents:
diff changeset
2868 Player *v2; // esi@3
Ritor1
parents:
diff changeset
2869 int v3; // eax@4
Ritor1
parents:
diff changeset
2870 signed int v4; // eax@9
Ritor1
parents:
diff changeset
2871 int v5; // ebx@11
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2872 Player *v6; // esi@13
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2873 ItemGen *v7; // eax@14
0
Ritor1
parents:
diff changeset
2874 signed int v8; // edi@14
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2875 ItemGen *v9; // [sp+Ch] [bp-Ch]@11
0
Ritor1
parents:
diff changeset
2876 signed int v10; // [sp+10h] [bp-8h]@13
Ritor1
parents:
diff changeset
2877 int v11; // [sp+14h] [bp-4h]@1
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2878 Player *v12; // [sp+14h] [bp-4h]@11
0
Ritor1
parents:
diff changeset
2879
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2880 contract_approved = 0;
0
Ritor1
parents:
diff changeset
2881 v11 = 0;
Ritor1
parents:
diff changeset
2882 uDialogueType = 84;
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
2883 current_npc_text = (char *)pNPCTopics[667].pText;
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
2884 v0 = _4F0882_evt_VAR_PlayerItemInHands_vals.data();
0
Ritor1
parents:
diff changeset
2885 while ( 1 )
Ritor1
parents:
diff changeset
2886 {
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2887 if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, *v0) )
0
Ritor1
parents:
diff changeset
2888 {
Ritor1
parents:
diff changeset
2889 v1 = 0;
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
2890 v2 = pParty->pPlayers.data();
0
Ritor1
parents:
diff changeset
2891 do
Ritor1
parents:
diff changeset
2892 {
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2893 LOBYTE(v3) = v2->CompareVariable(VAR_PlayerItemInHands, *(v0+1));
0
Ritor1
parents:
diff changeset
2894 if ( v3 )
Ritor1
parents:
diff changeset
2895 break;
Ritor1
parents:
diff changeset
2896 ++v2;
Ritor1
parents:
diff changeset
2897 ++v1;
Ritor1
parents:
diff changeset
2898 }
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
2899 while ( (signed int)v2 < (signed int)pParty->pHirelings.data() );
0
Ritor1
parents:
diff changeset
2900 if ( v1 == 4 )
Ritor1
parents:
diff changeset
2901 break;
Ritor1
parents:
diff changeset
2902 }
Ritor1
parents:
diff changeset
2903 ++v11;
Ritor1
parents:
diff changeset
2904 v0 += 2;
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2905 if ( v0 > &_4F0882_evt_VAR_PlayerItemInHands_vals[53] )
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2906 break;
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2907 }
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2908 if ( v0 <= &_4F0882_evt_VAR_PlayerItemInHands_vals[53] )
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2909 {
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
2910 current_npc_text = (char *)pNPCTopics[666].pText; // Here's %s that you lost. Be careful
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2911 v4 = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11];
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2912 contract_approved = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11];
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2913 pParty->pPlayers[0].AddVariable(VAR_PlayerItemInHands, v4);
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2914 }
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2915 if ( contract_approved == 601 )
0
Ritor1
parents:
diff changeset
2916 {
Ritor1
parents:
diff changeset
2917 v5 = 0;
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
2918 v12 = pParty->pPlayers.data();//[0].uClass;
0
Ritor1
parents:
diff changeset
2919 v9 = 0;
Ritor1
parents:
diff changeset
2920 while ( 1 )
Ritor1
parents:
diff changeset
2921 {
135
9b0d651821f1 Party creation screen: sorcerer class icon fixed
Nomad
parents: 130
diff changeset
2922 if ( v12->classType == PLAYER_CLASS_LICH )
0
Ritor1
parents:
diff changeset
2923 {
Ritor1
parents:
diff changeset
2924 v10 = 0;
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
2925 v6 = pParty->pPlayers.data();//[0].pInventoryItems[0].field_1A;
0
Ritor1
parents:
diff changeset
2926 do
Ritor1
parents:
diff changeset
2927 {
1826
bdac32c645c5 Changing arrays in class Player to std::array
Grumpy7
parents: 1808
diff changeset
2928 v7 = v6->pInventoryItemList.data();
0
Ritor1
parents:
diff changeset
2929 v8 = 138;
Ritor1
parents:
diff changeset
2930 do
Ritor1
parents:
diff changeset
2931 {
1358
61010a655c94 a few itemID changed to their enum values + added a few new ones
Grumpy7
parents: 1355
diff changeset
2932 if ( v7->uItemID == ITEM_LICH_JAR_FULL )
0
Ritor1
parents:
diff changeset
2933 {
377
243418228760 GetIdentifiedName
Gloval
parents: 373
diff changeset
2934 if ( !v7->uHolderPlayer )
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2935 v9 = v7;
377
243418228760 GetIdentifiedName
Gloval
parents: 373
diff changeset
2936 if ( v7->uHolderPlayer == v5 )
0
Ritor1
parents:
diff changeset
2937 v10 = 1;
Ritor1
parents:
diff changeset
2938 }
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2939 ++v7;
0
Ritor1
parents:
diff changeset
2940 --v8;
Ritor1
parents:
diff changeset
2941 }
Ritor1
parents:
diff changeset
2942 while ( v8 );
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2943 ++v6;
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2944 }
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2945 while ( v6 <= &pParty->pPlayers[3] );
0
Ritor1
parents:
diff changeset
2946 if ( !v10 )
Ritor1
parents:
diff changeset
2947 break;
Ritor1
parents:
diff changeset
2948 }
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2949 ++v12;
0
Ritor1
parents:
diff changeset
2950 ++v5;
89
98cd93e14777 pointer fixes
zipi
parents: 87
diff changeset
2951 if ( v12 > &pParty->pPlayers[3] )
0
Ritor1
parents:
diff changeset
2952 return;
Ritor1
parents:
diff changeset
2953 }
Ritor1
parents:
diff changeset
2954 if ( v9 )
377
243418228760 GetIdentifiedName
Gloval
parents: 373
diff changeset
2955 v9->uHolderPlayer = v5;
0
Ritor1
parents:
diff changeset
2956 }
Ritor1
parents:
diff changeset
2957 }
Ritor1
parents:
diff changeset
2958
Ritor1
parents:
diff changeset
2959 //----- (004B254D) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
2960 char * _4B254D_SkillMasteryTeacher(int _this)
0
Ritor1
parents:
diff changeset
2961 {
955
Ritor1
parents: 917
diff changeset
2962 //Player *v1; // esi@1
0
Ritor1
parents:
diff changeset
2963 int v2; // edx@1
Ritor1
parents:
diff changeset
2964 int v3; // ecx@1
Ritor1
parents:
diff changeset
2965 int v4; // edi@1
955
Ritor1
parents: 917
diff changeset
2966 int pClassType; // eax@7
0
Ritor1
parents:
diff changeset
2967 int v6; // eax@7
Ritor1
parents:
diff changeset
2968 int v7; // ebx@7
955
Ritor1
parents: 917
diff changeset
2969 //int v8; // ebx@8
0
Ritor1
parents:
diff changeset
2970 signed int v9; // esi@8
Ritor1
parents:
diff changeset
2971 int v10; // eax@8
Ritor1
parents:
diff changeset
2972 char *v11; // ecx@8
Ritor1
parents:
diff changeset
2973 int v12; // edi@9
Ritor1
parents:
diff changeset
2974 char *v13; // edx@9
Ritor1
parents:
diff changeset
2975 signed int v14; // edi@10
Ritor1
parents:
diff changeset
2976 unsigned int v16; // eax@29
955
Ritor1
parents: 917
diff changeset
2977 //int v17; // eax@36
0
Ritor1
parents:
diff changeset
2978 char v18; // cl@46
Ritor1
parents:
diff changeset
2979 __int16 v19; // dx@56
Ritor1
parents:
diff changeset
2980 int v20; // eax@60
955
Ritor1
parents: 917
diff changeset
2981 //char *v21; // [sp-Ch] [bp-38h]@82
Ritor1
parents: 917
diff changeset
2982 //const char *v22; // [sp-8h] [bp-34h]@21
Ritor1
parents: 917
diff changeset
2983 //unsigned int v23; // [sp-8h] [bp-34h]@38
Ritor1
parents: 917
diff changeset
2984 //char *v24; // [sp-8h] [bp-34h]@82
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
2985 const char *v25; // [sp-4h] [bp-30h]@14
955
Ritor1
parents: 917
diff changeset
2986 //int v26; // [sp-4h] [bp-30h]@38
Ritor1
parents: 917
diff changeset
2987 //int v27; // [sp-4h] [bp-30h]@82
0
Ritor1
parents:
diff changeset
2988 char v28[4]; // [sp+Ch] [bp-20h]@9
Ritor1
parents:
diff changeset
2989 int v29; // [sp+10h] [bp-1Ch]@13
Ritor1
parents:
diff changeset
2990 int v30; // [sp+14h] [bp-18h]@15
Ritor1
parents:
diff changeset
2991 int v31; // [sp+18h] [bp-14h]@16
Ritor1
parents:
diff changeset
2992 unsigned __int16 a1[2]; // [sp+1Ch] [bp-10h]@7
955
Ritor1
parents: 917
diff changeset
2993 //int v33; // [sp+20h] [bp-Ch]@7
0
Ritor1
parents:
diff changeset
2994 int v34; // [sp+24h] [bp-8h]@7
Ritor1
parents:
diff changeset
2995 char *v35; // [sp+28h] [bp-4h]@1
Ritor1
parents:
diff changeset
2996
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
2997 contract_approved = 0;
0
Ritor1
parents:
diff changeset
2998 v2 = (_this - 200) % 3;
Ritor1
parents:
diff changeset
2999 v3 = (_this - 200) / 3;
Ritor1
parents:
diff changeset
3000 v4 = v2;
Ritor1
parents:
diff changeset
3001 v35 = (char *)pNPCTopics[127].pText;
492
Gloval
parents: 487
diff changeset
3002 dword_F8B1AC_award_bit_number = v3;
0
Ritor1
parents:
diff changeset
3003 if ( v2 )
Ritor1
parents:
diff changeset
3004 {
Ritor1
parents:
diff changeset
3005 if ( v2 == 1 )
Ritor1
parents:
diff changeset
3006 {
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3007 gold_transaction_amount = 5000;
0
Ritor1
parents:
diff changeset
3008 dword_F8B1B0 = 3;
Ritor1
parents:
diff changeset
3009 }
Ritor1
parents:
diff changeset
3010 else
Ritor1
parents:
diff changeset
3011 {
Ritor1
parents:
diff changeset
3012 if ( v2 == 2 )
Ritor1
parents:
diff changeset
3013 {
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3014 gold_transaction_amount = 8000;
0
Ritor1
parents:
diff changeset
3015 dword_F8B1B0 = 4;
Ritor1
parents:
diff changeset
3016 }
Ritor1
parents:
diff changeset
3017 }
Ritor1
parents:
diff changeset
3018 }
Ritor1
parents:
diff changeset
3019 else
Ritor1
parents:
diff changeset
3020 {
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3021 gold_transaction_amount = 2000;
0
Ritor1
parents:
diff changeset
3022 dword_F8B1B0 = 2;
Ritor1
parents:
diff changeset
3023 }
955
Ritor1
parents: 917
diff changeset
3024 pClassType = pPlayers[uActiveCharacter]->classType;
Ritor1
parents: 917
diff changeset
3025 //v33 = pClassType;
Ritor1
parents: 917
diff changeset
3026 v6 = byte_4ED970_skill_learn_ability_by_class_table[pClassType][v3];
Ritor1
parents: 917
diff changeset
3027 *(int *)a1 = pPlayers[uActiveCharacter]->pActiveSkills[v3];
0
Ritor1
parents:
diff changeset
3028 v7 = a1[0] & 0x3F;
Ritor1
parents:
diff changeset
3029 v34 = v2 + 2;
Ritor1
parents:
diff changeset
3030 if ( v6 < v2 + 2 )
Ritor1
parents:
diff changeset
3031 {
955
Ritor1
parents: 917
diff changeset
3032 //v8 = v33;
0
Ritor1
parents:
diff changeset
3033 v9 = 0;
955
Ritor1
parents: 917
diff changeset
3034 v10 = pClassType - pClassType % 4;
Ritor1
parents: 917
diff changeset
3035 v11 = &byte_4ED970_skill_learn_ability_by_class_table[pClassType - pClassType % 4][v3];
0
Ritor1
parents:
diff changeset
3036 do
Ritor1
parents:
diff changeset
3037 {
Ritor1
parents:
diff changeset
3038 v12 = (unsigned __int8)*v11;
Ritor1
parents:
diff changeset
3039 v13 = &v28[4 * v9];
Ritor1
parents:
diff changeset
3040 *(int *)v13 = 0;
Ritor1
parents:
diff changeset
3041 if ( v12 < v34 )
Ritor1
parents:
diff changeset
3042 {
Ritor1
parents:
diff changeset
3043 v14 = 1;
Ritor1
parents:
diff changeset
3044 }
Ritor1
parents:
diff changeset
3045 else
Ritor1
parents:
diff changeset
3046 {
Ritor1
parents:
diff changeset
3047 v14 = 1;
Ritor1
parents:
diff changeset
3048 *(int *)v13 = 1;
Ritor1
parents:
diff changeset
3049 }
Ritor1
parents:
diff changeset
3050 ++v9;
Ritor1
parents:
diff changeset
3051 v11 += 37;
Ritor1
parents:
diff changeset
3052 }
Ritor1
parents:
diff changeset
3053 while ( v9 < 4 );
1409
c9e3b93ec570 Highlighted locations with "using uninitialized variable" warning.
Nomad
parents: 1393
diff changeset
3054 __debugbreak(); // warning C4700: uninitialized local variable 'v29' used
0
Ritor1
parents:
diff changeset
3055 if ( v29 == v14 )
Ritor1
parents:
diff changeset
3056 {
Ritor1
parents:
diff changeset
3057 v25 = pClassNames[v10 + 1];
Ritor1
parents:
diff changeset
3058 }
Ritor1
parents:
diff changeset
3059 else
Ritor1
parents:
diff changeset
3060 {
1409
c9e3b93ec570 Highlighted locations with "using uninitialized variable" warning.
Nomad
parents: 1393
diff changeset
3061 __debugbreak(); // warning C4700: uninitialized local variable 'v30' used
955
Ritor1
parents: 917
diff changeset
3062 if ( v30 == v14 )//crash
0
Ritor1
parents:
diff changeset
3063 {
1409
c9e3b93ec570 Highlighted locations with "using uninitialized variable" warning.
Nomad
parents: 1393
diff changeset
3064 __debugbreak(); // warning C4700: uninitialized local variable 'v31' used
0
Ritor1
parents:
diff changeset
3065 if ( v31 == v14 )
Ritor1
parents:
diff changeset
3066 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3067 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[634], pClassNames[v10 + 2], pClassNames[v10 + 3]);//Âû äîëæíû äîñòè÷ü çâàíèÿ %s èëè %s äëÿ îáó÷åíèÿ ýòîìó óðîâíþ íàâûêà.
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3068 return pTmpBuf.data();
0
Ritor1
parents:
diff changeset
3069 }
Ritor1
parents:
diff changeset
3070 v25 = pClassNames[v10 + 2];
Ritor1
parents:
diff changeset
3071 }
Ritor1
parents:
diff changeset
3072 else
Ritor1
parents:
diff changeset
3073 {
Ritor1
parents:
diff changeset
3074 if ( v31 != v14 )
Ritor1
parents:
diff changeset
3075 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3076 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[632], pClassNames[pClassType]);//Ýòîò óðîâåíü íàâûêà íå ìîæåò áûòü ïîñòèãíóò êëàññîì %s.
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3077 return pTmpBuf.data();
0
Ritor1
parents:
diff changeset
3078 }
Ritor1
parents:
diff changeset
3079 v25 = pClassNames[v10 + 3];
Ritor1
parents:
diff changeset
3080 }
Ritor1
parents:
diff changeset
3081 }
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3082 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[633], v25);//Âû äîëæíû äîñòè÷ü çâàíèÿ %s äëÿ îáó÷åíèÿ ýòîìó óðîâíþ íàâûêà.
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3083 return pTmpBuf.data();
0
Ritor1
parents:
diff changeset
3084 }
955
Ritor1
parents: 917
diff changeset
3085 if ( !pPlayers[uActiveCharacter]->CanAct() )
0
Ritor1
parents:
diff changeset
3086 return (char *)pNPCTopics[122].pText;
Ritor1
parents:
diff changeset
3087 if ( !v7 )
Ritor1
parents:
diff changeset
3088 return (char *)pNPCTopics[131].pText;
Ritor1
parents:
diff changeset
3089 v16 = SkillToMastery(a1[0]);
Ritor1
parents:
diff changeset
3090 if ( (signed int)v16 > v4 + 1 )
Ritor1
parents:
diff changeset
3091 return (char *)pNPCTopics[v4 + 128].pText;
Ritor1
parents:
diff changeset
3092 if ( v34 != 2 )
Ritor1
parents:
diff changeset
3093 {
Ritor1
parents:
diff changeset
3094 if ( v34 == 3 )
Ritor1
parents:
diff changeset
3095 {
Ritor1
parents:
diff changeset
3096 if ( (signed int)v16 >= 2 && v7 >= 7 )
Ritor1
parents:
diff changeset
3097 {
492
Gloval
parents: 487
diff changeset
3098 switch ( dword_F8B1AC_award_bit_number )
0
Ritor1
parents:
diff changeset
3099 {
Ritor1
parents:
diff changeset
3100 case 12:
Ritor1
parents:
diff changeset
3101 case 13:
Ritor1
parents:
diff changeset
3102 case 14:
Ritor1
parents:
diff changeset
3103 case 15:
Ritor1
parents:
diff changeset
3104 case 16:
Ritor1
parents:
diff changeset
3105 case 17:
Ritor1
parents:
diff changeset
3106 case 18:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3107 gold_transaction_amount = 4000;
0
Ritor1
parents:
diff changeset
3108 goto LABEL_42;
Ritor1
parents:
diff changeset
3109 case 19:
Ritor1
parents:
diff changeset
3110 v19 = 114;
955
Ritor1
parents: 917
diff changeset
3111 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v19) )
Ritor1
parents: 917
diff changeset
3112 return v35;
Ritor1
parents: 917
diff changeset
3113 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3114 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3115 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3116 case 20:
Ritor1
parents:
diff changeset
3117 v19 = 110;
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
3118 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, v19) )
0
Ritor1
parents:
diff changeset
3119 return v35;
955
Ritor1
parents: 917
diff changeset
3120 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3121 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3122 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3123 case 22:
955
Ritor1
parents: 917
diff changeset
3124 v20 = pPlayers[uActiveCharacter]->GetBaseWillpower();
Ritor1
parents: 917
diff changeset
3125 if ( v20 < 50 )
Ritor1
parents: 917
diff changeset
3126 return v35;
Ritor1
parents: 917
diff changeset
3127 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3128 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3129 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3130 case 24:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3131 gold_transaction_amount = 2500;
955
Ritor1
parents: 917
diff changeset
3132 v20 = pPlayers[uActiveCharacter]->GetBaseEndurance();
0
Ritor1
parents:
diff changeset
3133 if ( v20 < 50 )
Ritor1
parents:
diff changeset
3134 return v35;
955
Ritor1
parents: 917
diff changeset
3135 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3136 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3137 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3138 case 36:
Ritor1
parents: 917
diff changeset
3139 v20 = pPlayers[uActiveCharacter]->GetBaseIntelligence();
Ritor1
parents: 917
diff changeset
3140 if ( v20 < 50 )
Ritor1
parents: 917
diff changeset
3141 return v35;
Ritor1
parents: 917
diff changeset
3142 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3143 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3144 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3145 case 21:
Ritor1
parents:
diff changeset
3146 case 23:
Ritor1
parents:
diff changeset
3147 case 25:
Ritor1
parents:
diff changeset
3148 case 26:
Ritor1
parents:
diff changeset
3149 case 29:
Ritor1
parents:
diff changeset
3150 case 32:
Ritor1
parents:
diff changeset
3151 case 34:
Ritor1
parents:
diff changeset
3152 case 35:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3153 gold_transaction_amount = 2500;
0
Ritor1
parents:
diff changeset
3154 goto LABEL_42;
Ritor1
parents:
diff changeset
3155 case 8:
Ritor1
parents:
diff changeset
3156 case 9:
Ritor1
parents:
diff changeset
3157 case 10:
Ritor1
parents:
diff changeset
3158 case 11:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3159 gold_transaction_amount = 3000;
0
Ritor1
parents:
diff changeset
3160 goto LABEL_42;
Ritor1
parents:
diff changeset
3161 case 7:
955
Ritor1
parents: 917
diff changeset
3162 gold_transaction_amount = 0;
Ritor1
parents: 917
diff changeset
3163 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3164 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3165 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3166 default:
Ritor1
parents: 917
diff changeset
3167 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3168 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3169 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3170 }
955
Ritor1
parents: 917
diff changeset
3171 gold_transaction_amount = 0;
Ritor1
parents: 917
diff changeset
3172 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3173 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3174 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3175 }
Ritor1
parents:
diff changeset
3176 }
Ritor1
parents:
diff changeset
3177 else
Ritor1
parents:
diff changeset
3178 {
Ritor1
parents:
diff changeset
3179 if ( v34 != 4 )
Ritor1
parents:
diff changeset
3180 {
955
Ritor1
parents: 917
diff changeset
3181 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3182 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3183 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3184 }
Ritor1
parents:
diff changeset
3185 if ( (signed int)v16 >= 3 && v7 >= 10 )
Ritor1
parents:
diff changeset
3186 {
492
Gloval
parents: 487
diff changeset
3187 switch ( dword_F8B1AC_award_bit_number )
0
Ritor1
parents:
diff changeset
3188 {
Ritor1
parents:
diff changeset
3189 case 19:
1355
af2fc30d765f Player::CanAct, Player::CanSteal shortened a bit
Grumpy7
parents: 1354
diff changeset
3190 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x22u, 1) == 1 )
955
Ritor1
parents: 917
diff changeset
3191 {
Ritor1
parents: 917
diff changeset
3192 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3193 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3194 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3195 }
1355
af2fc30d765f Player::CanAct, Player::CanSteal shortened a bit
Grumpy7
parents: 1354
diff changeset
3196 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x1Au, 1) == 1 )
955
Ritor1
parents: 917
diff changeset
3197 {
Ritor1
parents: 917
diff changeset
3198 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3199 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3200 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3201 }
Ritor1
parents: 917
diff changeset
3202 return v35;
0
Ritor1
parents:
diff changeset
3203 case 20:
1355
af2fc30d765f Player::CanAct, Player::CanSteal shortened a bit
Grumpy7
parents: 1354
diff changeset
3204 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x23u, 1) == 1 )
955
Ritor1
parents: 917
diff changeset
3205 {
Ritor1
parents: 917
diff changeset
3206 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3207 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3208 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3209 }
1355
af2fc30d765f Player::CanAct, Player::CanSteal shortened a bit
Grumpy7
parents: 1354
diff changeset
3210 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x1Bu, 1) == 1 )
955
Ritor1
parents: 917
diff changeset
3211 {
Ritor1
parents: 917
diff changeset
3212 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3213 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3214 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3215 }
0
Ritor1
parents:
diff changeset
3216 return v35;
Ritor1
parents:
diff changeset
3217 case 30:
955
Ritor1
parents: 917
diff changeset
3218 v18 = LOBYTE(pPlayers[uActiveCharacter]->pActiveSkills[31]);
0
Ritor1
parents:
diff changeset
3219 if ( (v18 & 0x3Fu) < 0xA )
Ritor1
parents:
diff changeset
3220 return v35;
955
Ritor1
parents: 917
diff changeset
3221 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3222 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3223 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3224 case 31:
Ritor1
parents: 917
diff changeset
3225 v18 = LOBYTE(pPlayers[uActiveCharacter]->pActiveSkills[30]);
Ritor1
parents: 917
diff changeset
3226 if ( (v18 & 0x3Fu) < 0xA )
Ritor1
parents: 917
diff changeset
3227 return v35;
Ritor1
parents: 917
diff changeset
3228 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3229 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3230 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3231 case 21:
Ritor1
parents:
diff changeset
3232 case 23:
Ritor1
parents:
diff changeset
3233 case 24:
Ritor1
parents:
diff changeset
3234 case 25:
Ritor1
parents:
diff changeset
3235 case 26:
Ritor1
parents:
diff changeset
3236 case 29:
Ritor1
parents:
diff changeset
3237 case 32:
Ritor1
parents:
diff changeset
3238 case 34:
Ritor1
parents:
diff changeset
3239 case 35:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3240 gold_transaction_amount = 6000;
0
Ritor1
parents:
diff changeset
3241 goto LABEL_42;
Ritor1
parents:
diff changeset
3242 case 8:
Ritor1
parents:
diff changeset
3243 case 9:
Ritor1
parents:
diff changeset
3244 case 10:
Ritor1
parents:
diff changeset
3245 case 11:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3246 gold_transaction_amount = 7000;
0
Ritor1
parents:
diff changeset
3247 goto LABEL_42;
Ritor1
parents:
diff changeset
3248 case 7:
Ritor1
parents:
diff changeset
3249 break;
955
Ritor1
parents: 917
diff changeset
3250 default:
Ritor1
parents: 917
diff changeset
3251 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3252 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3253 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3254 }
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3255 gold_transaction_amount = 0;
955
Ritor1
parents: 917
diff changeset
3256 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3257 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3258 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3259 }
Ritor1
parents:
diff changeset
3260 }
Ritor1
parents:
diff changeset
3261 return v35;
Ritor1
parents:
diff changeset
3262 }
Ritor1
parents:
diff changeset
3263 if ( v7 < 4 )
Ritor1
parents:
diff changeset
3264 return v35;
492
Gloval
parents: 487
diff changeset
3265 if ( dword_F8B1AC_award_bit_number > 27 )
Gloval
parents: 487
diff changeset
3266 {
Gloval
parents: 487
diff changeset
3267 if ( dword_F8B1AC_award_bit_number != 29
Gloval
parents: 487
diff changeset
3268 && dword_F8B1AC_award_bit_number != 32
Gloval
parents: 487
diff changeset
3269 && (dword_F8B1AC_award_bit_number <= 33 || dword_F8B1AC_award_bit_number > 35) )
0
Ritor1
parents:
diff changeset
3270 {
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3271 if ( !gold_transaction_amount )
0
Ritor1
parents:
diff changeset
3272 goto LABEL_79;
Ritor1
parents:
diff changeset
3273 goto LABEL_42;
Ritor1
parents:
diff changeset
3274 }
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3275 gold_transaction_amount = 500;
955
Ritor1
parents: 917
diff changeset
3276 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3277 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3278 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3279 }
492
Gloval
parents: 487
diff changeset
3280 if ( dword_F8B1AC_award_bit_number >= 23 )
955
Ritor1
parents: 917
diff changeset
3281 {
Ritor1
parents: 917
diff changeset
3282 gold_transaction_amount = 500;
Ritor1
parents: 917
diff changeset
3283 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3284 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3285 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3286 }
492
Gloval
parents: 487
diff changeset
3287 if ( dword_F8B1AC_award_bit_number == 7 )
0
Ritor1
parents:
diff changeset
3288 {
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3289 gold_transaction_amount = 0;
0
Ritor1
parents:
diff changeset
3290 goto LABEL_79;
Ritor1
parents:
diff changeset
3291 }
492
Gloval
parents: 487
diff changeset
3292 if ( dword_F8B1AC_award_bit_number <= 7 )
955
Ritor1
parents: 917
diff changeset
3293 {
Ritor1
parents: 917
diff changeset
3294 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3295 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3296 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3297 }
492
Gloval
parents: 487
diff changeset
3298 if ( dword_F8B1AC_award_bit_number > 18 )
Gloval
parents: 487
diff changeset
3299 {
Gloval
parents: 487
diff changeset
3300 if ( dword_F8B1AC_award_bit_number != 21 )
955
Ritor1
parents: 917
diff changeset
3301 {
Ritor1
parents: 917
diff changeset
3302 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3303 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3304 goto LABEL_42;
Ritor1
parents: 917
diff changeset
3305 }
Ritor1
parents: 917
diff changeset
3306 gold_transaction_amount = 500;
Ritor1
parents: 917
diff changeset
3307 if ( !gold_transaction_amount )
Ritor1
parents: 917
diff changeset
3308 goto LABEL_79;
Ritor1
parents: 917
diff changeset
3309 goto LABEL_42;
0
Ritor1
parents:
diff changeset
3310 }
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3311 gold_transaction_amount = 1000;
0
Ritor1
parents:
diff changeset
3312 LABEL_42:
267
ac44e716d051 DrawDialogueUI logic restored
Nomad
parents: 264
diff changeset
3313 if ( gold_transaction_amount > pParty->uNumGold )
0
Ritor1
parents:
diff changeset
3314 return (char *)pNPCTopics[124].pText;
Ritor1
parents:
diff changeset
3315 LABEL_79:
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
3316 contract_approved = 1;
0
Ritor1
parents:
diff changeset
3317 if ( v34 == 2 )
Ritor1
parents:
diff changeset
3318 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3319 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],//Ïîëó÷èòü ñòåïåíü ^Pr[%s] â íàâûêå ^Pr[%s] çà ^I[%lu] çîëîò^L[îé;ûõ;ûõ]
955
Ritor1
parents: 917
diff changeset
3320 pGlobalTXT_LocalizationStrings[433], 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
3321 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
3322 }
Ritor1
parents:
diff changeset
3323 if ( v34 == 3 )
Ritor1
parents:
diff changeset
3324 {
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3325 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],
955
Ritor1
parents: 917
diff changeset
3326 pGlobalTXT_LocalizationStrings[432], 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
3327 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
3328 }
Ritor1
parents:
diff changeset
3329 if ( v34 == 4 )
1205
8c02e6f74b29 arrays to std::arrays phase 2 - mm7_data.h converted
Grumpy7
parents: 1202
diff changeset
3330 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[534],
955
Ritor1
parents: 917
diff changeset
3331 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
3332 return pTmpBuf2.data();
0
Ritor1
parents:
diff changeset
3333 }
Ritor1
parents:
diff changeset
3334
Ritor1
parents:
diff changeset
3335 //----- (004B3E1E) --------------------------------------------------------
1458
934074e7fcc1 ModalWindow
Nomad
parents: 1453
diff changeset
3336 void sub_4B3E1E()
0
Ritor1
parents:
diff changeset
3337 {
Ritor1
parents:
diff changeset
3338 NPCData *v0; // ST40_4@1
Ritor1
parents:
diff changeset
3339 signed int v1; // edi@1
165
Ritor1
parents: 152
diff changeset
3340 //GUIWindow *v2; // ecx@1
0
Ritor1
parents:
diff changeset
3341
167
90521fb9766c NPCDialogue fix
Ritor1
parents: 165
diff changeset
3342 __debugbreak();
602
628694cd5744 Margaret working
zipi
parents: 569
diff changeset
3343 v0 = GetNPCData(sDialogue_SpeakingActorNPC_ID);
0
Ritor1
parents:
diff changeset
3344 v1 = 0;
Ritor1
parents:
diff changeset
3345 pDialogueWindow->eWindowType = WINDOW_MainMenu;
Ritor1
parents:
diff changeset
3346 pDialogueWindow->Release();
165
Ritor1
parents: 152
diff changeset
3347 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0);
291
0ea5fbd16edb NPC mostly done
Gloval
parents: 290
diff changeset
3348 if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
0
Ritor1
parents:
diff changeset
3349 {
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
3350 pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);
0
Ritor1
parents:
diff changeset
3351 v1 = 1;
Ritor1
parents:
diff changeset
3352 }
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
3353 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
3354 pDialogueWindow->_41D08F_set_keyboard_control_group(v1 + 1, 1, 0, 1);
0
Ritor1
parents:
diff changeset
3355 }
Ritor1
parents:
diff changeset
3356
Ritor1
parents:
diff changeset
3357
Ritor1
parents:
diff changeset
3358 //----- (004B3FE5) --------------------------------------------------------
1582
d3d539924e5e _4B3FE5_training_dialogue
Ritor1
parents: 1567
diff changeset
3359 void __fastcall _4B3FE5_training_dialogue(int a4)
0
Ritor1
parents:
diff changeset
3360 {
Ritor1
parents:
diff changeset
3361 int v1; // edi@1
1838
211dfe2d8db1 changing global char* vars to const char* vars
Grumpy7
parents: 1828
diff changeset
3362 const char *v2; // edi@1
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3363
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3364 __debugbreak();
0
Ritor1
parents:
diff changeset
3365 v1 = a4;
Ritor1
parents:
diff changeset
3366 uDialogueType = 78;
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
3367 current_npc_text = (char *)pNPCTopics[a4 + 168].pText;
0
Ritor1
parents:
diff changeset
3368 _4B254D_SkillMasteryTeacher(a4);
Ritor1
parents:
diff changeset
3369 pDialogueWindow->Release();
Ritor1
parents:
diff changeset
3370 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, v1, 0);
Ritor1
parents:
diff changeset
3371 v2 = "";
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
3372 pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, UIMSG_Escape, 0, 0,
948
5a2dbb00c399 Code cleaning.
Nomad
parents: 940
diff changeset
3373 pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
3374 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
484
4bd56919f075 avard quest guild bits
Gloval
parents: 481
diff changeset
3375 if ( contract_approved )
0
Ritor1
parents:
diff changeset
3376 v2 = pGlobalTXT_LocalizationStrings[535];
832
dfd683c4f538 Hotkeys fixed
Nomad
parents: 830
diff changeset
3377 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
972
c8a0f6d89c70 Some inqury on selecting Knight bug.
Nomad
parents: 964
diff changeset
3378 pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
747
585490c29945 House dialogue ids appended
Nomad
parents: 746
diff changeset
3379 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
0
Ritor1
parents:
diff changeset
3380 }
Ritor1
parents:
diff changeset
3381 // F8B19C: using guessed type int dword_F8B19C;
Ritor1
parents:
diff changeset
3382 // F8B1A8: using guessed type int dword_F8B1A8;
Ritor1
parents:
diff changeset
3383
Ritor1
parents:
diff changeset
3384 //----- (004B46A5) --------------------------------------------------------
1006
e865f349aa41 ui cleanup
Gloval
parents: 990
diff changeset
3385 void __fastcall DrawTextAtStatusBar( const char *Str, int a5 )
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3386 {
0
Ritor1
parents:
diff changeset
3387 int v4; // eax@1
471
c43f156a95c9 ArmorShopDialog crash fixed. All shops show its items
Gloval
parents: 470
diff changeset
3388 pRenderer->DrawTextureRGB(0, 352, pTexture_StatusBar);
1006
e865f349aa41 ui cleanup
Gloval
parents: 990
diff changeset
3389 v4 = pFontLucida->AlignText_Center(450, Str);
e865f349aa41 ui cleanup
Gloval
parents: 990
diff changeset
3390 pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, a5, Str, 0, 0, 0);
0
Ritor1
parents:
diff changeset
3391 }
Ritor1
parents:
diff changeset
3392
Ritor1
parents:
diff changeset
3393 //----- (004B46F8) --------------------------------------------------------
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3394 __int64 GetExperienceRequiredForLevel(int level)
0
Ritor1
parents:
diff changeset
3395 {
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3396 __int64 v1; // eax@1
0
Ritor1
parents:
diff changeset
3397 int i; // edx@1
Ritor1
parents:
diff changeset
3398
Ritor1
parents:
diff changeset
3399 v1 = 0;
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3400 for ( i = 0; i < level; ++i )
0
Ritor1
parents:
diff changeset
3401 v1 += i + 1;
Ritor1
parents:
diff changeset
3402 return 1000 * v1;
Ritor1
parents:
diff changeset
3403 }
Ritor1
parents:
diff changeset
3404
Ritor1
parents:
diff changeset
3405 //----- (004BC49B) --------------------------------------------------------
651
2bf48d11d742 Training hall UI fixed
Nomad
parents: 648
diff changeset
3406 void OnSelectNPCDialogueOption(DIALOGUE_TYPE newDialogueType)
652
1ff57450f090 * Some fixes to TravelByTransport
Nomad
parents: 651
diff changeset
3407 {
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3408 //unsigned int v1; // esi@1
520
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3409 NPCData *speakingNPC; // ebp@1
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3410 //unsigned int v3; // eax@1
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3411 int npc_event_id; // ecx@10
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3412 signed int v5; // edi@14
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3413 char *v6; // esi@15
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3414 const char *v7; // ecx@22
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3415 signed int v8; // edi@37
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3416 //unsigned int v9; // eax@56
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3417 unsigned int v10; // ecx@57
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3418 void *v11; // [sp-Ch] [bp-1Ch]@46
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3419 int v12; // [sp-8h] [bp-18h]@46
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3420 char *v13; // [sp-8h] [bp-18h]@60
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3421 size_t v14; // [sp-4h] [bp-14h]@46
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3422 const char *v15; // [sp-4h] [bp-14h]@60
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3423
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3424 //v1 = _this;
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3425 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
520
35f28d4c0ff9 GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
Gloval
parents: 519
diff changeset
3426 //v3 = v1;
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3427 uDialogueType = newDialogueType;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3428 if (!speakingNPC->uFlags)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3429 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3430 speakingNPC->uFlags = 1;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3431 //v3 = uDialogueType;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3432 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3433
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3434 if(newDialogueType == DIALOGUE_PROFESSION_DETAILS)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3435 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3436 dialogue_show_profession_details = ~dialogue_show_profession_details;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3437 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3438 else if(newDialogueType == DIALOGUE_76)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3439 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3440 if (speakingNPC->Hired())
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3441 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3442 v8 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3443 if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3444 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3445 v6 = (char *)pNPCStats->pNewNPCData;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3446 while ( !(v6[8] & 0x80) || strcmp(speakingNPC->pName, *(const char **)v6) )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3447 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3448 ++v8;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3449 v6 += 76;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3450 if ( v8 >= (signed int)pNPCStats->uNumNewNPCs )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3451 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3452 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3453 if( v8 < (signed int)pNPCStats->uNumNewNPCs )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3454 v6[8] &= 0x7Fu;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3455 }
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
3456 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3457 {
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
3458 v11 = pParty->pHirelings.data();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3459 memset(v11, 0, sizeof(NPCData));
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3460 }
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
3461 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3462 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3463 v11 = &pParty->pHirelings[1];
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3464 memset(v11, 0, sizeof(NPCData));
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3465 }
1793
4dee76d79c78 dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents: 1754
diff changeset
3466 pParty->hirelingScrollPosition = 0;
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
3467 pParty->CountHirelings();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3468 dword_591084 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3469 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3470 dword_7241C8 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3471 return;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3472 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3473 if ( pParty->pHirelings[0].pName && pParty->pHirelings[1].pName )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3474 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3475 v7 = pGlobalTXT_LocalizationStrings[533]; // ""I cannot join you, you're party is full""
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3476 ShowStatusBarString(v7, 2u);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3477 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3478 else
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3479 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3480 //v9 = v2->uProfession;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3481 if ( speakingNPC->uProfession != 51 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3482 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3483 v10 = pNPCStats->pProfessions[speakingNPC->uProfession - 1].uHirePrice;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3484 if ( pParty->uNumGold < v10 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3485 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3486 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);// "You don't have enough gold"
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3487 dialogue_show_profession_details = false;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3488 uDialogueType = 13;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3489 if ( uActiveCharacter )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3490 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NotEnoughGold, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3491 v7 = pGlobalTXT_LocalizationStrings[155];
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3492 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3493 if ( !dword_7241C8 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3494 pGame->Draw();
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3495 dword_7241C8 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3496 return;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3497 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3498 Party::TakeGold(v10);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3499 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3500 LOBYTE(speakingNPC->uFlags) |= 0x80u;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3501 if ( pParty->pHirelings[0].pName )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3502 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3503 memcpy(&pParty->pHirelings[1], speakingNPC, sizeof(pParty->pHirelings[1]));
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3504 v15 = speakingNPC->pName;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3505 v13 = pParty->pHireling2Name;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3506 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3507 else
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3508 {
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
3509 memcpy(pParty->pHirelings.data(), speakingNPC, 0x4Cu);
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3510 v15 = speakingNPC->pName;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3511 v13 = pParty->pHireling1Name;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3512 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3513 strcpy(v13, v15);
1793
4dee76d79c78 dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents: 1754
diff changeset
3514 pParty->hirelingScrollPosition = 0;
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
3515 pParty->CountHirelings();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3516
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3517 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3518
711
a5e587c8e30e some cleaning
Gloval
parents: 706
diff changeset
3519 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3520 pDialogue_SpeakingActor->uAIState = Removed;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3521 if ( uActiveCharacter )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3522 pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3523 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3524 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3525 else if ( (signed int)newDialogueType > 84 && (signed int)newDialogueType <= 88 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3526 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3527 ArenaFight();
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3528 return;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3529 }
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
3530 else if(newDialogueType == DIALOGUE_USE_NPC_ABILITY)
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3531 {
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
3532 if (UseNPCSkill((NPCProf)speakingNPC->uProfession) == 0)
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3533 {
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
3534 if ( speakingNPC->uProfession != GateMaster )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3535 speakingNPC->bHasUsedTheAbility = 1;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3536
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3537 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3538 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3539 else
1413
3881d2f94eb1 UseNPCSkill
Nomad
parents: 1411
diff changeset
3540 ShowStatusBarString(pGlobalTXT_LocalizationStrings[140], 2); //"Your packs are already full!"
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3541 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3542 else if(newDialogueType == DIALOGUE_13)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3543 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3544 if (!speakingNPC->Hired())
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3545 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3546 sub_4B3E1E();
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3547 dialogue_show_profession_details = false;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3548 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3549 else
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3550 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3551 v5 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3552 if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3553 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3554 v6 = (char *)pNPCStats->pNewNPCData;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3555 while ( !(v6[8] & 0x80) || strcmp(speakingNPC->pName, *(const char **)v6) )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3556 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3557 ++v5;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3558 v6 += 76;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3559 if ( v5 >= (signed int)pNPCStats->uNumNewNPCs )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3560 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3561 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3562 if ( v5 < (signed int)pNPCStats->uNumNewNPCs )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3563 v6[8] &= 0x7Fu;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3564 }
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
3565 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3566 {
1861
a86c60679949 changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
Grumpy7
parents: 1838
diff changeset
3567 v11 = pParty->pHirelings.data();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3568 memset(v11, 0, sizeof(NPCData));
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3569 }
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
3570 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) )
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3571 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3572 v11 = &pParty->pHirelings[1];
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3573 memset(v11, 0, sizeof(NPCData));
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3574 }
1793
4dee76d79c78 dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
Grumpy7
parents: 1754
diff changeset
3575 pParty->hirelingScrollPosition = 0;
1035
306ec23b37df 004C1EE5 & other stuff
Nomad
parents: 1033
diff changeset
3576 pParty->CountHirelings();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3577 dword_591084 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3578 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3579 dword_7241C8 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3580 return;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3581 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3582 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3583 else if(newDialogueType >= 19 && newDialogueType <= 24)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3584 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3585 switch(newDialogueType)
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3586 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3587 case DIALOGUE_19: npc_event_id = speakingNPC->evt_A; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3588 case DIALOGUE_20: npc_event_id = speakingNPC->evt_B; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3589 case DIALOGUE_21: npc_event_id = speakingNPC->evt_C; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3590 case DIALOGUE_22: npc_event_id = speakingNPC->evt_D; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3591 case DIALOGUE_23: npc_event_id = speakingNPC->evt_E; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3592 case DIALOGUE_24: npc_event_id = speakingNPC->evt_F; break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3593 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3594 if ( (npc_event_id >= 200) && (npc_event_id <= 310) )
1582
d3d539924e5e _4B3FE5_training_dialogue
Ritor1
parents: 1567
diff changeset
3595 _4B3FE5_training_dialogue(npc_event_id); //200-310
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3596 else if (( npc_event_id >= 400) && (npc_event_id <= 410) )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3597 { //400-410
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3598 dword_F8B1D8 = newDialogueType;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3599 DrawJoinGuildWindow(npc_event_id - 400);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3600 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3601 else
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3602 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3603 switch ( npc_event_id )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3604 {
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3605 case 139:
1459
2ca62c9e7b3c Function names
Nomad
parents: 1458
diff changeset
3606 OracleDialogue();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3607 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3608 case 311:
1529
61458df2cb4f bountyHunting fix
Ritor1
parents: 1514
diff changeset
3609 CheckBountyRespawnAndAward();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3610 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3611 case 399:
1914
28fdf4e567ad Arena_SelectionFightLevel
Ritor1
parents: 1861
diff changeset
3612 Arena_SelectionFightLevel();
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3613 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3614 default:
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3615 activeLevelDecoration = (LevelDecoration*)1;
827
085eb19b7ffd mr.Malvik
Ritor1
parents: 823
diff changeset
3616 current_npc_text = 0;
656
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3617 EventProcessor(npc_event_id, 0, 1);
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3618 activeLevelDecoration = NULL;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3619 break;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3620 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3621 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3622 }
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3623 if ( !dword_7241C8 )
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3624 pGame->Draw();
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3625 dword_7241C8 = 0;
6abf5b610585 OnSelectNPCDialogueOption clean
zipi
parents: 655
diff changeset
3626 }
0
Ritor1
parents:
diff changeset
3627
Ritor1
parents:
diff changeset
3628 //----- (004BDAAF) --------------------------------------------------------
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3629 bool __fastcall MerchandiseTest(ItemGen *item, int _2da_idx)
0
Ritor1
parents:
diff changeset
3630 {
Ritor1
parents:
diff changeset
3631 int v6; // edx@8
Ritor1
parents:
diff changeset
3632 int v7; // edx@9
Ritor1
parents:
diff changeset
3633 int v8; // edx@10
Ritor1
parents:
diff changeset
3634 unsigned __int8 v9; // zf@16
Ritor1
parents:
diff changeset
3635 char v10; // sf@16
Ritor1
parents:
diff changeset
3636 unsigned __int8 v11; // of@16
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3637 bool test;
0
Ritor1
parents:
diff changeset
3638
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3639 if ( (p2DEvents[_2da_idx - 1].uType != 4 || (signed int)item->uItemID < 740 || (signed int)item->uItemID > 771)
1567
9f8b3e904e14 Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
Grumpy7
parents: 1546
diff changeset
3640 && ((signed int)item->uItemID >= 600 || (signed int)item->uItemID >= 529 && (signed int)item->uItemID <= 599) || item->IsStolen())
0
Ritor1
parents:
diff changeset
3641 return 0;
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3642 switch( p2DEvents[_2da_idx - 1].uType )
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3643 {
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3644 case BuildingType_WeaponShop:
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3645 {
1709
8251e59fd7c1 ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents: 1643
diff changeset
3646 test = item->GetItemEquipType() <= 2;
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3647 break;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3648 }
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3649 case BuildingType_ArmorShop:
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3650 {
1709
8251e59fd7c1 ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents: 1643
diff changeset
3651 test = item->GetItemEquipType() >= 3;
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3652 break;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3653 }
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3654 case BuildingType_MagicShop:
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3655 {
1709
8251e59fd7c1 ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents: 1643
diff changeset
3656 test = item->GetPlayerSkillType() == 38 || item->GetItemEquipType() == 16;
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3657 break;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3658 }
1411
2423bc2af692 +InitializaDialogueOptions
Nomad
parents: 1410
diff changeset
3659 case BuildingType_AlchemistShop:
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3660 {
1709
8251e59fd7c1 ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents: 1643
diff changeset
3661 test = item->GetItemEquipType() == 13 || item->GetItemEquipType() == 14
8251e59fd7c1 ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
Grumpy7
parents: 1643
diff changeset
3662 || (item->GetItemEquipType() > 14 && !(item->GetItemEquipType() != 17
907
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3663 || (signed int)item->uItemID < 740) && item->uItemID != 771);
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3664 break;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3665 }
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3666 default:
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3667 {
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3668 test = false;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3669 break;
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3670 }
f3ccfc765502 RentRoom
Ritor1
parents: 898
diff changeset
3671 }
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3672 return test;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3673 /*
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3674 if ( p2DEvents[a2 - 1].uType == 1 )
0
Ritor1
parents:
diff changeset
3675 {
Ritor1
parents:
diff changeset
3676 v11 = __OFSUB__(v5, 2);
Ritor1
parents:
diff changeset
3677 v9 = v5 == 2;
Ritor1
parents:
diff changeset
3678 v10 = v5 - 2 < 0;
Ritor1
parents:
diff changeset
3679 goto LABEL_23;
Ritor1
parents:
diff changeset
3680 }
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3681 if ( p2DEvents[a2 - 1].uType > 2 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3682 {
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3683 if ( p2DEvents[a2 - 1].uType == 3 )
0
Ritor1
parents:
diff changeset
3684 {
Ritor1
parents:
diff changeset
3685 if ( pItemsTable->pItems[v4].uSkillType != 38 )
Ritor1
parents:
diff changeset
3686 return v5 == 16;
Ritor1
parents:
diff changeset
3687 return 1;
Ritor1
parents:
diff changeset
3688 }
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3689 if ( p2DEvents[a2 - 1].uType != 4 || v5 < 13 )
0
Ritor1
parents:
diff changeset
3690 return 0;
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3691 if ( p2DEvents[a2 - 1].uType == 4)
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3692 {
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3693 if ( v5 < 13 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3694 return 0;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3695 if ( v5 <= 14 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3696 return 1;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3697 if ( v5 != 17 || (signed int)v3 < 740 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3698 return 0;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3699 v11 = __OFSUB__(v3, 771);
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3700 v9 = v3 == 771;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3701 v10 = ((v3 - 771) & 0x80000000u) != 0;
0
Ritor1
parents:
diff changeset
3702 LABEL_23:
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3703 if ( !((unsigned __int8)(v10 ^ v11) | v9) )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3704 return 0;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3705 return 1;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3706 }
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3707 }
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3708 if ( p2DEvents[a2 - 1].uType == 2 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3709 {
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3710 if ( v5 >= 3 )
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3711 {
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3712 v11 = __OFSUB__(v5, 9);
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3713 v9 = v5 == 9;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3714 v10 = v5 - 9 < 0;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3715 goto LABEL_23;
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3716 }
0
Ritor1
parents:
diff changeset
3717 }
Ritor1
parents:
diff changeset
3718 return 0;
702
efde64b3e147 sub_4BDAAF clean
zipi
parents: 701
diff changeset
3719 */
0
Ritor1
parents:
diff changeset
3720 }
Ritor1
parents:
diff changeset
3721
1209
decc0dd6e4ba more on arcomage
Gloval
parents: 1206
diff changeset
3722
0
Ritor1
parents:
diff changeset
3723