libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Gave some numerical constants a name. This codebase is a bit of a mess ;) (tons of duplicate code, unnamed constants, etc.)

Browse Source 
svn-id: r39882
This commit is contained in:
Max Horn 2009-04-07 10:41:23 +00:00
parent 8151a1d878
commit 7444665152
5 changed files with 76 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/gob/goblin_v1.cpp
View File

@ -671,6 +671,7 @@ void Goblin_v1::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
_gobPositions[_currentGoblin].y++;
break;
}
if (_currentGoblin == 1) {
if (gobDesc->nextState == 28)
_gobPositions[1].y--;

14
engines/gob/parse.cpp
View File

@ -304,31 +304,31 @@ void Parse::printExpr_internal(char stopToken) {
debugN(5, "-");
break;
case 2:
case OP_ADD:
debugN(5, "+");
break;
case 3:
case OP_SUB:
debugN(5, "-");
break;
case 4:
case OP_BITOR:
debugN(5, "|");
break;
case 5:
case OP_MUL:
debugN(5, "*");
break;
case 6:
case OP_DIV:
debugN(5, "/");
break;
case 7:
case OP_MOD:
debugN(5, "%%");
break;
case 8:
case OP_BITAND:
debugN(5, "&");
break;

10
engines/gob/parse.h
View File

@ -28,6 +28,16 @@
namespace Gob {
enum {
OP_ADD = 2,
OP_SUB = 3,
OP_BITOR = 4,
OP_MUL = 5,
OP_DIV = 6,
OP_MOD = 7,
OP_BITAND = 8
};
class Parse {
public:
void skipExpr(char stopToken);

58
engines/gob/parse_v1.cpp
View File

@ -197,19 +197,19 @@ int16 Parse_v1::parseValExpr(byte stopToken) {
valPtr -= 2;
switch (operPtr[1]) {
case 5:
case OP_MUL:
valPtr[0] *= valPtr[2];
break;
case 6:
case OP_DIV:
valPtr[0] /= valPtr[2];
break;
case 7:
case OP_MOD:
valPtr[0] %= valPtr[2];
break;
case 8:
case OP_BITAND:
valPtr[0] &= valPtr[2];
break;
}
@ -244,19 +244,19 @@ int16 Parse_v1::parseValExpr(byte stopToken) {
operPtr -= 2;
valPtr -= 2;
switch (operPtr[0]) {
case 5:
case OP_MUL:
operPtr[-1] *= operPtr[1];
break;
case 6:
case OP_DIV:
operPtr[-1] /= operPtr[1];
break;
case 7:
case OP_MOD:
operPtr[-1] %= operPtr[1];
break;
case 8:
case OP_BITAND:
operPtr[-1] &= operPtr[1];
break;
}
@ -280,25 +280,25 @@ int16 Parse_v1::parseValExpr(byte stopToken) {
operPtr -= 2;
valPtr -= 2;
switch (operPtr[0]) {
case 2:
case OP_ADD:
values[brackPos] += valPtr[1];
continue;
case 3:
case OP_SUB:
values[brackPos] -= valPtr[1];
continue;
case 4:
case OP_BITOR:
values[brackPos] |= valPtr[1];
continue;
case 5:
case OP_MUL:
valPtr[-1] *= valPtr[1];
continue;
case 6:
case OP_DIV:
valPtr[-1] /= valPtr[1];
continue;
case 7:
case OP_MOD:
valPtr[-1] %= valPtr[1];
continue;
case 8:
case OP_BITAND:
valPtr[-1] &= valPtr[1];
continue;
}
@ -487,28 +487,28 @@ int16 Parse_v1::parseExpr(byte stopToken, byte *arg_2) {
}
break;
case 5:
case OP_MUL:
valPtr[-2] *= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-2] /= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-2] %= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-2] &= valPtr[0];
stkPos -= 2;
operPtr -= 2;
@ -553,27 +553,27 @@ int16 Parse_v1::parseExpr(byte stopToken, byte *arg_2) {
if (stkPos > 2) {
switch (operPtr[-2]) {
case 5:
case OP_MUL:
valPtr[-3] *= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-3] /= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-3] %= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-3] &= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
@ -611,42 +611,42 @@ int16 Parse_v1::parseExpr(byte stopToken, byte *arg_2) {
valPtr -= 2;
continue;
case 3:
case OP_SUB:
values[brackStart] -= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
continue;
case 4:
case OP_BITOR:
values[brackStart] |= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
continue;
case 5:
case OP_MUL:
valPtr[-3] *= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-3] /= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-3] %= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-3] &= valPtr[-1];
stkPos -= 2;
operPtr -= 2;

58
engines/gob/parse_v2.cpp
View File

@ -335,19 +335,19 @@ int16 Parse_v2::parseValExpr(byte stopToken) {
valPtr -= 2;
switch (operPtr[1]) {
case 5:
case OP_MUL:
valPtr[0] *= valPtr[2];
break;
case 6:
case OP_DIV:
valPtr[0] /= valPtr[2];
break;
case 7:
case OP_MOD:
valPtr[0] %= valPtr[2];
break;
case 8:
case OP_BITAND:
valPtr[0] &= valPtr[2];
break;
}
@ -383,19 +383,19 @@ int16 Parse_v2::parseValExpr(byte stopToken) {
operPtr -= 2;
valPtr -= 2;
switch (operPtr[0]) {
case 5:
case OP_MUL:
valPtr[-1] *= valPtr[1];
break;
case 6:
case OP_DIV:
valPtr[-1] /= valPtr[1];
break;
case 7:
case OP_MOD:
valPtr[-1] %= valPtr[1];
break;
case 8:
case OP_BITAND:
valPtr[-1] &= valPtr[1];
break;
}
@ -419,25 +419,25 @@ int16 Parse_v2::parseValExpr(byte stopToken) {
operPtr -= 2;
valPtr -= 2;
switch (operPtr[0]) {
case 2:
case OP_ADD:
values[brackPos] += valPtr[1];
continue;
case 3:
case OP_SUB:
values[brackPos] -= valPtr[1];
continue;
case 4:
case OP_BITOR:
values[brackPos] |= valPtr[1];
continue;
case 5:
case OP_MUL:
valPtr[-1] *= valPtr[1];
continue;
case 6:
case OP_DIV:
valPtr[-1] /= valPtr[1];
continue;
case 7:
case OP_MOD:
valPtr[-1] %= valPtr[1];
continue;
case 8:
case OP_BITAND:
valPtr[-1] &= valPtr[1];
continue;
}
@ -693,28 +693,28 @@ int16 Parse_v2::parseExpr(byte stopToken, byte *arg_2) {
}
break;
case 5:
case OP_MUL:
valPtr[-2] *= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-2] /= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-2] %= valPtr[0];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-2] &= valPtr[0];
stkPos -= 2;
operPtr -= 2;
@ -756,28 +756,28 @@ int16 Parse_v2::parseExpr(byte stopToken, byte *arg_2) {
if (stkPos > 2) {
switch (operPtr[-2]) {
case 5:
case OP_MUL:
valPtr[-3] *= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-3] /= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-3] %= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-3] &= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
@ -815,42 +815,42 @@ int16 Parse_v2::parseExpr(byte stopToken, byte *arg_2) {
valPtr -= 2;
continue;
case 3:
case OP_SUB:
values[brackStart] -= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
continue;
case 4:
case OP_BITOR:
values[brackStart] |= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
continue;
case 5:
case OP_MUL:
valPtr[-3] *= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 6:
case OP_DIV:
valPtr[-3] /= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 7:
case OP_MOD:
valPtr[-3] %= valPtr[-1];
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
break;
case 8:
case OP_BITAND:
valPtr[-3] &= valPtr[-1];
stkPos -= 2;
operPtr -= 2;