Ooops, remove debug leftovers in last commit.

svn-id: r25502
This commit is contained in:
Travis Howell 2007-02-12 00:21:04 +00:00
parent d4a206ec12
commit d8d2c4cd65
3 changed files with 28 additions and 30 deletions

View File

@ -837,26 +837,6 @@ void AGOSEngine::pause() {
}
int AGOSEngine::go() {
if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
(getFeatures() & GF_DEMO)) {
int i;
while(1) {
for (i = 1; i < 4; i++) {
setWindowImageEx(3, 9902 + i);
debug(0, "Displaying image %d", 9902 + i);
delay(1000);
}
for (i = 4; i < 16; i++) {
setWindowImageEx(4, 9902 + i);
debug(0, "Displaying image %d", 9902 + i);
delay(1000);
}
}
}
loadGamePcFile();
addTimeEvent(0, 1);
@ -877,6 +857,26 @@ int AGOSEngine::go() {
vc34_setMouseOff();
if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
(getFeatures() & GF_DEMO)) {
int i;
while(1) {
for (i = 1; i < 4; i++) {
setWindowImageEx(3, 9902 + i);
debug(0, "Displaying image %d", 9902 + i);
delay(1000);
}
for (i = 4; i < 16; i++) {
setWindowImageEx(4, 9902 + i);
debug(0, "Displaying image %d", 9902 + i);
delay(1000);
}
}
}
if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
loadMusic(0);
}
@ -887,11 +887,9 @@ int AGOSEngine::go() {
_moviePlay->play();
}
//runSubroutine101();
runSubroutine101();
permitInput();
setWindowImageEx(3, 911);
while (1) {
waitForInput();
handleVerbClicked(_verbHitArea);

View File

@ -680,10 +680,12 @@ void AGOSEngine::loadVGAVideoFile(uint id, uint type) {
if (getPlatform() == Common::kPlatformAcorn) {
sprintf(filename, "%.3d%d.DAT", id, type);
} else if (getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) {
//if (getFeatures() & GF_TALKIE) {
sprintf(filename, "%.2d%d.out", id, type);
/* } else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
if (id == 20)
if (getFeatures() & GF_TALKIE) {
sprintf(filename, "%.3d%d.out", id, type);
} else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
if (getPlatform() == Common::kPlatformAtariST)
sprintf(filename, "%.2d%d.out", id, type);
else if (id == 20)
sprintf(filename, "D%d.out", type);
else if (id == 26)
sprintf(filename, "J%d.out", type);
@ -699,7 +701,7 @@ void AGOSEngine::loadVGAVideoFile(uint id, uint type) {
sprintf(filename, "%.2d%d.pkd", id, type);
} else {
sprintf(filename, "%.3d%d.pkd", id, type);
} */
}
} else {
if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
sprintf(filename, "%.2d%d.VGA", id, type);

View File

@ -483,8 +483,6 @@ Subroutine *AGOSEngine::createSubroutine(uint id) {
SubroutineLine *AGOSEngine::createSubroutineLine(Subroutine *sub, int where) {
SubroutineLine *sl, *cur_sl = NULL, *last_sl = NULL;
printf("sub->id %d\n", sub->id);
if (sub->id == 0)
sl = (SubroutineLine *)allocateTable(SUBROUTINE_LINE_BIG_SIZE);
else