aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/scott
diff options
context:
space:
mode:
authorPaul Gilbert2018-11-17 12:01:58 -0800
committerPaul Gilbert2018-12-08 19:05:59 -0800
commit326f69136eb4fee72391a8175ad722a317f84ca6 (patch)
tree4d9f4df1cb79a845d68ce15d5f1997bbedcfe767 /engines/glk/scott
parent813918aaba8c2f86d55c4b256da7ee79c155b12f (diff)
downloadscummvm-rg350-326f69136eb4fee72391a8175ad722a317f84ca6.tar.gz
scummvm-rg350-326f69136eb4fee72391a8175ad722a317f84ca6.tar.bz2
scummvm-rg350-326f69136eb4fee72391a8175ad722a317f84ca6.zip
GLK: SCOTT: Fix memory corruption loading game data
Diffstat (limited to 'engines/glk/scott')
-rw-r--r--engines/glk/scott/scott.cpp86
-rw-r--r--engines/glk/scott/scott.h8
2 files changed, 34 insertions, 60 deletions
diff --git a/engines/glk/scott/scott.cpp b/engines/glk/scott/scott.cpp
index 77fd9cc054..fed31f014e 100644
--- a/engines/glk/scott/scott.cpp
+++ b/engines/glk/scott/scott.cpp
@@ -104,7 +104,7 @@ void Scott::runGame(Common::SeekableReadStream *gameFile) {
}
// Brian Howarth games seem to use -1 for forever
- if (_items[LIGHT_SOURCE]._location/*==-1*/ != DESTROYED && _gameHeader._lightTime != -1) {
+ if (_items[LIGHT_SOURCE]._location != DESTROYED && _gameHeader._lightTime != -1) {
_gameHeader._lightTime--;
if (_gameHeader._lightTime < 1) {
_bitFlags |= (1 << LIGHTOUTBIT);
@@ -282,9 +282,6 @@ void Scott::loadDatabase(Common::SeekableReadStream *f, bool loud) {
int unused, ni, na, nw, nr, mc, pr, tr, wl, lt, mn, trm;
int ct;
int lo;
- Action *ap;
- Room *rp;
- Item *ip;
// Load the header
readInts(f, 12, &unused, &ni, &na, &nw, &nr, &mc, &pr, &tr, &wl, &lt, &mn, &trm);
@@ -309,89 +306,66 @@ void Scott::loadDatabase(Common::SeekableReadStream *f, bool loud) {
_gameHeader._treasureRoom = trm;
// Load the actions
- ct = 0;
- ap = &_actions[0];
if (loud)
debug("Reading %d actions.", na);
- while (ct < na + 1) {
+
+ for (uint idx = 0; idx < na + 1; ++idx) {
+ Action &a = _actions[idx];
readInts(f, 8,
- &ap->_vocab,
- &ap->_condition[0],
- &ap->_condition[1],
- &ap->_condition[2],
- &ap->_condition[3],
- &ap->_condition[4],
- &ap->_action[0],
- &ap->_action[1]);
- ap++;
- ct++;
+ &a._vocab, &a._condition[0], &a._condition[1], &a._condition[2],
+ &a._condition[3], &a._condition[4], &a._action[0], &a._action[1]);
}
- ct = 0;
if (loud)
debug("Reading %d word pairs.", nw);
- while (ct < nw + 1) {
- _verbs[ct] = readString(f);
- _nouns[ct] = readString(f);
- ct++;
+ for (int idx = 0; idx < nw + 1; ++idx) {
+ _verbs[idx] = readString(f);
+ _nouns[idx] = readString(f);
}
- ct = 0;
- rp = &_rooms[0];
+
if (loud)
debug("Reading %d rooms.", nr);
- while (ct < nr + 1) {
- readInts(f, 6,
- &rp->_exits[0], &rp->_exits[1], &rp->_exits[2],
- &rp->_exits[3], &rp->_exits[4], &rp->_exits[5]);
-
- rp->_text = readString(f);
- ct++;
- rp++;
+ for (int idx = 0; idx < nr + 1; ++idx) {
+ Room &r = _rooms[idx];
+ readInts(f, 6, &r._exits[0], &r._exits[1], &r._exits[2],
+ &r._exits[3], &r._exits[4], &r._exits[5]);
+ r._text = readString(f);
}
- ct = 0;
if (loud)
debug("Reading %d messages.", mn);
- while (ct < mn + 1) {
- _messages[ct] = readString(f);
- ct++;
- }
+ for (int idx = 0; idx < mn + 1; ++idx)
+ _messages[idx] = readString(f);
- ct = 0;
if (loud)
debug("Reading %d items.", ni);
- ip = &_items[0];
- while (ct < ni + 1) {
- ip->_text = readString(f);
+ for (int idx = 0; idx < ni + 1; ++idx) {
+ Item &i = _items[idx];
+ i._text = readString(f);
- const char *p = strchr(ip->_text.c_str(), '/');
+ const char *p = strchr(i._text.c_str(), '/');
if (p) {
- ip->_autoGet = Common::String(p);
+ i._autoGet = Common::String(p);
// Some games use // to mean no auto get/drop word!
- if (!ip->_autoGet.hasPrefix("//") && !ip->_autoGet.hasPrefix("/*")) {
- ip->_text = Common::String(ip->_text.c_str(), p);
- ip->_autoGet.deleteChar(0);
+ if (!i._autoGet.hasPrefix("//") && !i._autoGet.hasPrefix("/*")) {
+ i._text = Common::String(i._text.c_str(), p);
+ i._autoGet.deleteChar(0);
- const char *t = strchr(ip->_autoGet.c_str(), '/');
+ const char *t = strchr(i._autoGet.c_str(), '/');
if (t)
- ip->_autoGet = Common::String(ip->_autoGet.c_str(), t);
+ i._autoGet = Common::String(i._autoGet.c_str(), t);
}
}
readInts(f, 1, &lo);
- ip->_location = (unsigned char)lo;
- ip->_initialLoc = ip->_location;
- ip++;
- ct++;
+ i._location = (unsigned char)lo;
+ i._initialLoc = i._location;
}
- ct = 0;
// Skip Comment Strings
- while (ct < na + 1) {
+ for (int idx = 0; idx < na + 1; ++idx)
readString(f);
- ct++;
- }
readInts(f, 1, &ct);
if (loud)
diff --git a/engines/glk/scott/scott.h b/engines/glk/scott/scott.h
index 955ebb9365..4741892687 100644
--- a/engines/glk/scott/scott.h
+++ b/engines/glk/scott/scott.h
@@ -70,9 +70,9 @@ struct Header {
};
struct Action {
- uint _vocab;
- uint _condition[5];
- uint _action[2];
+ int _vocab;
+ int _condition[5];
+ int _action[2];
Action() : _vocab(0) {
Common::fill(&_condition[0], &_condition[5], 0);
@@ -82,7 +82,7 @@ struct Action {
struct Room {
Common::String _text;
- short _exits[6];
+ int _exits[6];
Room() {
Common::fill(&_exits[0], &_exits[6], 0);