thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Turned PARAM_1,2,3 into an enum; minor tweaks

Browse source 
svn-id: r40008
This commit is contained in:
Max Horn 2009-04-19 00:59:50 +00:00
parent 56a31019b7
commit 9655fa831e
4 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/script_v0.cpp
View file

@ -359,10 +359,6 @@ void ScummEngine_v0::setupOpcodes() {
#define SENTENCE_SCRIPT 2 #define SENTENCE_SCRIPT 2
#define PARAM_1 0x80
#define PARAM_2 0x40
#define PARAM_3 0x20
int ScummEngine_v0::getVarOrDirectWord(byte mask) { int ScummEngine_v0::getVarOrDirectWord(byte mask) {
return getVarOrDirectByte(mask); return getVarOrDirectByte(mask);
} }
@ -1037,8 +1033,4 @@ void ScummEngine_v0::resetSentence() {
_activeVerb = 13; _activeVerb = 13;
} }
#undef PARAM_1
#undef PARAM_2
#undef PARAM_3
} // End of namespace Scumm } // End of namespace Scumm

8
engines/scumm/script_v2.cpp
View file

@ -361,10 +361,6 @@ void ScummEngine_v2::setupOpcodes() {
#define SENTENCE_SCRIPT 2 #define SENTENCE_SCRIPT 2
#define PARAM_1 0x80
#define PARAM_2 0x40
#define PARAM_3 0x20
int ScummEngine_v2::getVar() { int ScummEngine_v2::getVar() {
return readVar(fetchScriptByte()); return readVar(fetchScriptByte());
} }
@ -1626,8 +1622,4 @@ void ScummEngine_v2::runInventoryScript(int i) {
redrawV2Inventory(); redrawV2Inventory();
} }
#undef PARAM_1
#undef PARAM_2
#undef PARAM_3
} // End of namespace Scumm } // End of namespace Scumm

14
engines/scumm/script_v5.cpp
View file

@ -362,10 +362,6 @@ void ScummEngine_v5::setupOpcodes() {
OPCODE(0xff, o5_drawBox); OPCODE(0xff, o5_drawBox);
} }
#define PARAM_1 0x80
#define PARAM_2 0x40
#define PARAM_3 0x20
int ScummEngine_v5::getVar() { int ScummEngine_v5::getVar() {
return readVar(fetchScriptWord()); return readVar(fetchScriptWord());
} }
@ -2294,7 +2290,7 @@ void ScummEngine_v5::o5_setVarRange() {
_resultVarNumber++; _resultVarNumber++;
} while (--a); } while (--a);
// Macintosh verison of indy3ega used different interface, so adjust values. // Macintosh version of indy3ega used different interface, so adjust values.
if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) { if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) {
VAR(68) = 0; VAR(68) = 0;
VAR(69) = 0; VAR(69) = 0;
@ -2745,9 +2741,7 @@ void ScummEngine_v5::o5_wait() {
if (_sentenceNum) { if (_sentenceNum) {
if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(VAR(VAR_SENTENCE_SCRIPT))) if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
return; return;
break; } else if (!isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
}
if (!isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
return; return;
break; break;
default: default:
@ -3082,8 +3076,4 @@ void ScummEngine_v5::o5_pickupObjectOld() {
runInventoryScript(1); runInventoryScript(1);
} }
#undef PARAM_1
#undef PARAM_2
#undef PARAM_3
} // End of namespace Scumm } // End of namespace Scumm

6
engines/scumm/scumm_v5.h
View file

@ -44,6 +44,12 @@ protected:
char _saveLoadVarsFilename[256]; char _saveLoadVarsFilename[256];
enum {
PARAM_1 = 0x80,
PARAM_2 = 0x40,
PARAM_3 = 0x20
};
public: public:
ScummEngine_v5(OSystem *syst, const DetectorResult &dr); ScummEngine_v5(OSystem *syst, const DetectorResult &dr);