[Scummvm-git-logs] scummvm master -> b3968ca39d7e90a47fb6a5946739a6045b76018d
digitall
dgturner at iee.org
Wed May 8 01:43:54 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b3968ca39d AGI: Fix Several GCC Compiler Warnings
Commit: b3968ca39d7e90a47fb6a5946739a6045b76018d
https://github.com/scummvm/scummvm/commit/b3968ca39d7e90a47fb6a5946739a6045b76018d
Author: D G Turner (digitall at scummvm.org)
Date: 2019-05-08T00:42:03+01:00
Commit Message:
AGI: Fix Several GCC Compiler Warnings
Changed paths:
engines/agi/agi.cpp
engines/agi/view.h
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 3f98a1d..c18e9ac 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 adcf7dd..1c57d5d 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
More information about the Scummvm-git-logs
mailing list