[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.507,2.508 script_v100he.cpp,2.164,2.165 script_v6.cpp,1.442,1.443 script_v6he.cpp,2.159,2.160 script_v72he.cpp,2.299,2.300 script_v7he.cpp,2.161,2.162 script_v8.cpp,2.295,2.296 script_v80he.cpp,2.120,2.121 script_v90he.cpp,2.271,2.272 scumm.h,1.632,1.633 string.cpp,1.294,1.295
kirben
kirben at users.sourceforge.net
Mon Jun 13 00:10:15 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.140,1.141 script.h,1.84,1.85 sfuncs.cpp,1.122,1.123
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.508,2.509 script_v90he.cpp,2.272,2.273
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13349/scumm
Modified Files:
intern.h script_v100he.cpp script_v6.cpp script_v6he.cpp
script_v72he.cpp script_v7he.cpp script_v8.cpp
script_v80he.cpp script_v90he.cpp scumm.h string.cpp
Log Message:
Rename opcode/function
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.507
retrieving revision 2.508
diff -u -d -r2.507 -r2.508
--- intern.h 5 Jun 2005 08:02:49 -0000 2.507
+++ intern.h 13 Jun 2005 07:08:58 -0000 2.508
@@ -678,7 +678,7 @@
void o6_delayMinutes();
void o6_stopSentence();
void o6_printLine();
- void o6_printCursor();
+ void o6_printText();
void o6_printDebug();
void o6_printSystem();
void o6_printActor();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.164
retrieving revision 2.165
diff -u -d -r2.164 -r2.165
--- script_v100he.cpp 5 Jun 2005 08:22:09 -0000 2.164
+++ script_v100he.cpp 13 Jun 2005 07:08:59 -0000 2.165
@@ -152,7 +152,7 @@
OPCODE(o6_printLine),
OPCODE(o6_printSystem),
/* 58 */
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o100_jumpToScriptUnk),
OPCODE(o100_startScriptUnk),
OPCODE(o6_pseudoRoom),
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -d -r1.442 -r1.443
--- script_v6.cpp 11 Jun 2005 15:25:37 -0000 1.442
+++ script_v6.cpp 13 Jun 2005 07:08:59 -0000 1.443
@@ -275,7 +275,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
@@ -2327,7 +2327,7 @@
decodeParseString(0, 0);
}
-void ScummEngine_v6::o6_printCursor() {
+void ScummEngine_v6::o6_printText() {
decodeParseString(1, 0);
}
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.159
retrieving revision 2.160
diff -u -d -r2.159 -r2.160
--- script_v6he.cpp 28 May 2005 08:37:43 -0000 2.159
+++ script_v6he.cpp 13 Jun 2005 07:09:09 -0000 2.160
@@ -294,7 +294,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.299
retrieving revision 2.300
diff -u -d -r2.299 -r2.300
--- script_v72he.cpp 28 May 2005 08:37:43 -0000 2.299
+++ script_v72he.cpp 13 Jun 2005 07:09:09 -0000 2.300
@@ -270,7 +270,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.161
retrieving revision 2.162
diff -u -d -r2.161 -r2.162
--- script_v7he.cpp 4 Jun 2005 07:30:49 -0000 2.161
+++ script_v7he.cpp 13 Jun 2005 07:09:10 -0000 2.162
@@ -268,7 +268,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.295
retrieving revision 2.296
diff -u -d -r2.295 -r2.296
--- script_v8.cpp 11 Jun 2005 15:25:38 -0000 2.295
+++ script_v8.cpp 13 Jun 2005 07:09:10 -0000 2.296
@@ -227,7 +227,7 @@
OPCODE(o6_talkEgo),
OPCODE(o6_printLine),
/* 94 */
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
OPCODE(o8_blastText),
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.120
retrieving revision 2.121
diff -u -d -r2.120 -r2.121
--- script_v80he.cpp 10 Jun 2005 01:43:46 -0000 2.120
+++ script_v80he.cpp 13 Jun 2005 07:09:10 -0000 2.121
@@ -270,7 +270,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.271
retrieving revision 2.272
diff -u -d -r2.271 -r2.272
--- script_v90he.cpp 5 Jun 2005 08:22:09 -0000 2.271
+++ script_v90he.cpp 13 Jun 2005 07:09:10 -0000 2.272
@@ -269,7 +269,7 @@
OPCODE(o6_stopSentence),
/* B4 */
OPCODE(o6_printLine),
- OPCODE(o6_printCursor),
+ OPCODE(o6_printText),
OPCODE(o6_printDebug),
OPCODE(o6_printSystem),
/* B8 */
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -d -r1.632 -r1.633
--- scumm.h 7 Jun 2005 20:45:29 -0000 1.632
+++ scumm.h 13 Jun 2005 07:09:11 -0000 1.633
@@ -1154,7 +1154,7 @@
void CHARSET_1();
void drawString(int a, const byte *msg);
- void unkMessage1(const byte *msg);
+ void debugMessage(const byte *msg);
void showMessageDialog(const byte *msg);
int convertMessageToString(const byte *msg, byte *dst, int dstSize);
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- string.cpp 4 Jun 2005 21:21:18 -0000 1.294
+++ string.cpp 13 Jun 2005 07:09:12 -0000 1.295
@@ -45,7 +45,7 @@
drawString(1, msg);
break;
case 2:
- unkMessage1(msg);
+ debugMessage(msg);
break;
case 3:
showMessageDialog(msg);
@@ -54,11 +54,11 @@
}
-void ScummEngine::unkMessage1(const byte *msg) {
+void ScummEngine::debugMessage(const byte *msg) {
byte buffer[500];
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) {
debug(0, "DEBUG: %s", buffer);
return;
@@ -330,7 +330,7 @@
a->startAnimActor(frme);
break;
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_b = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24);
buffer += 14;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.140,1.141 script.h,1.84,1.85 sfuncs.cpp,1.122,1.123
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.508,2.509 script_v90he.cpp,2.272,2.273
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list