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

SCUMM: Got rid of BompHeader

Browse source 
svn-id: r24371
This commit is contained in:
Max Horn 2006-10-18 15:08:43 +00:00
parent 1a086279b2
commit 3467a6f19b
1 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
engines/scumm/object.cpp
View file

@ -36,24 +36,6 @@
namespace Scumm { namespace Scumm {
#include "common/pack-start.h" // START STRUCT PACKING
struct BompHeader { /* Bomp header */
union {
struct {
uint16 unk;
uint16 width, height;
} old;
struct {
uint32 width, height;
} v8;
};
};
#include "common/pack-end.h" // END STRUCT PACKING
void ScummEngine::addObjectToInventory(uint obj, uint room) { void ScummEngine::addObjectToInventory(uint obj, uint room) {
int idx, slot; int idx, slot;
uint32 size; uint32 size;
@ -293,7 +275,7 @@ int ScummEngine::getState(int obj) {
// //
// This will keep the security door open at all times. I can only // This will keep the security door open at all times. I can only
// assume that 182 and 193 each correspond to one particular side of // assume that 182 and 193 each correspond to one particular side of
// the it. Fortunately it does not prevent frustrated players from // it. Fortunately this does not prevent frustrated players from
// blowing up the mansion, should they feel the urge to. // blowing up the mansion, should they feel the urge to.
if (_game.id == GID_MANIAC && (obj == 182 || obj == 193)) if (_game.id == GID_MANIAC && (obj == 182 || obj == 193))
@ -1651,11 +1633,11 @@ void ScummEngine_v6::drawBlastObject(BlastObject *eo) {
error("object %d is not a blast object", eo->number); error("object %d is not a blast object", eo->number);
if (_game.version == 8) { if (_game.version == 8) {
bdd.srcwidth = READ_LE_UINT32(&((const BompHeader *)bomp)->v8.width); bdd.srcwidth = READ_LE_UINT32(bomp);
bdd.srcheight = READ_LE_UINT32(&((const BompHeader *)bomp)->v8.height); bdd.srcheight = READ_LE_UINT32(bomp+4);
} else { } else {
bdd.srcwidth = READ_LE_UINT16(&((const BompHeader *)bomp)->old.width); bdd.srcwidth = READ_LE_UINT16(bomp+2);
bdd.srcheight = READ_LE_UINT16(&((const BompHeader *)bomp)->old.height); bdd.srcheight = READ_LE_UINT16(bomp+4);
} }
bdd.dst = *vs; bdd.dst = *vs;