aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/stubs.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-12-24 14:27:24 +0100
committerWillem Jan Palenstijn2011-12-24 14:41:12 +0100
commit8e36de736e88f1b7a70ad04fc3d09b7807ff94f9 (patch)
tree7396b1d4e89f65331f6b04d34d980eaa51dc2826 /engines/dreamweb/stubs.cpp
parentef35f1f69d3c75c2ed6dbb0bb4fe6a5551750ec1 (diff)
downloadscummvm-rg350-8e36de736e88f1b7a70ad04fc3d09b7807ff94f9.tar.gz
scummvm-rg350-8e36de736e88f1b7a70ad04fc3d09b7807ff94f9.tar.bz2
scummvm-rg350-8e36de736e88f1b7a70ad04fc3d09b7807ff94f9.zip
DREAMWEB: Minor cleanup
Diffstat (limited to 'engines/dreamweb/stubs.cpp')
-rw-r--r--engines/dreamweb/stubs.cpp31
1 files changed, 3 insertions, 28 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0f5b6541d7..2120668ef6 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1138,10 +1138,6 @@ void DreamBase::delTextLine() {
multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
}
-void DreamGenContext::commandOnly() {
- commandOnly(al);
-}
-
void DreamBase::commandOnly(uint8 command) {
delTextLine();
uint16 index = command * 2;
@@ -1152,10 +1148,6 @@ void DreamBase::commandOnly(uint8 command) {
data.byte(kNewtextline) = 1;
}
-void DreamGenContext::checkIfPerson() {
- flags._z = !checkIfPerson(al, ah);
-}
-
bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
Common::List<People>::iterator i;
for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
@@ -1183,10 +1175,6 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
return false;
}
-void DreamGenContext::checkIfFree() {
- flags._z = !checkIfFree(al, ah);
-}
-
bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
Common::List<ObjPos>::const_iterator i;
for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
@@ -1200,10 +1188,6 @@ bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
return false;
}
-void DreamGenContext::checkIfEx() {
- flags._z = !checkIfEx(al, ah);
-}
-
bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
Common::List<ObjPos>::const_iterator i;
for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
@@ -1411,11 +1395,7 @@ void DreamBase::removeSetObject(uint8 index) {
getSetAd(index)->mapad[0] = 0xff;
}
-void DreamGenContext::finishedWalking() {
- flags._z = finishedWalkingCPP();
-}
-
-bool DreamGenContext::finishedWalkingCPP() {
+bool DreamBase::finishedWalking() {
return (data.byte(kLinepointer) == 254) && (data.byte(kFacing) == data.byte(kTurntoface));
}
@@ -1426,7 +1406,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
}
void DreamGenContext::walkAndExamine() {
- if (!finishedWalkingCPP())
+ if (!finishedWalking())
return;
data.byte(kCommandtype) = data.byte(kWalkexamtype);
data.byte(kCommand) = data.byte(kWalkexamnum);
@@ -1449,7 +1429,7 @@ void DreamGenContext::obName(uint8 command, uint8 commandType) {
setWalk();
data.byte(kReasseschanges) = 1;
return;
- } else if (! finishedWalkingCPP())
+ } else if (!finishedWalking())
return;
else if (data.byte(kCommandtype) == 5) {
if (data.word(kWatchingtime) == 0)
@@ -1690,11 +1670,6 @@ bool DreamBase::objectMatches(void *object, const char *id) {
return true;
}
-void DreamGenContext::compare() {
- char id[4] = { cl, ch, dl, dh };
- flags._z = compare(al, ah, id);
-}
-
bool DreamBase::compare(uint8 index, uint8 flag, const char id[4]) {
return objectMatches(getAnyAdDir(index, flag), id);
}