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

biiig checkin: removed more stuff from scumm.h; added new headers resource.h and object.h

Browse source 
svn-id: r4579
This commit is contained in:
Max Horn 2002-07-16 21:03:14 +00:00
parent 32e81beb45
commit 0843a2510c
21 changed files with 267 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

4
object.cpp
View file

@ -23,6 +23,8 @@
#include "stdafx.h"
#include "scumm.h"
#include "actor.h"
#include "object.h"
#include "resource.h"
bool Scumm::getClass(int obj, int cls)
{
@ -807,7 +809,7 @@ void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint
if (findWhat & foCheckAlreadyLoaded && getObjectIndex(id) != -1) {
fo->obcd = obcdptr = getOBCDFromObject(id);
assert((byte *)obcdptr > (byte *)256);
fo->obim = obimptr = obcdptr + READ_BE_UINT32_UNALIGNED(&((ResHdr *)obcdptr)->size);
fo->obim = obimptr = obcdptr + RES_SIZE(obcdptr);
fo->cdhd = (CodeHeader *)findResourceData(MKID('CDHD'), obcdptr);
fo->imhd = (ImageHeader *)findResourceData(MKID('IMHD'), obimptr);
return;