From 1c7bf89fffbb087fca3ed3bab192d6aa3fd9de98 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Dec 2020 21:03:25 -0500 Subject: [PATCH] begin adding d_com_inf_game, add include guards to headers --- include/JSystem/J2DGraph/J2DScreen/J2DScreen.h | 7 ++++++- include/JSystem/JKernel/JKRArchive/JKRArchive.h | 7 ++++++- include/d/d_com/d_com_inf_game/d_com_inf_game.h | 6 ++++++ include/d/d_drawlist/d_drawlist.h | 7 ++++++- include/d/d_file/d_file_sel_info/d_file_sel_info.h | 5 +++++ .../d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h | 7 ++++++- include/d/d_save/d_save/d_save.h | 11 ++++++++--- include/d/d_save/d_save_HIO/d_save_HIO.h | 4 ++++ src/d/d_com/d_com_inf_game.cpp | 6 +++++- 9 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 include/d/d_com/d_com_inf_game/d_com_inf_game.h diff --git a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h index 3a21374774e..ef6cd04dc18 100644 --- a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h @@ -1,3 +1,8 @@ +#ifndef J2DSCREEN_H_ +#define J2DSCREEN_H_ + class J2DScreen { -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRArchive/JKRArchive.h b/include/JSystem/JKernel/JKRArchive/JKRArchive.h index 9cd3f4cdf6a..d0a776359bd 100644 --- a/include/JSystem/JKernel/JKRArchive/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive/JKRArchive.h @@ -1,3 +1,8 @@ +#ifndef JKRARCHIVE_H_ +#define JKRARCHIVE_H_ + class JKRArchive { -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h new file mode 100644 index 00000000000..4067424f245 --- /dev/null +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -0,0 +1,6 @@ +#ifndef D_COM_INF_GAME_H_ +#define D_COM_INF_GAME_H_ + + + +#endif \ No newline at end of file diff --git a/include/d/d_drawlist/d_drawlist.h b/include/d/d_drawlist/d_drawlist.h index 3c9958aa013..f5abcc63fdc 100644 --- a/include/d/d_drawlist/d_drawlist.h +++ b/include/d/d_drawlist/d_drawlist.h @@ -1,7 +1,12 @@ +#ifndef D_DRAWLIST_H_ +#define D_DRAWLIST_H_ + class dDlst_FileInfo_c { public: void draw(void); ~dDlst_FileInfo_c(); private: -}; \ No newline at end of file +}; + +#endif D_DRAWLIST_H_ \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/d_file_sel_info.h b/include/d/d_file/d_file_sel_info/d_file_sel_info.h index 1e697ff0320..72d90ec7e5d 100644 --- a/include/d/d_file/d_file_sel_info/d_file_sel_info.h +++ b/include/d/d_file/d_file_sel_info/d_file_sel_info.h @@ -1,3 +1,6 @@ +#ifndef D_FILE_SEL_INFO_H_ +#define D_FILE_SEL_INFO_H_ + #include "JSystem/J2DGraph/J2DScreen/J2DScreen.h" #include "JSystem/JKernel/JKRArchive/JKRArchive.h" #include "JSystem/JUtility/JUTFont/JUTFont.h" @@ -44,3 +47,5 @@ class dFile_info_c { char* play_time; char* unk56; }; + +#endif \ No newline at end of file diff --git a/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h b/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h index ee4097907a8..9242c5b812b 100644 --- a/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h +++ b/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h @@ -1,3 +1,8 @@ +#ifndef D_PANE_CLASS_ALPHA_H_ +#define D_PANE_CLASS_ALPHA_H_ + class CPaneMgrAlpha { -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index ba8e0d49647..84d685def26 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -1,3 +1,6 @@ +#ifndef D_SAVE_H_ +#define D_SAVE_H_ + #include "dolphin/types.h" #define MAX_BOTTLES 4 #define MAX_ITEM_SLOTS 24 @@ -409,10 +412,10 @@ class dSv_player_config_c { class dSv_player_c { public: void init(void); - inline dSv_player_info_c& getPlayerInfo() { + dSv_player_info_c& getPlayerInfo() { return player_info; } - inline dSv_player_status_a_c getPlayerStatusA() { + dSv_player_status_a_c getPlayerStatusA() { return player_status_a; } @@ -661,4 +664,6 @@ class dSv_info_c { dSv_restart_c restart; dSv_event_c events; dSv_turnRestart_c turn_restart; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/include/d/d_save/d_save_HIO/d_save_HIO.h b/include/d/d_save/d_save_HIO/d_save_HIO.h index 89894cb3576..6779793b13a 100644 --- a/include/d/d_save/d_save_HIO/d_save_HIO.h +++ b/include/d/d_save/d_save_HIO/d_save_HIO.h @@ -1,3 +1,6 @@ +#ifndef D_SAVE_HIO_H_ +#define D_SAVE_HIO_H_ + #include "dolphin/types.h" struct dSvBit_childSwPerfectionHIO_c_vtable { @@ -17,3 +20,4 @@ class dSvBit_childSwPerfectionHIO_c { u8 unk0[10]; }; +#endif \ No newline at end of file diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp index 4bf93c8658d..807507a4e65 100644 --- a/src/d/d_com/d_com_inf_game.cpp +++ b/src/d/d_com/d_com_inf_game.cpp @@ -1 +1,5 @@ -// ok +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" + +void dComIfG_play_c:ct(void) { + +} \ No newline at end of file