Skip to content

Commit 4444510

Browse files
DogmanderDogmander
committed
Update classes
1 parent 34b5492 commit 4444510

20 files changed

Lines changed: 67 additions & 44 deletions

‎configs/sym.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func_00136558__3Dogf = 0x00136558; // type:func
139139
func_00136578__3Dog = 0x00136578; // type:func
140140
func_00136580__3Dog = 0x00136580; // type:func
141141
func_00136588__3Dog = 0x00136588; // type:func
142-
func_00136590__3Dog = 0x00136590; // type:func
142+
GetSwimmingState__3Dog = 0x00136590; // type:func
143143
func_00136598__3Dog = 0x00136598; // type:func
144144
func_001365A0__3Dogf = 0x001365A0; // type:func
145145
func_001365B0__3Dog = 0x001365B0; // type:func

‎include/Dogs/Dog.h‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
class Dog : public WorldObject {
77
public:
8-
int unk830; // swimming state
8+
float unk684;
9+
/* 0x830 */ bool m_isSwimming;
910
float unk838;
1011
float unk83C;
1112
float unk840;
@@ -22,11 +23,22 @@ class Dog : public WorldObject {
2223
Dog(ClassInfo*, SimObj_Universe*, int, short);
2324
virtual ~Dog();
2425
//
25-
void func_0012E290(int);
26+
virtual void func_0012E290(int);
2627
//
27-
void func_0012EB78(float);
28-
//
29-
float func_0012E240(void);
28+
virtual void func_0012EB78(float);
29+
//? 001878f8
30+
//? 00188400
31+
//? 00188408
32+
//0012e998
33+
//0012e9c8
34+
virtual float func_0012E240(void);
35+
36+
virtual bool GetSwimmingState();
37+
virtual int func_001365B0();
38+
//FUN_0021f3d8
39+
//? 0021f488
40+
//? 0021f548
41+
3042
};
3143
// union {int i;float f;}
3244
class DogHitPrimReceiver : public SimObj_HitReceiver {

‎include/Dogs/PlayerDog.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class PlayerDog : public Dog {
2323
int unkBB8;
2424
PlayerDog(ClassInfo*, SimObj_Universe*, int, short);
2525
virtual ~PlayerDog();
26-
ClassInfo* func_0014F518();
26+
virtual ClassInfo* func_0014F518();
2727
};
2828

2929
//msg AddMove

‎include/Dogs/WheeledVehicle.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class WheeledVehicle : public HitTri_Object {
1212
int unk630;
1313
float unk634; // topspeed?
1414
int unk638;
15-
int unk63C;
15+
int unk63C; // direction variable?
1616
int unk640;
1717
int unk644;
1818
int unk648;
@@ -27,9 +27,9 @@ class WheeledVehicle : public HitTri_Object {
2727
WheeledVehicle(int wheels, ClassInfo*, SimObj_Universe*, int, short);
2828
virtual ~WheeledVehicle();
2929
ClassInfo* func_00181870();
30-
void func_00180528(float);
31-
void func_00180530(void);
32-
void func_00180540(void);
30+
virtual void func_00180528(float);
31+
virtual void func_00180530(void);
32+
virtual void func_00180540(void);
3333
};
3434

3535

‎include/Dogs/WorldObj.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ void WorldObj_Finalise(void);
1616

1717
class WorldObject : public SimObj_ObjectWithMomentum {
1818
public:
19+
ShapeInstance unk240;
1920
int unk2E0;
2021
//unk314
2122
//unk318

‎include/unk.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ namespace BookMetaphor {
520520
int unk8; // m_cursorPos
521521
int unkC; // action?
522522
int unk10;
523-
int m_cheatsAvailable; // 0x14
523+
/* 0x14 */ bool m_cheatsAvailable;
524524
SettingsPage();
525525
virtual ~SettingsPage();
526526
};

‎src/Dogs/Code/AnimatedObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "Dogs/AnimatedObject.h"
44

55
extern ClassInfo* D_0044C738;
6-
#ifdef NON_MATCHING
76

7+
#ifdef NON_MATCHING
88
AnimatedObject::AnimatedObject(ClassInfo* arg1, SimObj_Universe* arg2, int arg3, short arg4) : HitTri_Object(arg1 = 0, arg2, arg3, arg4) {
99
if (arg1 != 0) {
1010
D_0044C738 = arg1;

‎src/Dogs/Code/Containers.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001ABCA8);
5757

5858
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001ABFB8);
5959

60-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001ABFE0);
60+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001ABFE0); // ball detection?
6161

62-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001AC098);
62+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001AC098); // rendering thing
6363

