aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-05-18 14:15:13 +0200
committeruruk2014-05-18 14:15:13 +0200
commit47e55f16646403a1dea870231e4f294c0858b9a7 (patch)
tree471451eb33c2884caa36518f08172377037e57c3
parent412d30ca33adce079ed8ce0768f7662f5b055dc3 (diff)
downloadscummvm-rg350-47e55f16646403a1dea870231e4f294c0858b9a7.tar.gz
scummvm-rg350-47e55f16646403a1dea870231e4f294c0858b9a7.tar.bz2
scummvm-rg350-47e55f16646403a1dea870231e4f294c0858b9a7.zip
CGE2: Initialize _actions[] in SprExt's constructor.
-rw-r--r--engines/cge2/vga13h.cpp8
-rw-r--r--engines/cge2/vga13h.h5
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index fc5f9b4fa6..51a8c107ef 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -72,6 +72,14 @@ Seq Sprite::_stdSeq8[] =
{ 7, 7, 0, 0, 0, 0 },
};
+SprExt::SprExt(CGE2Engine *vm)
+ : _p0(vm, 0, 0), _p1(vm, 0, 0),
+ _b0(NULL), _b1(NULL), _shpList(NULL),
+ _location(0), _seq(NULL), _name(NULL) {
+ for (int i = 0; i < kActions; i++)
+ _actions[i] = nullptr;
+}
+
Sprite::Sprite(CGE2Engine *vm)
: _siz(_vm, 0, 0), _seqPtr(kNoSeq), _seqCnt(0), _shpCnt(0),
_next(NULL), _prev(NULL), _time(0),
diff --git a/engines/cge2/vga13h.h b/engines/cge2/vga13h.h
index 894f7b7019..8f73f42375 100644
--- a/engines/cge2/vga13h.h
+++ b/engines/cge2/vga13h.h
@@ -71,10 +71,7 @@ public:
Seq *_seq;
char *_name;
CommandHandler::Command *_actions[kActions];
- SprExt(CGE2Engine *vm) : _p0(vm, 0, 0), _p1(vm, 0, 0),
- _b0(NULL), _b1(NULL),_shpList(NULL), _location(0),
- _seq(NULL), _name(NULL)
- {}
+ SprExt(CGE2Engine *vm);
};
class Sprite {