Skip to content

Commit 6913a92

Browse files
author
hawk2hawk.wog
committed
* Fixed bad function declarations in api/g2/zcvob.h resulting from bad IDA output
* Fixed bad function declarations in api/g2/zcview.h resulting from bad IDA output + Added a few functions to api/g2/zcview.h
1 parent 7f67f05 commit 6913a92

File tree

3 files changed

+162
-28
lines changed

3 files changed

+162
-28
lines changed

api/g2/zcview.h

Lines changed: 135 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ enum zTviewID
5555
VIEW_ITEM
5656
};
5757

58+
/** Insert description. */
59+
enum zTViewFX
60+
{
61+
VIEW_FX_NONE,
62+
VIEW_FX_ZOOM,
63+
VIEW_FX_MAX
64+
};
65+
5866
/** Insert description. */
5967
enum zTRnd_AlphaBlendFunc;
6068

@@ -111,7 +119,7 @@ class zCView : public zCViewBase
111119
/** Insert description.
112120
* @usable Ingame only
113121
*/
114-
int Create(int pA, int pB, int pC, float pD, int pE)
122+
void Create(zSTRING& background, zTViewFX fx0, zTViewFX fx1, float unk0, int unk1)
115123
{
116124
XCALL(0x007A6810);
117125
};
@@ -125,6 +133,60 @@ class zCView : public zCViewBase
125133
XCALL(0x007A6750);
126134
};
127135

136+
//.text:007A8D40 ; int __stdcall zCView__Dialog(int, int, int, float, int)
137+
/** Insert description.
138+
* @usable Ingame only
139+
*/
140+
void Dialog(int x, int y, zSTRING& text, float time, zCOLOR* color)
141+
{
142+
XCALL(0x007A8D40);
143+
};
144+
145+
//.text:007A8E10 ; int __stdcall zCView__DialogCX(int, int, float, int)
146+
/** Insert description.
147+
* @usable Ingame only
148+
*/
149+
void DialogCX(int y, zSTRING& text, float time, zCOLOR* color)
150+
{
151+
XCALL(0x007A8E10);
152+
};
153+
154+
//.text:007A8F60 ; int __stdcall zCView__DialogCXY(int, float, int)
155+
/** Insert description.
156+
* @usable Ingame only
157+
*/
158+
void DialogCXY(zSTRING& text, float time, zCOLOR* color)
159+
{
160+
XCALL(0x007A8F60);
161+
};
162+
163+
//.text:007A8E70 ; int __stdcall zCView__DialogCY(int, int, float, int)
164+
/** Insert description.
165+
* @usable Ingame only
166+
*/
167+
void DialogCY(int x, zSTRING& text, float time, zCOLOR* color)
168+
{
169+
XCALL(0x007A8E70);
170+
};
171+
172+
//.text:007A8FB0 ; int __stdcall zCView__DialogMessage(int, int, float, int)
173+
/** Insert description.
174+
* @usable Ingame only
175+
*/
176+
void DialogMessage(zSTRING& headline, zSTRING& text, float time, zCOLOR* color)
177+
{
178+
XCALL(0x007A8FB0);
179+
};
180+
181+
//.text:007A9240 ; int __stdcall zCView__DialogMessageCXY(int, int, float, int)
182+
/** Insert description.
183+
* @usable Ingame only
184+
*/
185+
void DialogMessageCXY(zSTRING& headline, zSTRING& text, float time, zCOLOR* color)
186+
{
187+
XCALL(0x007A9240);
188+
};
189+
128190
//.text:007A9A10 ; public: int __thiscall zCView::FontSize(class zSTRING &)
129191
/** Insert description.
130192
* @usable Ingame only
@@ -259,6 +321,15 @@ class zCView : public zCViewBase
259321
{
260322
XCALL(0x007A7810);
261323
};
324+
325+
//.text:007ABF70 ; public: virtual void __thiscall zCView::Line(int, int, int, int, struct zCOLOR const &)
326+
/** Insert description.
327+
* @usable Ingame only
328+
*/
329+
void Line(int x, int y, int x1, int y1, const zCOLOR& col)
330+
{
331+
XCALL(0x007ABF70);
332+
};
262333

