[Scummvm-cvs-logs] SF.net SVN: scummvm: [26072] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sat Mar 10 23:13:48 CET 2007
Revision: 26072
http://scummvm.svn.sourceforge.net/scummvm/?rev=26072&view=rev
Author: peres001
Date: 2007-03-10 14:13:47 -0800 (Sat, 10 Mar 2007)
Log Message:
-----------
some refactoring
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/callables.cpp
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/menu.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/saveload.cpp
scummvm/trunk/engines/parallaction/staticres.cpp
Modified: scummvm/trunk/engines/parallaction/callables.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/callables.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -346,7 +346,7 @@
}
void _c_ridux(void *parm) {
- _vm->changeCharacter("minidino");
+ _vm->changeCharacter(_minidinoName);
return;
}
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -461,9 +461,9 @@
g_system->delayMillis(20);
}
- if ((!scumm_stricmp(_vm->_characterName, "dough") && !scumm_strnicmp(password, "1732461", 7)) ||
- (!scumm_stricmp(_vm->_characterName, "donna") && !scumm_strnicmp(password, "1622", 4)) ||
- (!scumm_stricmp(_vm->_characterName, "dino") && !scumm_strnicmp(password, "179", 3))) {
+ if ((!scumm_stricmp(_vm->_characterName, _doughName) && !scumm_strnicmp(password, "1732461", 7)) ||
+ (!scumm_stricmp(_vm->_characterName, _donnaName) && !scumm_strnicmp(password, "1622", 4)) ||
+ (!scumm_stricmp(_vm->_characterName, _dinoName) && !scumm_strnicmp(password, "179", 3))) {
askPassword = false;
@@ -509,7 +509,7 @@
// that's why this hack (with hardcoded Dino) works
if (!scumm_stricmp(_location, "museum")) {
_vm->_disk->selectArchive("disk1");
- _vm->_disk->loadFrames("dino", &_tempFrames);
+ _vm->_disk->loadFrames(_dinoName, &_tempFrames);
memcpy(&_yourself._cnv, &_tempFrames, sizeof(Cnv));
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -180,10 +180,10 @@
} else {
// character talk
- if (scumm_stricmp(name, "dough") &&
- scumm_stricmp(name, "dino") &&
- scumm_stricmp(name, "donna") &&
- scumm_stricmp(name, "drki")) return;
+ if (scumm_stricmp(name, _doughName) &&
+ scumm_stricmp(name, _dinoName) &&
+ scumm_stricmp(name, _donnaName) &&
+ scumm_stricmp(name, _drkiName)) return;
char v20[PATH_LEN];
char *v24 = const_cast<char*>(name);
@@ -258,10 +258,10 @@
char path[PATH_LEN];
- if (scumm_stricmp(name, "dough") &&
- scumm_stricmp(name, "dino") &&
- scumm_stricmp(name, "donna") &&
- scumm_stricmp(name, "drki")) return;
+ if (scumm_stricmp(name, _doughName) &&
+ scumm_stricmp(name, _dinoName) &&
+ scumm_stricmp(name, _donnaName) &&
+ scumm_stricmp(name, _drkiName)) return;
if (!scumm_strnicmp(name, "mini", 4)) {
name += 4;
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -285,15 +285,8 @@
// printf("changeLocation('%s')", location);
if (_musicData1 != 0) {
- if (!scumm_stricmp(_characterName, "dino"))
- _vm->_midiPlayer->play("dino");
- else if (!scumm_stricmp(_characterName, "donna"))
- _vm->_midiPlayer->play("donna");
- else
- _vm->_midiPlayer->play("nuts");
-
+ selectCharacterMusic(_vm->_characterName);
_musicData1 = 0;
-
debugC(2, kDebugLocation, "changeLocation: started character specific music");
}
Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/menu.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -390,14 +390,13 @@
}
- strcpy(_location, "test");
if (_dino_points > _donna_points && _dino_points > _dough_points) {
- strcat(_location, ".dino");
+ sprintf(_location, "test.%s", _dinoName);
} else {
if (_donna_points > _dino_points && _donna_points > _dough_points) {
- strcat(_location, ".donna");
+ sprintf(_location, "test.%s", _donnaName);
} else {
- strcat(_location, ".dough");
+ sprintf(_location, "test.%s", _doughName);
}
}
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -839,16 +839,29 @@
return;
}
+void Parallaction::selectCharacterMusic(const char *name) {
+ if (!scumm_strnicmp(name, "mini", 4))
+ name+=4;
+ if (!scumm_stricmp(name, _dinoName)) {
+ _midiPlayer->play("dino");
+ } else if (!scumm_stricmp(name, _donnaName)) {
+ _midiPlayer->play("donna");
+ } else {
+ _midiPlayer->play("nuts");
+ }
+ return;
+}
+
void Parallaction::changeCharacter(const char *name) {
// printf("changeCharacter(%s)\n", name);
- uint16 _si = 0;
+ bool miniCharacter = false;
if (!scumm_strnicmp(name, "mini", 4)) {
name+=4;
- _si = 1;
+ miniCharacter = true;
}
char v32[20];
@@ -884,21 +897,14 @@
refreshInventory(name);
- if (scumm_stricmp(name, "night") && scumm_stricmp(name, "intsushi")) {
- if (!scumm_stricmp(name, "dino") || !scumm_stricmp(name, "minidino")) {
- _midiPlayer->play("dino");
- } else if (!scumm_stricmp(name, "donna") || !scumm_stricmp(name, "minidonna")) {
- _midiPlayer->play("donna");
- } else {
- _midiPlayer->play("nuts");
- }
- }
+ if (scumm_stricmp(name, "night") && scumm_stricmp(name, "intsushi"))
+ selectCharacterMusic(name);
}
}
- if (_si == 1) {
+ if (miniCharacter) {
memcpy(&_yourself._cnv, &_miniCharacterFrames, sizeof(Cnv));
} else {
memcpy(&_yourself._cnv, &_tempFrames, sizeof(Cnv));
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-03-10 22:13:47 UTC (rev 26072)
@@ -140,6 +140,15 @@
extern const char *_instructionNames[];
extern const char *_callableNames[];
+extern const char *_dinoName;
+extern const char *_donnaName;
+extern const char *_doughName;
+extern const char *_drkiName;
+extern const char *_minidinoName;
+extern const char *_minidonnaName;
+extern const char *_minidoughName;
+extern const char *_minidrkiName;
+
void waitUntilLeftClick();
void addNode(Node *list, Node *n);
@@ -332,6 +341,8 @@
void loadProgram(Animation *a, char *filename);
void changeLocation(char *location);
+ void selectCharacterMusic(const char *name);
+
};
// FIXME: remove global
Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/saveload.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -119,7 +119,7 @@
}
if (!scumm_stricmp(_vm->_characterName, "minidonnatras")) {
_engineFlags |= kEngineMiniDonna;
- strcpy(_vm->_characterName, "minidonna");
+ strcpy(_vm->_characterName, _minidonnaName);
}
if (_vm->_characterName[0] == 'm') {
Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp 2007-03-10 21:31:59 UTC (rev 26071)
+++ scummvm/trunk/engines/parallaction/staticres.cpp 2007-03-10 22:13:47 UTC (rev 26072)
@@ -227,6 +227,15 @@
{"CLICK MOUSE BUTTON TO START", 0}
};
+const char *_dinoName = "dino";
+const char *_donnaName = "donna";
+const char *_doughName = "dough";
+const char *_drkiName = "drki";
+const char *_minidinoName = "minidino";
+const char *_minidonnaName = "minidonna";
+const char *_minidoughName = "minidough";
+const char *_minidrkiName = "minidrki";
+
} // namespace Parallaction
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