aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/object.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-12-24 13:55:56 +0100
committerWillem Jan Palenstijn2011-12-24 14:23:34 +0100
commit42068065b57993c865823ff56e81bd7a87aa0278 (patch)
treeb533f18996b89f51da16142011b3d5c62c4698b3 /engines/dreamweb/object.cpp
parentbcf789274f605a0f4901399f767a1da40444fa79 (diff)
downloadscummvm-rg350-42068065b57993c865823ff56e81bd7a87aa0278.tar.gz
scummvm-rg350-42068065b57993c865823ff56e81bd7a87aa0278.tar.bz2
scummvm-rg350-42068065b57993c865823ff56e81bd7a87aa0278.zip
DREAMWEB: Move more functions to DreamBase
Diffstat (limited to 'engines/dreamweb/object.cpp')
-rw-r--r--engines/dreamweb/object.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 04081e2f0e..1245187a92 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -66,7 +66,7 @@ bool DreamBase::isItWorn(const DynObject *object) {
return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
}
-void DreamGenContext::wornError() {
+void DreamBase::wornError() {
data.byte(kCommandtype) = 255;
delPointer();
printMessage(76, 21, 57, 240, false);
@@ -79,7 +79,7 @@ void DreamGenContext::wornError() {
workToScreenM();
}
-void DreamGenContext::makeWorn(DynObject *object) {
+void DreamBase::makeWorn(DynObject *object) {
object->id[0] = 'W'-'A';
object->id[1] = 'E'-'A';
}
@@ -461,10 +461,6 @@ void DreamGenContext::setPickup() {
workToScreenM();
}
-void DreamGenContext::deleteExFrame() {
- deleteExFrame(al);
-}
-
void DreamBase::deleteExFrame(uint8 frameNum) {
Frame *frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*frameNum, sizeof(Frame));
@@ -488,10 +484,6 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
}
}
-void DreamGenContext::deleteExText() {
- deleteExText(al);
-}
-
void DreamBase::deleteExText(uint8 textNum) {
uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + 2*textNum);
@@ -704,7 +696,7 @@ const uint8 *DreamBase::getObTextStart() {
}
}
-void DreamGenContext::dropObject() {
+void DreamBase::dropObject() {
if (data.byte(kCommandtype) != 223) {
data.byte(kCommandtype) = 223;
if (!data.byte(kPickup)) {