263334
//.text:007A76E0 ; public: void __thiscall zCView::Move(int, int)
264335
/** Insert description.
@@ -332,6 +403,69 @@ class zCView : public zCViewBase
332403
XCALL(0x007A8450);
333404
};
334405

406+
//.text:007AA8D0 ; public: void __thiscall zCView::Printwin(class zSTRING const &)
407+
/** Insert description.
408+
* @usable Ingame only
409+
*/
410+
void PrintWin(const zSTRING & text)
411+
{
412+
XCALL(0x007AA8D0)
413+
};
414+
415+
//.text:007A7D20 ; int __stdcall zCView__PrintTimed(int, int, int, float, int)
416+
/** Insert description.
417+
* @usable Ingame only
418+
*/
419+
void PrintTimed(int x, int y, const zSTRING & text, float time, zCOLOR* color)
420+
{
421+
XCALL(0x007A7D20)
422+
};
423+
424+
//.text:007A7DB0 ; int __stdcall zCView__PrintTimedCX(int, int, float, int)
425+
/** Insert description.
426+
* @usable Ingame only
427+
*/
428+
void PrintTimedCX(int y, const zSTRING & text, float time, zCOLOR* color)
429+
{
430+
XCALL(0x007A7DB0)
431+
};
432+
433+
//.text:007A7F00 ; int __stdcall zCView__PrintTimedCY(int, int, float, int)
434+
/** Insert description.
435+
* @usable Ingame only
436+
*/
437+
void PrintTimedCY(int x, const zSTRING & text, float time, zCOLOR* color)
438+
{
439+
XCALL(0x007A7F00)
440+
};
441+
442+
//.text:007A7FC0 ; int __stdcall zCView__PrintTimedCXY(int, float, int)
443+
/** Insert description.
444+
* @usable Ingame only
445+
*/
446+
void PrintTimedCXY(const zSTRING & text, float time, zCOLOR* color)
447+
{
448+
XCALL(0x007A7FC0)
449+
};
450+
451+
//.text:007A8140 ; public: void __thiscall zCView::PrintMessage(class zSTRING const &, class zSTRING const &, float, struct zCOLOR &)
452+
/** Insert description.
453+
* @usable Ingame only
454+
*/
455+
void PrintMessage(const zSTRING& headline, const zSTRING& text, float time, zCOLOR& color)
456+
{
457+
XCALL(0x007A8140)
458+
};
459+
460+
//.text:007A8450 ; public: void __thiscall zCView::PrintMessageCXY(class zSTRING const &, class zSTRING const &, float, struct zCOLOR &)
461+
/** Insert description.
462+
* @usable Ingame only
463+
*/
464+
void PrintMessageCXY(const zSTRING& headline, const zSTRING& text, float time, zCOLOR& color)
465+
{
466+
XCALL(0x007A8450)
467+
};
468+
335469
//.text:007ABD10 ; public: void __thiscall zCView::RemoveItem(class zCView *)
336470
/** Insert description.
337471
* @usable Ingame only

api/g2/zcvob.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class zCVob : public zCObject
150150
/** Insert description.
151151
* @usable Ingame only
152152
*/
153-
int __stdcall Move(float pA, float pB, float pC)
153+
void Move(float x, float y, float z)
154154
{
155155
XCALL(0x0061B2E0);
156156
};
@@ -159,7 +159,7 @@ class zCVob : public zCObject
159159
/** Insert description.
160160
* @usable Ingame only
161161
*/
162-
int __stdcall MoveLocal(float pA, float pB, float pC)
162+
void MoveLocal(float x, float y, float z)
163163
{
164164
XCALL(0x0061B3C0);
165165
};
@@ -168,7 +168,7 @@ class zCVob : public zCObject
168168
/** Insert description.
169169
* @usable Ingame only
170170
*/
171-
void MoveWorld(float pA, float pB, float pC)
171+
void MoveWorld(float x, float y, float z)
172172
{
173173
XCALL(0x0061B350);
174174
};
@@ -191,29 +191,29 @@ class zCVob : public zCObject
191191
XCALL(0x0061BE20);
192192
};
193193

194-
//.text:0061B6B0 ; int __stdcall zCVob__RotateLocalX(float pA)
194+
//.text:0061B610 ; int __stdcall zCVob__RotateLocal(int, float pA)
195195
/** Insert description.
196196
* @usable Ingame only
197197
*/
198-
int __stdcall RotateLocalX(float pA)
198+
void RotateLocal(const zVEC3& axis, float amount)
199199
{
200-
XCALL(0x0061B6B0);
200+
XCALL(0x0061B610);
201201
};
202202

203-
//.text:0061B610 ; int __stdcall zCVob__RotateLocal(int, float pA)
203+
//.text:0061B6B0 ; int __stdcall zCVob__RotateLocalX(float pA)
204204
/** Insert description.
205205
* @usable Ingame only
206206
*/
207-
int __stdcall RotateLocal(int pA, float pB)
207+
void RotateLocalX(const zVEC3& amount)
208208
{
209-
XCALL(0x0061B610);
209+
XCALL(0x0061B6B0);
210210
};
211211

