Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever....
svn-id: r3802
This commit is contained in:
parent
7b1bbf81e0
commit
ccf69ad76b
8 changed files with 455 additions and 386 deletions
10
object.cpp
10
object.cpp
|
@ -135,9 +135,9 @@ void Scumm::getObjectXYPos(int object) {
|
|||
ImageHeader *imhd;
|
||||
int x,y;
|
||||
|
||||
if(!(_features & GF_SMALL_HEADER)) {
|
||||
if (_features&GF_AFTER_V6) {
|
||||
state = getState(object)-1;
|
||||
if(!(_features & GF_SMALL_HEADER)) {
|
||||
if (_features&GF_AFTER_V6) {
|
||||
state = getState(object)-1;
|
||||
if (state<0)
|
||||
state = 0;
|
||||
|
||||
|
@ -159,14 +159,14 @@ void Scumm::getObjectXYPos(int object) {
|
|||
}
|
||||
} else {
|
||||
x = od->walk_x;
|
||||
y = od->walk_y;
|
||||
y = od->walk_y;
|
||||
}
|
||||
_xPos = x;
|
||||
_yPos = y;
|
||||
_dir = oldDirToNewDir(od->actordir&3);
|
||||
} else {
|
||||
x = od->walk_x;
|
||||
y = od->walk_y;
|
||||
y = od->walk_y;
|
||||
_xPos = x;
|
||||
_yPos = y;
|
||||
_dir= oldDirToNewDir(od->actordir&3);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue