[Scummvm-cvs-logs] SF.net SVN: scummvm:[41568] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jun 16 01:09:23 CEST 2009
Revision: 41568
http://scummvm.svn.sourceforge.net/scummvm/?rev=41568&view=rev
Author: drmccoy
Date: 2009-06-15 23:09:23 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Using the TYPE_ enum where applicable
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter.cpp
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/inter_v6.cpp
Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:09:04 UTC (rev 41567)
+++ scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:09:23 UTC (rev 41568)
@@ -99,16 +99,16 @@
return type;
switch (type) {
- case 20:
+ case TYPE_IMM_INT16:
*pRes = _vm->_global->_inter_resVal;
break;
- case 22:
- case 23:
+ case TYPE_IMM_STR:
+ case GOB_FALSE:
*pRes = 0;
break;
- case 24:
+ case GOB_TRUE:
*pRes = 1;
break;
}
@@ -122,7 +122,8 @@
_vm->_parse->printExpr(99);
_vm->_parse->parseExpr(99, &type);
- if ((type == 24) || ((type == 20) && _vm->_global->_inter_resVal))
+ if ( (type == GOB_TRUE) ||
+ ((type == TYPE_IMM_INT16) && _vm->_global->_inter_resVal))
return true;
else
return false;
@@ -185,14 +186,14 @@
void Inter::writeVar(uint32 offset, uint16 type, uint32 value) {
switch (type) {
- case 16:
- case 18:
+ case TYPE_VAR_INT8:
+ case TYPE_ARRAY_INT8:
WRITE_VARO_UINT8(offset, value);
break;
- case 17:
- case 24:
- case 27:
+ case TYPE_VAR_INT16:
+ case TYPE_VAR_INT32_AS_INT16:
+ case TYPE_ARRAY_INT16:
WRITE_VARO_UINT16(offset, value);
break;
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:09:04 UTC (rev 41567)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:09:23 UTC (rev 41568)
@@ -1330,14 +1330,14 @@
int16 type = evalExpr(&result);
switch (savedPos[0]) {
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
WRITE_VAR_OFFSET(dest, _vm->_global->_inter_resVal);
break;
- case 25:
- case 28:
- if (type == 20)
+ case TYPE_VAR_STR:
+ case TYPE_ARRAY_STR:
+ if (type == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
@@ -1394,14 +1394,14 @@
if (*_vm->_global->_inter_execPtr != 200) {
_vm->_global->_inter_execPtr++;
switch (*_vm->_global->_inter_execPtr) {
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
sprintf(buf + i, "%d",
VAR_OFFSET(_vm->_parse->parseVarIndex()));
break;
- case 25:
- case 28:
+ case TYPE_VAR_STR:
+ case TYPE_ARRAY_STR:
sprintf(buf + i, "%s",
GET_VARO_STR(_vm->_parse->parseVarIndex()));
break;
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:09:04 UTC (rev 41567)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:09:23 UTC (rev 41568)
@@ -708,13 +708,13 @@
value = _vm->_parse->parseVarIndex();
switch (cmd) {
- case 16:
- case 18:
+ case TYPE_VAR_INT8:
+ case TYPE_ARRAY_INT8:
value = (int8) READ_VARO_UINT8(value);
break;
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
value = READ_VARO_UINT32(value);
break;
@@ -732,7 +732,7 @@
cmd = *_vm->_global->_inter_execPtr;
switch (cmd) {
- case 19:
+ case TYPE_IMM_INT32:
_vm->_global->_inter_execPtr++;
if (!found &&
(value ==
@@ -741,7 +741,7 @@
_vm->_global->_inter_execPtr += 5;
break;
- case 20:
+ case TYPE_IMM_INT16:
_vm->_global->_inter_execPtr++;
if (!found &&
(value ==
@@ -750,7 +750,7 @@
_vm->_global->_inter_execPtr += 3;
break;
- case 21:
+ case TYPE_IMM_INT8:
_vm->_global->_inter_execPtr++;
if (!found && (value == (int8) *_vm->_global->_inter_execPtr))
found = true;
@@ -1604,28 +1604,28 @@
int16 type = evalExpr(&result);
switch (savedPos[0]) {
- case 16:
- case 18:
+ case TYPE_VAR_INT8:
+ case TYPE_ARRAY_INT8:
WRITE_VARO_UINT8(dest + i, _vm->_global->_inter_resVal);
break;
- case 17:
- case 27:
+ case TYPE_VAR_INT16:
+ case TYPE_ARRAY_INT16:
WRITE_VARO_UINT16(dest + i * 2, _vm->_global->_inter_resVal);
break;
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
WRITE_VAR_OFFSET(dest + i * 4, _vm->_global->_inter_resVal);
break;
- case 24:
+ case TYPE_VAR_INT32_AS_INT16:
WRITE_VARO_UINT16(dest + i * 4, _vm->_global->_inter_resVal);
break;
- case 25:
- case 28:
- if (type == 20)
+ case TYPE_VAR_STR:
+ case TYPE_ARRAY_STR:
+ if (type == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
@@ -1665,27 +1665,27 @@
if (*_vm->_global->_inter_execPtr != 200) {
_vm->_global->_inter_execPtr++;
switch (*_vm->_global->_inter_execPtr) {
- case 16:
- case 18:
+ case TYPE_VAR_INT8:
+ case TYPE_ARRAY_INT8:
sprintf(buf + i, "%d",
(int8) READ_VARO_UINT8(_vm->_parse->parseVarIndex()));
break;
- case 17:
- case 24:
- case 27:
+ case TYPE_VAR_INT16:
+ case TYPE_VAR_INT32_AS_INT16:
+ case TYPE_ARRAY_INT16:
sprintf(buf + i, "%d",
(int16) READ_VARO_UINT16(_vm->_parse->parseVarIndex()));
break;
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
sprintf(buf + i, "%d",
VAR_OFFSET(_vm->_parse->parseVarIndex()));
break;
- case 25:
- case 28:
+ case TYPE_VAR_STR:
+ case TYPE_ARRAY_STR:
sprintf(buf + i, "%s",
GET_VARO_STR(_vm->_parse->parseVarIndex()));
break;
Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:09:04 UTC (rev 41567)
+++ scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:09:23 UTC (rev 41568)
@@ -888,28 +888,28 @@
int16 srcType = evalExpr(&result);
switch (destType) {
- case 16:
- case 18:
+ case TYPE_VAR_INT8:
+ case TYPE_ARRAY_INT8:
WRITE_VARO_UINT8(dest + i, _vm->_global->_inter_resVal);
break;
- case 17:
- case 27:
+ case TYPE_VAR_INT16:
+ case TYPE_ARRAY_INT16:
WRITE_VARO_UINT16(dest + i * 2, _vm->_global->_inter_resVal);
break;
- case 23:
- case 26:
+ case TYPE_VAR_INT32:
+ case TYPE_ARRAY_INT32:
WRITE_VAR_OFFSET(dest + i * 4, _vm->_global->_inter_resVal);
break;
- case 24:
+ case TYPE_VAR_INT32_AS_INT16:
WRITE_VARO_UINT16(dest + i * 4, _vm->_global->_inter_resVal);
break;
- case 25:
- case 28:
- if (srcType == 20)
+ case TYPE_VAR_STR:
+ case TYPE_ARRAY_STR:
+ if (srcType == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
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