[Scummvm-cvs-logs] SF.net SVN: scummvm: [32530] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Jun 4 11:08:38 CEST 2008
Revision: 32530
http://scummvm.svn.sourceforge.net/scummvm/?rev=32530&view=rev
Author: thebluegr
Date: 2008-06-04 02:08:37 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
enterNewRoom -> enterRoom
Added debug output when entering/exiting rooms
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-06-04 09:07:55 UTC (rev 32529)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-06-04 09:08:37 UTC (rev 32530)
@@ -1785,7 +1785,7 @@
curX = -1;
objExit = 104;
withoutVerb();
- enterNewRoom(57);
+ enterRoom(57);
}
void DrasculaEngine::animation_13_5() {
@@ -1940,7 +1940,7 @@
textSurface = extraSurface;
clearRoom();
- enterNewRoom(102);
+ enterRoom(102);
activatePendulum();
}
@@ -1996,7 +1996,7 @@
objExit = 104;
curX = -1;
withoutVerb();
- enterNewRoom(58);
+ enterRoom(58);
hare_se_ve = 1;
trackProtagonist = 1;
animate("hbp.bin", 14);
@@ -2023,7 +2023,7 @@
clearRoom();
curX = -1;
objExit = 108;
- enterNewRoom(59);
+ enterRoom(59);
// The room number was originally changed here to "nada.alg",
// which is a non-existant file. In reality, this was just a
// hack to set the room number to a non-existant one, so that
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-06-04 09:07:55 UTC (rev 32529)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-06-04 09:08:37 UTC (rev 32530)
@@ -453,7 +453,7 @@
return true;
}
} else {
- enterNewRoom(62);
+ enterRoom(62);
curX = -20;
curY = 56;
gotoObject(65, 145);
@@ -463,7 +463,7 @@
trackProtagonist = 3;
objExit = 162;
if (hay_que_load == 0)
- enterNewRoom(14);
+ enterRoom(14);
else {
if (!loadGame(saveName)) {
return true;
@@ -481,7 +481,7 @@
trackProtagonist = 1;
objExit = 99;
if (hay_que_load == 0)
- enterNewRoom(20);
+ enterRoom(20);
else {
if (!loadGame(saveName)) {
return true;
@@ -494,7 +494,7 @@
addObject(22);
objExit = 100;
if (hay_que_load == 0) {
- enterNewRoom(21);
+ enterRoom(21);
trackProtagonist = 0;
curX = 235;
curY = 164;
@@ -516,7 +516,7 @@
trackProtagonist = 1;
objExit = 100;
if (hay_que_load == 0) {
- enterNewRoom(45);
+ enterRoom(45);
} else {
if (!loadGame(saveName)) {
return true;
@@ -529,7 +529,7 @@
trackProtagonist = 1;
objExit = 104;
if (hay_que_load == 0) {
- enterNewRoom(58);
+ enterRoom(58);
animation_1_6();
} else {
if (!loadGame(saveName)) {
@@ -787,9 +787,11 @@
sscanf(buf, "%s", result);
}
-void DrasculaEngine::enterNewRoom(int index) {
+void DrasculaEngine::enterRoom(int roomIndex) {
+ debug(2, "Entering room %d", roomIndex);
+
char fileName[20];
- sprintf(fileName, "%d.ald", index);
+ sprintf(fileName, "%d.ald", roomIndex);
int soc, l, martin = 0, objIsExit = 0;
float chiquez = 0, pequegnez = 0;
char pant1[20], pant2[20], pant3[20], pant4[20];
@@ -2050,7 +2052,7 @@
pickedObject = sav->readSint32LE();
hay_que_load = 0;
sscanf(currentData, "%d.ald", &roomNum);
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
withoutVerb();
return true;
@@ -2411,6 +2413,8 @@
}
bool DrasculaEngine::exitRoom(int l) {
+ debug(2, "Exiting room from door %d", l);
+
int roomNum = 0;
if (currentChapter == 1) {
@@ -2436,7 +2440,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX = -1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
}
}
} else if (currentChapter == 2) {
@@ -2467,7 +2471,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX =- 1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
}
} else if (currentChapter == 3) {
updateDoor(l);
@@ -2484,7 +2488,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX =- 1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
}
} else if (currentChapter == 4) {
updateDoor(l);
@@ -2504,7 +2508,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX = -1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
}
} else if (currentChapter == 5) {
updateDoor(l);
@@ -2522,7 +2526,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX = -1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
}
} else if (currentChapter == 6) {
updateDoor(l);
@@ -2539,7 +2543,7 @@
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
curX = -1;
- enterNewRoom(roomNum);
+ enterRoom(roomNum);
if (objExit == 105)
animation_19_6();
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-04 09:07:55 UTC (rev 32529)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-04 09:08:37 UTC (rev 32530)
@@ -314,7 +314,7 @@
void setDarkPalette();
void withoutVerb();
- void enterNewRoom(int);
+ void enterRoom(int);
void clearRoom();
void gotoObject(int, int);
void moveCursor();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list