diff options
| author | D G Turner | 2019-05-08 00:42:03 +0100 |
|---|---|---|
| committer | D G Turner | 2019-05-08 00:42:03 +0100 |
| commit | b3968ca39d7e90a47fb6a5946739a6045b76018d (patch) | |
| tree | 8b9163460cdb6e1a308fd147d50511c6d40b9451 /engines/agi | |
| parent | 5a519e19c6338fd71635017d2e65420e60e8e14a (diff) | |
| download | scummvm-rg350-b3968ca39d7e90a47fb6a5946739a6045b76018d.tar.gz scummvm-rg350-b3968ca39d7e90a47fb6a5946739a6045b76018d.tar.bz2 scummvm-rg350-b3968ca39d7e90a47fb6a5946739a6045b76018d.zip | |
AGI: Fix Several GCC Compiler Warnings
Diffstat (limited to 'engines/agi')
| -rw-r--r-- | engines/agi/agi.cpp | 7 | ||||
| -rw-r--r-- | engines/agi/view.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 3f98a1d4be..c18e9ac0b7 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -102,10 +102,11 @@ int AgiEngine::agiInit() { } // clear view table - for (i = 0; i < SCREENOBJECTS_MAX; i++) - memset(&_game.screenObjTable[i], 0, sizeof(struct ScreenObjEntry)); + for (i = 0; i < SCREENOBJECTS_MAX; i++) { + _game.screenObjTable[i].reset(); + } - memset(&_game.addToPicView, 0, sizeof(struct ScreenObjEntry)); + _game.addToPicView.reset(); _words->clearEgoWords(); diff --git a/engines/agi/view.h b/engines/agi/view.h index adcf7dd1b3..1c57d5d468 100644 --- a/engines/agi/view.h +++ b/engines/agi/view.h @@ -133,7 +133,8 @@ struct ScreenObjEntry { // end of motion related variables uint8 loop_flag; - ScreenObjEntry() { memset(this, 0, sizeof(ScreenObjEntry)); } + void reset() { memset(this, 0, sizeof(ScreenObjEntry)); } + ScreenObjEntry() { reset(); } }; // struct vt_entry } // End of namespace Agi |