[Scummvm-cvs-logs] scummvm master -> 21d787d065468596ff854128407956bf9bf4ff37
tramboi
bertrand_augereau at yahoo.fr
Sat Nov 26 10:31:42 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
21d787d065 DREAMWEB: Ceaning in 'startloading'
Commit: 21d787d065468596ff854128407956bf9bf4ff37
https://github.com/scummvm/scummvm/commit/21d787d065468596ff854128407956bf9bf4ff37
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-26T03:29:09-08:00
Commit Message:
DREAMWEB: Ceaning in 'startloading'
Changed paths:
engines/dreamweb/structs.h
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 5b73118..8b00301 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -196,7 +196,7 @@ struct Room {
uint8 b19;
uint8 liftFlag;
uint8 b21;
- uint8 b22;
+ uint8 facing;
uint8 countToOpen;
uint8 liftPath;
uint8 doorPath;
@@ -205,7 +205,7 @@ struct Room {
uint8 b28;
uint8 b29;
uint8 b30;
- uint8 b31;
+ uint8 realLocation;
};
struct Rain {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index db71579..028b5fc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -891,17 +891,14 @@ void DreamGenContext::startloading(const Room *room) {
data.byte(kManspath) = room->b21;
data.byte(kDestination) = room->b21;
data.byte(kFinaldest) = room->b21;
- data.byte(kFacing) = room->b22;
- data.byte(kTurntoface) = room->b22;
+ data.byte(kFacing) = room->facing;
+ data.byte(kTurntoface) = room->facing;
data.byte(kCounttoopen) = room->countToOpen;
data.byte(kLiftpath) = room->liftPath;
data.byte(kDoorpath) = room->doorPath;
data.byte(kLastweapon) = (uint8)-1;
- al = room->b27;
- push(ax);
- al = room->b31;
ah = data.byte(kReallocation);
- data.byte(kReallocation) = al;
+ data.byte(kReallocation) = room->realLocation;
Common::String name = room->name;
engine->openFile(name);
cs.word(kHandle) = 1; //only one handle
@@ -998,9 +995,8 @@ void DreamGenContext::startloading(const Room *room) {
data.word(kLookcounter) = 160;
data.byte(kNewlocation) = 255;
data.byte(kLinepointer) = 254;
- ax = pop();
- if (al != 255) {
- data.byte(kManspath) = al;
+ if (room->b27 != 255) {
+ data.byte(kManspath) = room->b27;
push(bx);
autosetwalk();
bx = pop();
More information about the Scummvm-git-logs
mailing list