[Scummvm-cvs-logs] SF.net SVN: scummvm: [25214] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sat Jan 27 00:24:13 CET 2007
Revision: 25214
http://scummvm.svn.sourceforge.net/scummvm/?rev=25214&view=rev
Author: peres001
Date: 2007-01-26 15:24:12 -0800 (Fri, 26 Jan 2007)
Log Message:
-----------
added more debug messages
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/commands.cpp
scummvm/trunk/engines/parallaction/defs.h
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/zone.cpp
Modified: scummvm/trunk/engines/parallaction/commands.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/commands.cpp 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/commands.cpp 2007-01-26 23:24:12 UTC (rev 25214)
@@ -46,7 +46,7 @@
Command *parseCommands(ArchivedFile *file) {
-// printf("parseCommands()\n");
+// printf("parseCommands()");
Node root;
memset(&root, 0, sizeof(root));
@@ -54,7 +54,7 @@
parseFillBuffers();
while (scumm_stricmp(_tokens[0], "ENDCOMMANDS") && scumm_stricmp(_tokens[0], "ENDZONE")) {
-// printf("token[0] = %s\n", _tokens[0]);
+// printf("token[0] = %s", _tokens[0]);
Command *cmd = (Command*)memAlloc(sizeof(Command));
memset(cmd, 0, sizeof(Command));
@@ -62,7 +62,7 @@
cmd->_id = _vm->searchTable(_tokens[0], commands_names);
uint16 _si = 1;
-// printf("cmd id = %i\n", cmd->_id);
+// printf("cmd id = %i", cmd->_id);
switch (cmd->_id) {
case CMD_SET: // set
@@ -212,7 +212,7 @@
void runCommands(Command *list, Zone *z) {
-// printf("runCommands()\n");
+ debugC(1, kDebugLocation, "runCommands");
Command *cmd = list;
for ( ; cmd; cmd = (Command*)cmd->_node._next) {
@@ -229,8 +229,7 @@
if ((cmd->_flagsOn & v8) != cmd->_flagsOn) continue;
if ((cmd->_flagsOff & ~v8) != cmd->_flagsOff) continue;
-// printf("localflags: %x\n", v8);
-// printf("%s (on flags: %x, off flags: %x)\n", commands_names[cmd->_id-1], cmd->_flagsOn, cmd->_flagsOff);
+ debugC(1, kDebugLocation, "runCommands: %s (on: %x, off: %x)", commands_names[cmd->_id-1], cmd->_flagsOn, cmd->_flagsOff);
switch (cmd->_id) {
@@ -335,6 +334,8 @@
}
}
+ debugC(1, kDebugLocation, "runCommands completed");
+
return;
}
Modified: scummvm/trunk/engines/parallaction/defs.h
===================================================================
--- scummvm/trunk/engines/parallaction/defs.h 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/defs.h 2007-01-26 23:24:12 UTC (rev 25214)
@@ -102,7 +102,9 @@
enum {
kDebugDisk = 1 << 0,
- kDebugWalk = 1 << 1
+ kDebugWalk = 1 << 1,
+ kDebugLocation = 1 << 2,
+ kDebugDialogue = 1 << 3
};
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2007-01-26 23:24:12 UTC (rev 25214)
@@ -220,11 +220,14 @@
void runDialogue(SpeakData *data) {
+ debugC(1, kDebugDialogue, "runDialogue: starting dialogue '%s'", data->_name);
enterDialogue();
+ debugC(1, kDebugDialogue, "runDialogue: enterDialogue ok");
if (!scumm_stricmp(_location, "museum")) {
_vm->_graphics->freeCnv( &_tempFrames );
+ debugC(1, kDebugDialogue, "runDialogue: special trick for 'museum' location");
}
char v20[PATH_LEN];
@@ -239,7 +242,10 @@
sprintf(v20, "%stal", v24);
}
+ debugC(1, kDebugDialogue, "runDialogue: loading 1st character head '%s'", v20);
_vm->_graphics->loadExternalCnv(v20, &_characterFace);
+ debugC(1, kDebugDialogue, "runDialogue: 1st character head loaded");
+
_vm->_graphics->loadExternalCnv("comiccnv", &Graphics::_font);
Cnv v6E;
@@ -247,8 +253,11 @@
if (!scumm_stricmp(data->_name, "yourself") || data->_name[0] == '\0') {
memcpy(&v6E, &_characterFace, sizeof(Cnv));
+ debugC(1, kDebugDialogue, "runDialogue: using default character head");
} else {
+ debugC(1, kDebugDialogue, "runDialogue: loading 2nd character head '%s'", v20);
_vm->_graphics->loadCnv(data->_name, &v6E);
+ debugC(1, kDebugDialogue, "runDialogue: 2nd character head loaded");
}
v5C._width = v6E._width;
@@ -263,8 +272,6 @@
uint16 _di = 0;
Command *v34 = NULL;
-// printf("enter Dialogue\n");
-
Dialogue *v60 = data->_dialogue;
while (v60) {
@@ -275,6 +282,8 @@
// display Question if any
if (scumm_stricmp(v60->_text, "NULL")) {
+ debugC(1, kDebugDialogue, "runDialogue: showing question '%s'", v60->_text);
+
_vm->_graphics->flatBlitCnv(
&v5C,
QUESTION_CHARACTER_X,
@@ -336,6 +345,11 @@
&_answerBalloonH[_si]
);
+ debugC(1, kDebugDialogue, "runDialogue: showing answer #%i '%s'",
+ _si,
+ v60->_answers[_si]
+ );
+
_vm->_graphics->drawBalloon(
_answerBalloonX[_si],
_answerBalloonY[_si],
@@ -354,8 +368,19 @@
3
);
+ debugC(1, kDebugDialogue, "runDialogue: answer #%i shown at (%i, %i)+(%i, %i)",
+ _si,
+ _answerBalloonX[_si],
+ _answerBalloonY[_si],
+ _answerBalloonW[_si],
+ _answerBalloonH[_si]
+ );
+
+
displayedAnswers = true;
} else {
+ debugC(1, kDebugDialogue, "runDialogue: skipping answer #%i", _si);
+
_answerBalloonY[_si+1] = _answerBalloonY[_si];
_answerBalloonY[_si] = SKIPPED_ANSWER;
}
@@ -364,8 +389,12 @@
}
+ debugC(1, kDebugDialogue, "runDialogue: all suitable answers displayed");
+
if (displayedAnswers == true) {
+ debugC(1, kDebugDialogue, "runDialogue: showing answering face (%x)", (uint32)v48._data0);
+
_vm->_graphics->flatBlitCnv(
&v48,
ANSWER_CHARACTER_X,
@@ -374,15 +403,21 @@
v48._data1
);
+ debugC(1, kDebugDialogue, "runDialogue: answering face shown");
+
if (askPassword == false) {
+ debugC(1, kDebugDialogue, "runDialogue: waiting for user to select answer");
_di = selectAnswer(v60, &v48);
+ debugC(1, kDebugDialogue, "runDialogue: user selected answer #%i", _di);
} else {
char password[100];
uint16 passwordLen = 0;
+ debugC(1, kDebugDialogue, "runDialogue: asking password");
+
while (askPassword == true) {
strcpy(password, ".......");
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
@@ -460,6 +495,8 @@
v60 = (Dialogue*)v60->_following._questions[_di];
} else {
+ debugC(1, kDebugDialogue, "runDialogue: no suitable answers found");
+
v60 = NULL;
}
} else {
@@ -470,17 +507,21 @@
}
-// printf("exit Dialogue\n");
+ debugC(1, kDebugDialogue, "runDialogue: out of dialogue loop");
+ _vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
- _vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
_vm->_graphics->freeCnv(&_characterFace);
+ debugC(1, kDebugDialogue, "runDialogue: 1st character head free'd");
if (scumm_stricmp(data->_name, "yourself") || data->_name[0] == '\0') {
_vm->_graphics->freeCnv(&v6E);
+ debugC(1, kDebugDialogue, "runDialogue: 2nd character head free'd");
}
_vm->_graphics->freeCnv(&Graphics::_font);
+
exitDialogue();
+ debugC(1, kDebugDialogue, "runDialogue: exit dialogue ok");
if (!scumm_stricmp(_location, "museum")) {
@@ -491,10 +532,14 @@
memcpy(&_yourself._cnv, &_tempFrames, sizeof(Cnv));
+ debugC(1, kDebugDialogue, "runDialogue: special trick for 'museum' location ok");
}
+ debugC(1, kDebugDialogue, "runDialogue: running zone commands");
runCommands(v34);
+ debugC(1, kDebugDialogue, "runDialogue: end");
+
return;
}
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-01-26 23:24:12 UTC (rev 25214)
@@ -38,7 +38,7 @@
void Parallaction::parseLocation(const char *filename) {
-// printf("parseLocation(%s)\n", filename);
+// printf("parseLocation(%s)", filename);
char *location_src = NULL;
@@ -82,7 +82,7 @@
parseFillBuffers();
while (scumm_stricmp(_tokens[0], "ENDLOCATION")) {
-// printf("token[0] = %s\n", _tokens[0]);
+// printf("token[0] = %s", _tokens[0]);
if (!scumm_stricmp(_tokens[0], "LOCATION")) {
char *background = strchr(_tokens[1], '.');
@@ -188,8 +188,8 @@
}
void resolveLocationForwards() {
-// printf("resolveLocationForwards()\n");
-// printf("# forwards: %i\n", _numForwards);
+// printf("resolveLocationForwards()");
+// printf("# forwards: %i", _numForwards);
for (uint16 _si = 0; _forwardedCommands[_si]; _si++) {
_forwardedCommands[_si]->u._animation = findAnimation(_forwardedAnimationNames[_si]);
@@ -266,7 +266,7 @@
}
void switchBackground(char *name) {
-// printf("switchBackground(%s)\n", name);
+// printf("switchBackground(%s)", name);
byte palette[PALETTE_SIZE];
@@ -302,8 +302,9 @@
void Parallaction::changeLocation(char *location) {
+ debugC(1, kDebugLocation, "changeLocation to '%s'", location);
-// printf("changeLocation('%s')\n", location);
+// printf("changeLocation('%s')", location);
if (_musicData1 != 0) {
if (!scumm_stricmp(_characterName, "dino"))
loadMusic("dino");
@@ -315,12 +316,16 @@
playMusic();
_musicData1 = 0;
+
+ debugC(1, kDebugLocation, "changeLocation: started character specific music");
}
if (!scumm_stricmp(location, "night") || !scumm_stricmp(location, "intsushi")) {
stopMusic();
loadMusic("soft");
playMusic();
+
+ debugC(1, kDebugLocation, "changeLocation: started music 'soft'");
}
if (!scumm_stricmp(location, "museo") ||
@@ -333,15 +338,25 @@
stopMusic();
_musicData1 = 1;
+
+ debugC(1, kDebugLocation, "changeLocation: music stopped");
}
- if (_engineFlags & kEngineMouse) changeCursor( kCursorArrow );
+ if (_engineFlags & kEngineMouse) {
+ changeCursor( kCursorArrow );
+ debugC(1, kDebugLocation, "changeLocation: changed cursor");
+ }
+
strcpy(_newLocation, location);
removeNode(&_yourself._zone._node);
+ debugC(1, kDebugLocation, "changeLocation: removed character from the animation list");
+
freeLocation();
+ debugC(1, kDebugLocation, "changeLocation: old location free'd");
+
char *tmp = strchr(_newLocation, '.');
if (tmp) {
*tmp = '\0';
@@ -349,10 +364,13 @@
if (!scumm_strnicmp(tmp+1, "slide", 5)) {
char filename[200];
sprintf(filename, "%s.slide", _newLocation);
+
_vm->_graphics->loadBackground(filename, Graphics::kBitBack);
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
+ debugC(1, kDebugLocation, "changeLocation: new background set");
+
_vm->_graphics->_proportionalFont = false;
_vm->_graphics->loadExternalCnv("slidecnv", &Graphics::_font);
@@ -364,6 +382,8 @@
_vm->_graphics->freeCnv(&Graphics::_font);
waitUntilLeftClick();
+ debugC(1, kDebugLocation, "changeLocation: intro text shown");
+
tmp = strchr(tmp+1, '.');
strcpy(_newLocation, tmp+1);
tmp = strchr(_newLocation, '.');
@@ -378,13 +398,18 @@
changeCharacter(tmp+1);
strcpy(_characterName, tmp+1);
}
+
+ debugC(1, kDebugLocation, "changeLocation: character changed to '%s'", _characterName);
}
addNode(&_animations, &_yourself._zone._node);
+ debugC(1, kDebugLocation, "changeLocation: new character added to the animation list");
+
strcpy(_saveData1, _newLocation);
parseLocation(_newLocation);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
+ debugC(1, kDebugLocation, "changeLocation: new location '%s' parsed", _newLocation);
_yourself._zone.pos._oldposition._x = -1000;
_yourself._zone.pos._oldposition._y = -1000;
@@ -396,6 +421,8 @@
_yourself._frame = _firstFrame;
_firstPosition._y = -1000;
_firstPosition._x = -1000;
+
+ debugC(1, kDebugLocation, "changeLocation: initial position set to x: %i, y: %i, f: %i", _firstPosition._x, _firstPosition._y, _firstFrame);
}
byte palette[PALETTE_SIZE];
@@ -410,13 +437,22 @@
_vm->_graphics->swapBuffers();
}
- if (_locationComment) doLocationEnterTransition();
+ if (_locationComment) {
+ doLocationEnterTransition();
+ debugC(1, kDebugLocation, "changeLocation: shown location comment");
+ }
+
runJobs();
_vm->_graphics->swapBuffers();
_vm->_graphics->palUnk0(_palette);
- if (_locationACommands) runCommands(_locationACommands);
+ if (_locationACommands) {
+ runCommands(_locationACommands);
+ debugC(1, kDebugLocation, "changeLocation: location acommands run");
+ }
+ debugC(1, kDebugLocation, "changeLocation completed");
+
return;
}
@@ -431,7 +467,7 @@
// THE FINAL PALETTE IS NOT THE SAME AS THE MAIN PALETTE!!!!!!
//
void Parallaction::doLocationEnterTransition() {
-// printf("doLocationEnterTransition()\n");
+ debugC(1, kDebugLocation, "doLocationEnterTransition");
byte v60[PALETTE_SIZE];
if (_localFlags[_currentLocationIndex] & 1) return; // visited
@@ -473,6 +509,8 @@
_vm->_graphics->setPalette(v60);
}
+ debugC(1, kDebugLocation, "doLocationEnterTransition completed");
+
return;
}
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2007-01-26 23:24:12 UTC (rev 25214)
@@ -30,8 +30,8 @@
#include "common/util.h"
#include "common/file.h"
+#include "common/config-manager.h"
-
namespace Parallaction {
// FIXME: remove this
@@ -175,13 +175,15 @@
/* Common::addSpecialDebugLevel(kDebugAnimation, "Animation", "Animations debug level");
Common::addSpecialDebugLevel(kDebugZone, "Zone", "Zones debug level");
Common::addSpecialDebugLevel(kDebugCommand, "Command", "Commands debug level");
- Common::addSpecialDebugLevel(kDebugDialogue, "Dialogue", "Dialogues debug level");
+
Common::addSpecialDebugLevel(kDebugIntro, "Intro", "Intro debug level");
Common::addSpecialDebugLevel(kDebugInventory, "Inventory", "Inventory debug level");
- Common::addSpecialDebugLevel(kDebugLocation, "Location", "Locations debug level");
*/
- Common::addSpecialDebugLevel(kDebugDisk, "Disk", "Disk debug level");
- Common::addSpecialDebugLevel(kDebugWalk, "Walk", "Walk debug level");
+
+ Common::addSpecialDebugLevel(kDebugDialogue, "dialogue", "Dialogues debug level");
+ Common::addSpecialDebugLevel(kDebugLocation, "location", "Location debug level");
+ Common::addSpecialDebugLevel(kDebugDisk, "disk", "Disk debug level");
+ Common::addSpecialDebugLevel(kDebugWalk, "walk", "Walk debug level");
}
@@ -197,21 +199,52 @@
GUIErrorMessage("No valid games were found in the specified directory.");
return -1;
}
+/*
+ strcpy(_location, "taxint");
+ strcpy(_characterName, "dough");
+ strcpy(_languageDir, "it/");
+ _skipMenu = true;
+*/
+ _engineFlags = 0;
+/*
+ if (ConfMan.hasKey("boot_param")) {
+ Common::String bootp = ConfMan.get("boot_param");
-// strcpy(_location, "night");
-// strcpy(_characterName, "drki");
-// strcpy(_languageDir, "it/");
-// _skipMenu = true;
+ char argv[3][30];
+ char* d = argv[0];
+ uint16 j = 0;
+ for (uint16 i = 0; i < bootp.size(); i++) {
+ if (bootp[i] == '.') {
+ j++;
+ d = argv[j];
+ continue;
+ }
- _engineFlags = 0;
+ *d++ = bootp[i];
+ }
- strcpy(_characterName, "dough");
- memset(_locationNames, 0, 120*32);
- _numLocations = 0;
+ if (j < 3) {
+ GUIErrorMessage("Not enough parameters for Nippon Safes Inc.");
+ return -2;
+ }
+ argv[2][2] = '/';
+ argv[2][3] = '\0';
+ strcpy(_location, argv[0]);
+ strcpy(_characterName, argv[1]);
+ strcpy(_languageDir, argv[2]);
+ _skipMenu = true;
+ } else {*/
+ strcpy(_characterName, "dough");
+/* }
+*/
+
+ memset(_locationNames, 0, 120*32);
+ _numLocations = 0;
+
_yourself._zone.pos._position._x = 150;
_yourself._zone.pos._position._y = 100;
initInventory();
@@ -904,13 +937,13 @@
}
void runJobs() {
-// printf("runJobs...START\n");
+ debugC(1, kDebugLocation, "runJobs");
if (_engineFlags & kEnginePauseJobs) return;
Job *j = (Job*)_jobs._node._next;
while (j) {
-// printf("Job run %s\n", _jobDescriptions[j->_tag]);
+ debugC(1, kDebugLocation, "runJobs: %i", j->_tag);
(*j->_fn)(j->_parm, j);
Job *v4 = (Job*)j->_node._next;
@@ -920,7 +953,7 @@
j = v4;
}
-// printf("runJobs...DONE\n");
+ debugC(1, kDebugLocation, "runJobs completed");
return;}
Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp 2007-01-26 23:21:04 UTC (rev 25213)
+++ scummvm/trunk/engines/parallaction/zone.cpp 2007-01-26 23:24:12 UTC (rev 25214)
@@ -53,7 +53,7 @@
void Parallaction::parseZone(ArchivedFile *file, Node *list, char *name) {
-// printf("parseZone(%s)\n", name);
+// printf("parseZone(%s)", name);
if (findZone(name)) {
while (scumm_stricmp(_tokens[0], "endzone")) {
@@ -72,7 +72,7 @@
parseFillBuffers();
while (scumm_stricmp(_tokens[0], "endzone")) {
-// printf("token[0] = %s\n", _tokens[0]);
+// printf("token[0] = %s", _tokens[0]);
if (!scumm_stricmp(_tokens[0], "limits")) {
z->_limits._left = atoi(_tokens[1]);
@@ -99,7 +99,7 @@
z->_commands = parseCommands(file);
}
if (!scumm_stricmp(_tokens[0], "label")) {
-// printf("label: %s\n", _tokens[1]);
+// printf("label: %s", _tokens[1]);
_vm->_graphics->makeCnvFromString(&z->_label, _tokens[1]);
}
if (!scumm_stricmp(_tokens[0], "flags")) {
@@ -194,7 +194,7 @@
void Parallaction::parseZoneTypeBlock(ArchivedFile *file, Zone *z) {
-// printf("parseZoneTypeBlock()\n");
+// printf("parseZoneTypeBlock()");
ZoneTypeData *u = &z->u;
@@ -233,7 +233,7 @@
char vC8[PATH_LEN];
-// printf("type = %x\n", z->_type);
+// printf("type = %x", z->_type);
do {
@@ -261,7 +261,7 @@
}
if (!scumm_stricmp(_tokens[0], "file")) {
-// printf("file: '%s'\n", _tokens[0]);
+// printf("file: '%s'", _tokens[0]);
Cnv *doorcnv = &u->door->_cnv;
strcpy(vC8, _tokens[1]);
@@ -269,7 +269,7 @@
StaticCnv vE0;
_vm->_graphics->loadCnv(vC8, doorcnv);
-// printf("door width: %i, height: %i\n", doorcnv->_width, doorcnv->_height );
+// printf("door width: %i, height: %i", doorcnv->_width, doorcnv->_height );
vE0._width = doorcnv->_width;
vE0._height = doorcnv->_height;
@@ -332,7 +332,7 @@
case kZoneSpeak: // speak Zone init
if (!scumm_stricmp(_tokens[0], "file")) {
strcpy(u->speak->_name, _tokens[1]);
-// printf("speak file name: %s\n", u.speak._name);
+// printf("speak file name: %s", u.speak._name);
}
if (!scumm_stricmp(_tokens[0], "Dialogue")) {
u->speak->_dialogue = parseDialogue(file);
@@ -387,14 +387,14 @@
_vm->_graphics->freeCnv(&Graphics::_font);
-// printf("wait left\n");
+// printf("wait left");
waitUntilLeftClick();
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
_vm->_graphics->freeCnv(&_characterFace);
-// printf("done\n");
+// printf("done");
return;
@@ -452,7 +452,7 @@
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
-// printf("done\n");
+// printf("done");
return;
}
@@ -460,11 +460,11 @@
uint16 runZone(Zone *z) {
-// printf("runZone('%s')\n", z->_name);
+ debugC(1, kDebugLocation, "runZone (%s)", z->_name);
uint16 subtype = z->_type & 0xFFFF;
-// printf("subtype = %x, objecttype = %x\n", subtype, (z->_type & 0xFFFF0000) >> 16);
+ debugC(1, kDebugLocation, "type = %x, object = %x", subtype, (z->_type & 0xFFFF0000) >> 16);
switch(subtype) {
case kZoneExamine:
@@ -500,7 +500,7 @@
}
-// printf("done executing Zone\n");
+ debugC(1, kDebugLocation, "runZone completed");
return 0;
}
@@ -571,7 +571,7 @@
}
void jobDisplayDroppedItem(void *parm, Job *j) {
-// printf("jobDisplayDroppedItem...\n");
+// printf("jobDisplayDroppedItem...");
Zone *z = (Zone*)parm;
@@ -590,7 +590,7 @@
j->_finished = 1;
}
-// printf("done\n");
+// printf("done");
return;
}
@@ -599,14 +599,14 @@
Zone *hitZone(uint32 type, uint16 x, uint16 y) {
-// printf("hitZone(%i, %i, %i)\n", type, x, y);
+// printf("hitZone(%i, %i, %i)", type, x, y);
uint16 _di = y;
uint16 _si = x;
Zone *z = (Zone*)_zones._next;
for (; z; z = (Zone*)z->_node._next) {
-// printf("Zone name: %s\n", z->_name);
+// printf("Zone name: %s", z->_name);
if (z->_flags & kFlagsRemove) continue;
@@ -649,7 +649,7 @@
int16 _a, _b, _c, _d, _e, _f;
for (; a; a = (Animation*)a->_zone._node._next) {
-// printf("Animation name: %s\n", a->_zone._name);
+// printf("Animation name: %s", a->_zone._name);
_a = (a->_zone._flags & kFlagsActive) ? 1 : 0; // _a: active Animation
_e = ((_si >= a->_zone.pos._position._x + a->_cnv._width) || (_si <= a->_zone.pos._position._x)) ? 0 : 1; // _e: horizontal range
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