Skip to content

Commit e35cf27

Browse files
Moved functions from namespace to class
1 parent cc0d5f7 commit e35cf27

5 files changed

Lines changed: 23 additions & 22 deletions

File tree

configs/sym.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ func_002C64A0 = 0x002C64A0; // size:0x204
1212
// Functions
1313

1414
// Engine
15-
Break__7Consolev = 0x001a3c08; // type:func
16-
Parse__7Consolev = 0x001a8e98; // type:func
17-
Patch__7Consolev = 0x001a8ea0; // type:func
18-
RenderActorName__7Consolev = 0x001a9210; // type:func
19-
RenderHoldingPoints__7Consolev = 0x001a9228; // type:func
20-
RenderCarryHandles__7Consolev = 0x001a9240; // type:func
21-
Quit__7Consolev = 0x001a9258; // type:func
15+
Break__7Console = 0x001a3c08; // type:func
16+
Parse__7Console = 0x001a8e98; // type:func
17+
Patch__7Console = 0x001a8ea0; // type:func
18+
RenderActorName__7Console = 0x001a9210; // type:func
19+
RenderHoldingPoints__7Console = 0x001a9228; // type:func
20+
RenderCarryHandles__7Console = 0x001a9240; // type:func
21+
Quit__7Console = 0x001a9258; // type:func
2222
func_00275288 = 0x00275288; // type:func
2323
func_002963F8 = 0x002963F8; // type:func
2424
InterfaceError = 0x00296818; // type:func

include/FGDK3/Fog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int func_001A0250(void*, float*);
1111
}
1212
#endif
1313

14-
14+
// Likely part of the `Console` class instead.
1515
class Fog {
1616
public:
1717
void func_001A8320(void* arg0);

include/debug.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ void DDE_FatalError(char* message,...);
1818
}
1919
#endif
2020

21-
22-
namespace Console{
23-
void Break();
24-
void Parse();
25-
void Patch();
26-
int RenderActorName();
27-
int RenderHoldingPoints();
28-
int RenderCarryHandles();
29-
void Quit();
21+
class Console {
22+
public:
23+
void Break();
24+
void Parse();
25+
void Patch();
26+
int RenderActorName();
27+
int RenderHoldingPoints();
28+
int RenderCarryHandles();
29+
void Quit();
3030
};
3131

3232
#endif

include/unk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ typedef struct {
3535
/* 0x034 */ float fogDistance; // Fog distance
3636
/* 0x038 */ bool unk38; // DOF
3737
/* 0x03C */ bool unk3C; // DOF
38-
} s_0044EB68_sub;
38+
} s_0044EB68_1E0;
3939

4040
typedef struct {
4141
int unk0[120];
42-
s_0044EB68_sub* unk1E0;
42+
s_0044EB68_1E0* unk1E0;
4343
int unk1E4[190];
4444
int m_renderOrient;
4545
int m_renderRadius;

src/text_001A0020.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ void func_001A1310(char arg0, int arg1) {
5454
func_001A0B90(TheGame->unk504, "3", -0x5D);
5555
}
5656
}
57+
5758
void func_001A1348(char arg0, int arg1) {
5859
if (arg1 != 0) {
5960
func_001A0B90(TheGame->unk504, "4", 0x24);
@@ -689,11 +690,11 @@ int Console::RenderCarryHandles() {
689690

690691
#else
691692

692-
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderActorName__7Consolev);
693+
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderActorName__7Console);
693694

694-
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderHoldingPoints__7Consolev);
695+
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderHoldingPoints__7Console);
695696

696-
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderCarryHandles__7Consolev);
697+
INCLUDE_ASM("asm/nonmatchings/text_001A0020", RenderCarryHandles__7Console);
697698
#endif
698699

699700
void Console::Quit() {

0 commit comments

Comments
 (0)