aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorD G Turner2019-08-24 10:25:20 +0100
committerD G Turner2019-08-24 10:25:20 +0100
commit1a9fa34dc18813a1048ad24466fd957050f82ec6 (patch)
tree6b12bb862f3db2d8127665e42bf36741ba388da7 /engines/agi
parent400cae33ab1a7591560ee80e15f5c96d3a36addd (diff)
downloadscummvm-rg350-1a9fa34dc18813a1048ad24466fd957050f82ec6.tar.gz
scummvm-rg350-1a9fa34dc18813a1048ad24466fd957050f82ec6.tar.bz2
scummvm-rg350-1a9fa34dc18813a1048ad24466fd957050f82ec6.zip
AGI: Fix some GCC Compilation Warnings
These were associated with memset() of Mouse structure which now has a constructor method to do this instead.
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/agi.cpp2
-rw-r--r--engines/agi/agi.h2
-rw-r--r--engines/agi/preagi.cpp1
3 files changed, 2 insertions, 3 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index c18e9ac0b7..93e1187523 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -360,10 +360,8 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
DebugMan.addDebugChannel(kDebugLevelText, "Text", "Text output debugging");
DebugMan.addDebugChannel(kDebugLevelSavegame, "Savegame", "Saving & restoring game debugging");
-
memset(&_game, 0, sizeof(struct AgiGame));
memset(&_debug, 0, sizeof(struct AgiDebug));
- memset(&_mouse, 0, sizeof(struct Mouse));
_game.mouseEnabled = true;
_game.mouseHidden = false;
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 02a406e6e9..71ba8e9298 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -232,6 +232,8 @@ struct gameIdList {
struct Mouse {
int button;
Common::Point pos;
+
+ Mouse() : button(0) {}
};
// Used by AGI Mouse protocol 1.0 for v27 (i.e. button pressed -variable).
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index bde7fda5e0..6262ee931f 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -50,7 +50,6 @@ PreAgiEngine::PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) :
memset(&_game, 0, sizeof(struct AgiGame));
memset(&_debug, 0, sizeof(struct AgiDebug));
- memset(&_mouse, 0, sizeof(struct Mouse));
_speakerHandle = new Audio::SoundHandle();
}