some corrections. I wish I knew the proper class name for EmbedLayout_c etc...

1 files changed, 11 insertions, 13 deletions

diff --git a/include/game.h b/include/game.h
index c796337..691f568 100755
--- a/include/game.h
+++ b/include/game.h
@@ -481,7 +481,7 @@ namespace lyt {
 		virtual void AllocStringBuffer(u16 size);

 		virtual void FreeStringBuffer();

 

-		virtual u16 SetString(const wchar_t *str, u16 destOffset);

+		virtual u16 SetString(const wchar_t *str, u16 destOffset = 0);

 		virtual u16 SetString(const wchar_t *str, u16 destOffset, u16 length);

 

 		wchar_t *stringBuf;

@@ -712,9 +712,11 @@ namespace m2d {
 

 		Base_c();

 		virtual ~Base_c();

-		virtual void _vf0C();

+		virtual void draw();

+

+		void scheduleForDrawing();

 

-		u8 _0C;

+		u8 drawOrder;

 	};

 

 	class Simple_c : public Base_c {

@@ -731,7 +733,7 @@ namespace m2d {
 		Simple_c();

 		~Simple_c();

 

-		void _vf0C();

+		void draw();

 		virtual void _vf10();

 		virtual void _vf14();

 	};

@@ -1215,15 +1217,13 @@ namespace m2d {
 		void free();

 	};

 

-	class EmbedLayoutBase_c {

+	class EmbedLayoutBase_c : public Base_c {

 	public:

-		u32 unk_00;

-		u32 unk_04;

-

 		EmbedLayoutBase_c();

-		virtual ~EmbedLayoutBase_c();

+		~EmbedLayoutBase_c();

+

+		void draw();

 

-		virtual void draw();

 		virtual void update();

 		virtual bool build(const char *brlytPath, ResAcc_c *resAcc);

 

@@ -1236,9 +1236,7 @@ namespace m2d {
 		void animate();

 		void calculateMtx();

 

-		u8 drawOrder;

-

-		nw4r::lyt::Layout layout; // 0x10

+		nw4r::lyt::Layout layout; // 0x10 -- actually m2d::Layout_c but I'll add that later

 		nw4r::lyt::DrawInfo drawInfo; // 0x30

 		void *unk_84; // 0x84 -- a ResAcc? referenced in Build()

 		float posX; // 0x88