diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/d_sys.h | 11 | ||||
| -rw-r--r-- | include/egg/core/eggSystem.h | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/include/d/d_sys.h b/include/d/d_sys.h index 54e93367..201a7df2 100644 --- a/include/d/d_sys.h +++ b/include/d/d_sys.h @@ -9,13 +9,8 @@ #define ROUND_UP_4KB(x) (((u32)(x) + 4096 - 1) & ~(4096 - 1)) typedef EGG::TSystem< - EGG::Video, - EGG::AsyncDisplay, - EGG::XfbManager, - EGG::SimpleAudioMgr, - EGG::SceneManager, - EGG::PerformanceView -> System; + EGG::Video, EGG::AsyncDisplay, EGG::XfbManager, EGG::SimpleAudioMgr, EGG::SceneManager, EGG::PerformanceView> + System; class dSndMgr_c; @@ -54,6 +49,6 @@ extern void *s_NewMEM1ArenaHi; void fixHeaps(); -}; +}; // namespace dSystem #endif diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h index 2adc5351..422002a4 100644 --- a/include/egg/core/eggSystem.h +++ b/include/egg/core/eggSystem.h @@ -59,7 +59,7 @@ public: class BaseSystem { public: static ConfigurationData *mConfigData; - + static XfbManager *getXfbMgr() { return mConfigData->getXfbMgr(); } @@ -81,7 +81,7 @@ public: void initRenderMode() override {} void initialize() override {} - + Video *getVideo() override { return static_cast<Video *>(mVideo); } @@ -99,8 +99,9 @@ public: } PerformanceView *getPerfView() override { - if (!mPerfView) + if (!mPerfView) { return mPerfView; + } // TODO remove cast hack if/when more is known about PerformanceView return static_cast<PerformanceView *>((void *)&mPerfView->_4c); } |