6464
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Containers", func_001AC0B8);
6565

‎src/Dogs/Code/Dog.cpp‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "Dogs/Dog.h"
44

5+
extern ClassInfo* D_0044CE58;
6+
57
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_0012CD30);
68

79
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_0012CEC8);
@@ -17,7 +19,6 @@ INCLUDE_RODATA("asm/nonmatchings/Dogs/Code/Dog", D_003A6688);
1719
INCLUDE_RODATA("asm/nonmatchings/Dogs/Code/Dog", D_003A66B8);
1820

1921
#ifdef NON_MATCHING
20-
extern ClassInfo* D_0044CE58;
2122
Dog::Dog(ClassInfo* arg1, SimObj_Universe* arg2, int arg3, short arg4) : WorldObject(arg1 = 0, arg2, arg3, arg4) {
2223
if (arg1 != 0) {
2324
D_0044CE58 = arg1;
@@ -177,13 +178,15 @@ int Dog::func_00136588() {
177178
return this->unk674;
178179
}
179180
*/
180-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_00136590__3Dog);
181-
/*
182-
// get swimming state
183-
int Dog::func_00136590() {
184-
return this->unk830;
181+
182+
#ifdef NON_MATCHING
183+
bool Dog::GetSwimmingState() {
184+
return this->m_isSwimming;
185185
}
186-
*/
186+
#else
187+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", GetSwimmingState__3Dog);
188+
#endif
189+
187190
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_00136598__3Dog);
188191
/*
189192
int Dog::func_00136598() {
@@ -197,14 +200,17 @@ int Dog::func_001365A0(float arg) {
197200
return 0;
198201
}
199202
*/
200-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_001365B0__3Dog);
201-
/*
203+
#ifdef NON_MATCHING
202204
// How many secs to show sniff bone status
203205
int Dog::func_001365B0() {
204206
this->unk684 = 5.0f;
205207
return 0;
206208
}
207-
*/
209+
#else
210+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_001365B0__3Dog);
211+
#endif
212+
213+
208214
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_001365C8__3Dogf);
209215
/*
210216
void Dog::func_001365C8(float arg) {
@@ -240,7 +246,7 @@ int Dog::func_00136648(float arg) {
240246
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_00136658__3Dogf);
241247
/*
242248
int Dog::func_00136658(float arg) {
243-
this->unk854 = arg;
249+
this->unk854 = isarg;
244250
return 0;
245251
}
246252
*/
@@ -292,6 +298,7 @@ INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_001398B8);
292298
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_00139928);
293299

294300
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Dog", func_00139B60);
301+
295302
// vtables
296303
INCLUDE_RODATA("asm/nonmatchings/Dogs/Code/Dog", D_003A6820); /* _vt$16HitPrimDisplayer */
297304

‎src/Dogs/Code/Landscape.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DE378);
99

1010
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DE3E0);
1111

12-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DE608);
12+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DE608); // ground collision?
1313

1414
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DEDF0);
1515

@@ -23,7 +23,7 @@ INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF4B8);
2323

2424
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF590);
2525

26-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF810);
26+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF810); // gravity function?
2727

2828
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF828);
2929

@@ -33,7 +33,7 @@ INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DF940);
3333

3434
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DFA30);
3535

36-
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DFAF0);
36+
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DFAF0); // first arg is landscape_land* ?; water color/texture?
3737

3838
INCLUDE_ASM("asm/nonmatchings/Dogs/Code/Landscape", func_001DFB80);
3939

0 commit comments

Comments
 (0)