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

Rename var/opcode

Browse source 
Add missing breaks

svn-id: r14747
This commit is contained in:
Travis Howell 2004-08-25 08:49:34 +00:00
parent a8a53b1e54
commit c6a9167362
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/intern.h
View file

@ -679,7 +679,7 @@ protected:
void copyScriptString(byte *dst); void copyScriptString(byte *dst);
/* Version 7 script opcodes */ /* Version 7 script opcodes */
void o72_pushDWordVar(); void o72_pushDWord();
void o72_addMessageToStack(); void o72_addMessageToStack();
void o72_wordArrayRead(); void o72_wordArrayRead();
void o72_wordArrayIndexedRead(); void o72_wordArrayIndexedRead();

15
scumm/script_v72he.cpp
View file

@ -48,7 +48,7 @@ void ScummEngine_v72he::setupOpcodes() {
/* 00 */ /* 00 */
OPCODE(o6_pushByte), OPCODE(o6_pushByte),
OPCODE(o6_pushWord), OPCODE(o6_pushWord),
OPCODE(o72_pushDWordVar), OPCODE(o72_pushDWord),
OPCODE(o6_pushWordVar), OPCODE(o6_pushWordVar),
/* 04 */ /* 04 */
OPCODE(o72_addMessageToStack), OPCODE(o72_addMessageToStack),
@ -485,12 +485,15 @@ void ScummEngine_v72he::writeArray(int array, int idx2, int idx1, int value) {
case kByteArray: case kByteArray:
case kStringArray: case kStringArray:
ah->data[offset] = value; ah->data[offset] = value;
break;
case kIntArray: case kIntArray:
WRITE_LE_UINT16(ah->data + offset * 2, value); WRITE_LE_UINT16(ah->data + offset * 2, value);
break;
case kDwordArray: case kDwordArray:
WRITE_LE_UINT32(ah->data + offset * 4, value); WRITE_LE_UINT32(ah->data + offset * 4, value);
break;
} }
} }
@ -524,7 +527,7 @@ void ScummEngine_v72he::copyScriptString(byte *dst) {
} }
} }
void ScummEngine_v72he::o72_pushDWordVar() { void ScummEngine_v72he::o72_pushDWord() {
int a; int a;
if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) { if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
uint32 oldoffs = _scriptPointer - _scriptOrgPointer; uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
@ -720,7 +723,7 @@ void ScummEngine_v72he::o72_arrayOps() {
switch (subOp) { switch (subOp) {
case 7: // SO_ASSIGN_STRING case 7: // SO_ASSIGN_STRING
array = fetchScriptWord(); array = fetchScriptWord();
ah = defineArray(array, kStringArray, 0, 0, 0, 100); ah = defineArray(array, kStringArray, 0, 0, 0, 256);
copyScriptString(ah->data); copyScriptString(ah->data);
break; break;
case 208: // SO_ASSIGN_INT_LIST case 208: // SO_ASSIGN_INT_LIST
@ -852,11 +855,11 @@ void ScummEngine_v72he::o72_jumpToScript() {
} }
void ScummEngine_v72he::o72_findAllObjects() { void ScummEngine_v72he::o72_findAllObjects() {
int a = pop(); int room = pop();
int i = 1; int i = 1;
if (a != _currentRoom) if (room != _currentRoom)
warning("o72_findAllObjects: current room is not %d", a); warning("o72_findAllObjects: current room is not %d", room);
writeVar(0, 0); writeVar(0, 0);
defineArray(0, kDwordArray, 0, 0, 0, _numLocalObjects + 1); defineArray(0, kDwordArray, 0, 0, 0, _numLocalObjects + 1);
writeArray(0, 0, 0, _numLocalObjects); writeArray(0, 0, 0, _numLocalObjects);