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

some changes in v2 variables

Browse source 
svn-id: r7052
This commit is contained in:
Paweł Kołodziejski 2003-04-21 10:20:12 +00:00
parent 39aa43dc83
commit d7deee507a
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/intern.h
View file

@ -194,6 +194,9 @@ protected:
virtual const char *getOpcodeDesc(int i); virtual const char *getOpcodeDesc(int i);
virtual void getResultPos(); virtual void getResultPos();
virtual void getResultPosDirect(); virtual void getResultPosDirect();
virtual int getVar();
virtual int getVarOrDirectByte(byte mask);
virtual int getVarOrDirectWord(byte mask);
virtual void ifStateCommon(byte type); virtual void ifStateCommon(byte type);
virtual void ifNotStateCommon(byte type); virtual void ifNotStateCommon(byte type);
virtual void setStateCommon(byte type); virtual void setStateCommon(byte type);

25
scumm/script_v2.cpp
View file

@ -366,6 +366,25 @@ const char *Scumm_v2::getOpcodeDesc(int i) {
return _opcodesV2[i].desc; return _opcodesV2[i].desc;
} }
int Scumm_v2::getVar() {
int var_id = fetchScriptByte();
if ((var_id >= 14) && (var_id <= 16))
return _vars[_vars[var_id]];
return _vars[var_id];
}
int Scumm_v2::getVarOrDirectByte(byte mask) {
if (_opcode & mask)
return getVar();
return fetchScriptByte();
}
int Scumm_v2::getVarOrDirectWord(byte mask) {
if (_opcode & mask)
return getVar();
return fetchScriptWord();
}
void Scumm_v2::setStateCommon(byte type) { void Scumm_v2::setStateCommon(byte type) {
int obj = getVarOrDirectWord(0x80); int obj = getVarOrDirectWord(0x80);
putState(obj, getState(obj) | type); putState(obj, getState(obj) | type);
@ -473,9 +492,9 @@ void Scumm_v2::o2_setBitVar() {
bit_var >>= 4; bit_var >>= 4;
if (getVarOrDirectByte(0x80)) if (getVarOrDirectByte(0x80))
_bitVars[bit_var >> 3] |= (1 << bit_offset); _vars[bit_var] |= (1 << bit_offset);
else else
_bitVars[bit_var >> 3] &= ~(1 << bit_offset); _vars[bit_var] &= ~(1 << bit_offset);
} }
void Scumm_v2::o2_getBitVar() { void Scumm_v2::o2_getBitVar() {
@ -488,7 +507,7 @@ void Scumm_v2::o2_getBitVar() {
int bit_offset = bit_var & 0x0f; int bit_offset = bit_var & 0x0f;
bit_var >>= 4; bit_var >>= 4;
_vars[_resultVarNumber] = (_bitVars[bit_var >> 3] & (1 << bit_offset)) ? 1 : 0; _vars[_resultVarNumber] = (_vars[bit_var] & (1 << bit_offset)) ? 1 : 0;
} }
void Scumm_v2::ifStateCommon(byte type) { void Scumm_v2::ifStateCommon(byte type) {