ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

MOHAWK: Keep resource type around

Browse Source 
svn-id: r54595
This commit is contained in:
Bastien Bouclet
2010-11-29 20:50:11 +00:00
parent 117f46a884
commit 4e420ef6fc
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/mohawk/myst.cpp
+23 -9
View File
@@ -890,6 +890,7 @@ void MohawkEngine_Myst::drawResourceImages() {
}
static MystResource *loadResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent) {
MystResource *resource = 0;
uint16 type = rlstStream->readUint16LE();
debugC(kDebugResource, "\tType: %d", type);
@@ -902,26 +903,39 @@ static MystResource *loadResource(MohawkEngine_Myst *vm, Common::SeekableReadStr
case kMystDownResource:
case kMystUpResource:
case 14: // TODO: kMystBackwardResource?
return new MystResource(vm, rlstStream, parent);
resource = new MystResource(vm, rlstStream, parent);
break;
case kMystActionResource:
return new MystResourceType5(vm, rlstStream, parent);
resource = new MystResourceType5(vm, rlstStream, parent);
break;
case kMystVideoResource:
return new MystResourceType6(vm, rlstStream, parent);
resource = new MystResourceType6(vm, rlstStream, parent);
break;
case kMystSwitchResource:
return new MystResourceType7(vm, rlstStream, parent);
resource = new MystResourceType7(vm, rlstStream, parent);
break;
case 8:
return new MystResourceType8(vm, rlstStream, parent);
resource = new MystResourceType8(vm, rlstStream, parent);
break;
case 10:
return new MystResourceType10(vm, rlstStream, parent);
resource = new MystResourceType10(vm, rlstStream, parent);
break;
case 11:
return new MystResourceType11(vm, rlstStream, parent);
resource = new MystResourceType11(vm, rlstStream, parent);
break;
case 12:
return new MystResourceType12(vm, rlstStream, parent);
resource = new MystResourceType12(vm, rlstStream, parent);
break;
case 13:
return new MystResourceType13(vm, rlstStream, parent);
resource = new MystResourceType13(vm, rlstStream, parent);
break;
default:
error ("Unknown/Unhandled MystResource type %d", type);
}
resource->type = type;
return resource;
}
void MohawkEngine_Myst::loadResources() {
engines/mohawk/myst.h
+1
View File
@@ -154,6 +154,7 @@ public:
virtual ~MystResource();
MystResource *_parent;
uint16 type;
bool contains(Common::Point point) { return _rect.contains(point); }
virtual void drawDataToScreen() {}