aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/anihandler.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2019-01-05 20:12:42 +0100
committerFilippos Karapetis2019-07-14 14:58:19 +0300
commit4eef7a42e3f45a18a57674898f5fb5409f6daf5d (patch)
tree298ef17606a4aa0747b32c49bd6a28c7e7b9a32c /engines/fullpipe/anihandler.h
parentb5b136b1770dd3ed4b750b9df9c10881dded1aba (diff)
downloadscummvm-rg350-4eef7a42e3f45a18a57674898f5fb5409f6daf5d.tar.gz
scummvm-rg350-4eef7a42e3f45a18a57674898f5fb5409f6daf5d.tar.bz2
scummvm-rg350-4eef7a42e3f45a18a57674898f5fb5409f6daf5d.zip
FULLPIPE: Silence GCC memset() warnings
Recent GCC versions complain if you memset() a class or struct that contain non-POD data types. Get around that by either initializing the object when created, or by adding a reset() method.
Diffstat (limited to 'engines/fullpipe/anihandler.h')
-rw-r--r--engines/fullpipe/anihandler.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/engines/fullpipe/anihandler.h b/engines/fullpipe/anihandler.h
index f73d755aa9..ed4e382869 100644
--- a/engines/fullpipe/anihandler.h
+++ b/engines/fullpipe/anihandler.h
@@ -38,6 +38,15 @@ struct MGMSubItem {
int y;
MGMSubItem();
+
+ void reset() {
+ movement = nullptr;
+ staticsIndex = 0;
+ field_8 = 0;
+ field_C = 0;
+ x = 0;
+ y = 0;
+ }
};
struct MGMItem {
@@ -63,7 +72,21 @@ struct MakeQueueStruct {
int y2;
int flags;
- MakeQueueStruct() { memset(this, 0, sizeof(MakeQueueStruct)); }
+ MakeQueueStruct() { reset(); }
+
+ void reset() {
+ ani = nullptr;
+ staticsId1 = 0;
+ staticsId2 = 0;
+ movementId = 0;
+ field_10 = 0;
+ x1 = 0;
+ y1 = 0;
+ field_1C = 0;
+ x2 = 0;
+ y2 = 0;
+ flags = 0;
+ }
};
class AniHandler : public CObject {