Merged dMesg_tControl classes (#670)

* Merged dMesg_tControl class definitions

* Fix build

* Fix

* Fixed error
This commit is contained in:
Daniel Hajjar
2024-07-17 20:05:53 +02:00
committed by GitHub
parent bad4ac23e9
commit 2cd767b5cf
4 changed files with 9 additions and 11 deletions
+1 -7
View File
@@ -24,13 +24,7 @@
#include "f_pc/f_pc_base.h"
class fopAc_ac_c;
class dMesg_tControl : public JMessage::TControl {
public:
dMesg_tControl();
/* 0x3C */ u8 field_0x3C[0x74 - 0x3C];
}; // Size: 0x74
class dMesg_tControl;
class dDemo_actor_c : public JStage::TActor {
public:
+6 -3
View File
@@ -2,8 +2,8 @@
#define D_MESG_H
#include "dolphin/types.h"
#include "JSystem/JMessage/control.h"
namespace JMessage { class TControl; };
class JUTFont;
class JKRExpHeap;
@@ -22,7 +22,7 @@ public:
void _setAlpha(u8);
};
class dMesg_tControl {
class dMesg_tControl : public JMessage::TControl {
public:
void getCharCode() {}
void getCharSpace() {}
@@ -47,7 +47,10 @@ public:
void setRubyFont(JUTFont*) {}
dMesg_tControl();
void do_word(u32);
const char* do_word(u32);
public:
/* 0x3C */ u8 field_0x3C[0x74 - 0x3C];
};
class dMesg_tSequenceProcessor {