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

Rename opcode/function

Browse source 
svn-id: r18381
This commit is contained in:
Travis Howell 2005-06-13 07:09:12 +00:00
parent dcbd777596
commit ae7f676667
11 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/intern.h
View file

@ -678,7 +678,7 @@ protected:
void o6_delayMinutes(); void o6_delayMinutes();
void o6_stopSentence(); void o6_stopSentence();
void o6_printLine(); void o6_printLine();
void o6_printCursor(); void o6_printText();
void o6_printDebug(); void o6_printDebug();
void o6_printSystem(); void o6_printSystem();
void o6_printActor(); void o6_printActor();

2
scumm/script_v100he.cpp
View file

@ -152,7 +152,7 @@ void ScummEngine_v100he::setupOpcodes() {
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* 58 */ /* 58 */
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o100_jumpToScriptUnk), OPCODE(o100_jumpToScriptUnk),
OPCODE(o100_startScriptUnk), OPCODE(o100_startScriptUnk),
OPCODE(o6_pseudoRoom), OPCODE(o6_pseudoRoom),

4
scumm/script_v6.cpp
View file

@ -275,7 +275,7 @@ void ScummEngine_v6::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */
@ -2327,7 +2327,7 @@ void ScummEngine_v6::o6_printLine() {
decodeParseString(0, 0); decodeParseString(0, 0);
} }
void ScummEngine_v6::o6_printCursor() { void ScummEngine_v6::o6_printText() {
decodeParseString(1, 0); decodeParseString(1, 0);
} }

2
scumm/script_v6he.cpp
View file

@ -294,7 +294,7 @@ void ScummEngine_v60he::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */

2
scumm/script_v72he.cpp
View file

@ -270,7 +270,7 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */

2
scumm/script_v7he.cpp
View file

@ -268,7 +268,7 @@ void ScummEngine_v70he::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */

2
scumm/script_v8.cpp
View file

@ -227,7 +227,7 @@ void ScummEngine_v8::setupOpcodes() {
OPCODE(o6_talkEgo), OPCODE(o6_talkEgo),
OPCODE(o6_printLine), OPCODE(o6_printLine),
/* 94 */ /* 94 */
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
OPCODE(o8_blastText), OPCODE(o8_blastText),

2
scumm/script_v80he.cpp
View file

@ -270,7 +270,7 @@ void ScummEngine_v80he::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */

2
scumm/script_v90he.cpp
View file

@ -269,7 +269,7 @@ void ScummEngine_v90he::setupOpcodes() {
OPCODE(o6_stopSentence), OPCODE(o6_stopSentence),
/* B4 */ /* B4 */
OPCODE(o6_printLine), OPCODE(o6_printLine),
OPCODE(o6_printCursor), OPCODE(o6_printText),
OPCODE(o6_printDebug), OPCODE(o6_printDebug),
OPCODE(o6_printSystem), OPCODE(o6_printSystem),
/* B8 */ /* B8 */

2
scumm/scumm.h
View file

@ -1154,7 +1154,7 @@ protected:
void CHARSET_1(); void CHARSET_1();
void drawString(int a, const byte *msg); void drawString(int a, const byte *msg);
void unkMessage1(const byte *msg); void debugMessage(const byte *msg);
void showMessageDialog(const byte *msg); void showMessageDialog(const byte *msg);
int convertMessageToString(const byte *msg, byte *dst, int dstSize); int convertMessageToString(const byte *msg, byte *dst, int dstSize);

8
scumm/string.cpp
View file

@ -45,7 +45,7 @@ void ScummEngine::printString(int m, const byte *msg) {
drawString(1, msg); drawString(1, msg);
break; break;
case 2: case 2:
unkMessage1(msg); debugMessage(msg);
break; break;
case 3: case 3:
showMessageDialog(msg); showMessageDialog(msg);
@ -54,11 +54,11 @@ void ScummEngine::printString(int m, const byte *msg) {
} }
void ScummEngine::unkMessage1(const byte *msg) { void ScummEngine::debugMessage(const byte *msg) {
byte buffer[500]; byte buffer[500];
convertMessageToString(msg, buffer, sizeof(buffer)); convertMessageToString(msg, buffer, sizeof(buffer));
// if ((_gameId == GID_CMI) && _debugMode) { // In CMI, unkMessage1 is used for printDebug output // if ((_gameId == GID_CMI) && _debugMode) { // In CMI, debugMessage is used for printDebug output
if ((buffer[0] != 0xFF) && _debugMode) { if ((buffer[0] != 0xFF) && _debugMode) {
debug(0, "DEBUG: %s", buffer); debug(0, "DEBUG: %s", buffer);
return; return;
@ -330,7 +330,7 @@ void ScummEngine::CHARSET_1() {
a->startAnimActor(frme); a->startAnimActor(frme);
break; break;
case 10: case 10:
// Note the similarity to the code in unkMessage1() // Note the similarity to the code in debugMessage()
talk_sound_a = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24); talk_sound_a = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);
talk_sound_b = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24); talk_sound_b = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24);
buffer += 14; buffer += 14;