aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/agi.cpp
diff options
context:
space:
mode:
authorD G Turner2019-08-25 07:27:21 +0100
committerD G Turner2019-08-25 07:27:21 +0100
commit50c5177eb002da0d809f16941643a53677ec324c (patch)
treebb15f5cbe6d1fe5b870458cb3eca4c8ff826c884 /engines/agi/agi.cpp
parent482f835ad6c1260fb2fc2609ecca70f3ac618fc5 (diff)
downloadscummvm-rg350-50c5177eb002da0d809f16941643a53677ec324c.tar.gz
scummvm-rg350-50c5177eb002da0d809f16941643a53677ec324c.tar.bz2
scummvm-rg350-50c5177eb002da0d809f16941643a53677ec324c.zip
AGI: Fix Remaining GCC Compiler Warnings
These were the remaining memset on non-trivial structure warnings.
Diffstat (limited to 'engines/agi/agi.cpp')
-rw-r--r--engines/agi/agi.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 227700561b..73d9e095ce 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -91,14 +91,14 @@ int AgiEngine::agiInit() {
// clear all resources and events
for (i = 0; i < MAX_DIRECTORY_ENTRIES; i++) {
- memset(&_game.views[i], 0, sizeof(struct AgiView));
- memset(&_game.pictures[i], 0, sizeof(struct AgiPicture));
- memset(&_game.logics[i], 0, sizeof(struct AgiLogic));
- memset(&_game.sounds[i], 0, sizeof(class AgiSound *)); // _game.sounds contains pointers now
- memset(&_game.dirView[i], 0, sizeof(struct AgiDir));
- memset(&_game.dirPic[i], 0, sizeof(struct AgiDir));
- memset(&_game.dirLogic[i], 0, sizeof(struct AgiDir));
- memset(&_game.dirSound[i], 0, sizeof(struct AgiDir));
+ _game.views[i].reset();
+ _game.pictures[i].reset();
+ _game.logics[i].reset();
+ _game.sounds[i] = nullptr; // _game.sounds contains pointers now
+ _game.dirView[i].reset();
+ _game.dirPic[i].reset();
+ _game.dirLogic[i].reset();
+ _game.dirSound[i].reset();
}
// clear view table