212212
//.text:0061B720 ; int __stdcall zCVob__RotateLocalY(float pA)
213213
/** Insert description.
214214
* @usable Ingame only
215215
*/
216-
int __stdcall RotateLocalY(float pA)
216+
void RotateLocalY(const zVEC3& amount)
217217
{
218218
XCALL(0x0061B720);
219219
};
@@ -222,7 +222,7 @@ class zCVob : public zCObject
222222
/** Insert description.
223223
* @usable Ingame only
224224
*/
225-
int __stdcall RotateLocalZ(float pA)
225+
void RotateLocalZ(const zVEC3& amount)
226226
{
227227
XCALL(0x0061B790);
228228
};
@@ -231,7 +231,7 @@ class zCVob : public zCObject
231231
/** Insert description.
232232
* @usable Ingame only
233233
*/
234-
int __stdcall RotateWorld(int, float pA)
234+
void RotateWorld(const zVEC3& axis, float amount)
235235
{
236236
XCALL(0x0061B520);
237237
};
@@ -240,7 +240,7 @@ class zCVob : public zCObject
240240
/** Insert description.
241241
* @usable Ingame only
242242
*/
243-
int __stdcall RotateWorldX(float pA)
243+
void RotateWorldX(float amount)
244244
{
245245
XCALL(0x0061B800);
246246
};
@@ -249,7 +249,7 @@ class zCVob : public zCObject
249249
/** Insert description.
250250
* @usable Ingame only
251251
*/
252-
int __stdcall RotateWorldY(float pA)
252+
void RotateWorldY(float amount)
253253
{
254254
XCALL(0x0061B830);
255255
};
@@ -258,7 +258,7 @@ class zCVob : public zCObject
258258
/** Insert description.
259259
* @usable Ingame only
260260
*/
261-
int __stdcall RotateWorldZ(float pA)
261+
void RotateWorldZ(float amount)
262262
{
263263
XCALL(0x0061B860);
264264
};
@@ -294,7 +294,7 @@ class zCVob : public zCObject
294294
/** Insert description.
295295
* @usable Ingame only
296296
*/
297-
void SetTrafo(zMAT4 & pA)
297+
void SetTrafo(zMAT4& mat)
298298
{
299299
XCALL(0x0061BBD0);
300300
};
@@ -303,7 +303,7 @@ class zCVob : public zCObject
303303
/** Insert description.
304304
* @usable Ingame only
305305
*/
306-
void SetTrafoObjToWorld(zMAT4 & pA)
306+
void SetTrafoObjToWorld(zMAT4& mat)
307307
{
308308
XCALL(0x0061BC80);
309309
};
@@ -312,7 +312,7 @@ class zCVob : public zCObject
312312
/** Insert description.
313313
* @usable Ingame only
314314
*/
315-
void SetNewTrafoObjToWorld(zMAT4 & pA)
315+
void SetNewTrafoObjToWorld(zMAT4& mat)
316316
{
317317
XCALL(0x0061B0C0);
318318
};
@@ -321,7 +321,7 @@ class zCVob : public zCObject
321321
/** Insert description.
322322
* @usable Ingame only
323323
*/
324-
void __stdcall SetHeadingYWorld(float pA)
324+
void SetHeadingYWorld(zCVob* target)
325325
{
326326
XCALL(0x0061C280);
327327
};
@@ -330,7 +330,7 @@ class zCVob : public zCObject
330330
/** Insert description.
331331
* @usable Ingame only
332332
*/
333-
void SetHeadingYWorld(zCVob * pA)
333+
void SetHeadingYWorld(zCVob* target)
334334
{
335335
XCALL(0x0061C450);
336336
};
@@ -339,7 +339,7 @@ class zCVob : public zCObject
339339
/** Insert description.
340340
* @usable Ingame only
341341
*/
342-
void SetHeadingYLocal(zVEC3 & pA)
342+
void SetHeadingYLocal(const zVEC3& target)
343343
{
344344
XCALL(0x0061C1B0);
345345
};
@@ -348,7 +348,7 @@ class zCVob : public zCObject
348348
/** Insert description.
349349
* @usable Ingame only
350350
*/
351-
void SetHeadingWorld(zVEC3 & pA)
351+
void SetHeadingWorld(const zVEC3& target)
352352
{
353353
XCALL(0x0061C6B0);
354354
};
@@ -357,7 +357,7 @@ class zCVob : public zCObject
357357
/** Insert description.
358358
* @usable Ingame only
359359
*/
360-
void SetHeadingWorld(zCVob* pA)
360+
void SetHeadingWorld(zCVob* target)
361361
{
362362
XCALL(0x0061C780);
363363
};
@@ -366,7 +366,7 @@ class zCVob : public zCObject
366366
/** Insert description.
367367
* @usable Ingame only
368368
*/
369-
void SetHeadingLocal(zVEC3 & pA)
369+
void SetHeadingLocal(const zVEC3& target)
370370
{
371371
XCALL(0x0061C5E0);
372372
};
@@ -375,7 +375,7 @@ class zCVob : public zCObject
375375
/** Insert description.
376376
* @usable Ingame only
377377
*/
378-
void SetHeadingAtWorld(zVEC3 & pA)
378+
void SetHeadingAtWorld(const zVEC3& target)
379379
{
380380
XCALL(0x0061CBC0);
381381
};
@@ -384,7 +384,7 @@ class zCVob : public zCObject
384384
/** Insert description.
385385
* @usable Ingame only
386386
*/
387-
void SetHeadingAtLocal(zVEC3 & pA)
387+
void SetHeadingAtLocal(const zVEC3& target)
388388
{
389389
XCALL(0x0061C860);
390390
};
@@ -474,7 +474,7 @@ class zCVob : public zCObject
474474
/** Insert description.
475475
* @usable Ingame only
476476
*/
477-
int DetectCollision(zMAT4 * pA)
477+
int DetectCollision(zMAT4* mat)
478478
{
479479
XCALL(0x0061D890);
480480
};

g2ext/export.def

Whitespace-only changes.

0 commit comments

Comments
 (0)