aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-12-03 22:39:55 +0000
committerGregory Montoir2004-12-03 22:39:55 +0000
commitfb5dcffff19c8bb5c516a6ddcaea397fb709194b (patch)
tree038a2149a59e56ac9832262808e51edcbc21a305 /queen/logic.cpp
parent76bf11cbdf8a4549a9461a467d82dda12eec5d45 (diff)
downloadscummvm-rg350-fb5dcffff19c8bb5c516a6ddcaea397fb709194b.tar.gz
scummvm-rg350-fb5dcffff19c8bb5c516a6ddcaea397fb709194b.tar.bz2
scummvm-rg350-fb5dcffff19c8bb5c516a6ddcaea397fb709194b.zip
Minor cleanup, one more time.
Fixed a crash when returning to the launcher at the end of the game. I played FOTAQ (french) from the beginning to the end some hours ago, I haven't encountered any special problems/glitches (except the one mentionned above). svn-id: r15979
Diffstat (limited to 'queen/logic.cpp')
-rw-r--r--queen/logic.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 565476ecf1..826ec3137e 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -456,18 +456,22 @@ const char *Logic::roomName(uint16 roomNum) const {
}
const char *Logic::objectName(uint16 objNum) const {
+ assert(objNum >= 1 && objNum <= _numNames);
return _objName[objNum].c_str();
}
const char *Logic::objectTextualDescription(uint16 objNum) const {
+ assert(objNum >= 1 && objNum <= _numDescriptions);
return _objDescription[objNum].c_str();
}
const char *Logic::joeResponse(int i) const {
+ assert(i >= 1 && i <= JOE_RESPONSE_MAX);
return _joeResponse[i].c_str();
}
const char *Logic::verbName(Verb v) const {
+ assert(v >= 0 && v <= 12);
return _verbName[v].c_str();
}
@@ -2034,6 +2038,7 @@ void Logic::startCredits(const char *filename) {
void Logic::stopCredits() {
if (_credits) {
+ _vm->display()->clearTexts(0, 199);
delete _credits;
_credits = NULL;
}