thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Move more functions to DreamBase

Browse source
This commit is contained in:
Willem Jan Palenstijn 2011-12-24 13:55:56 +01:00
parent bcf789274f
commit 42068065b5
6 changed files with 57 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/dreamweb/object.cpp
View file

@ -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)) {