[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.479,2.480 script_v100he.cpp,2.149,2.150 script_v80he.cpp,2.106,2.107 script_v90he.cpp,2.251,2.252
kirben
kirben at users.sourceforge.net
Mon May 9 22:36:33 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.320,1.321 resource_v7he.cpp,1.38,1.39 scumm-md5.h,2.71,2.72 scumm.cpp,1.498,1.499
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.480,2.481 script_v72he.cpp,2.285,2.286 script_v80he.cpp,2.107,2.108 script_v90he.cpp,2.252,2.253
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2695/scumm
Modified Files:
intern.h script_v100he.cpp script_v80he.cpp script_v90he.cpp
Log Message:
Rename opcode
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.479
retrieving revision 2.480
diff -u -d -r2.479 -r2.480
--- intern.h 9 May 2005 18:26:35 -0000 2.479
+++ intern.h 10 May 2005 05:34:45 -0000 2.480
@@ -985,8 +985,8 @@
void loadImgSpot(int resId, int state, int16 &x, int16 &y);
void loadWizCursor(int resId);
- void unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id);
- void unknownE0Helper(int x, int y, int flags);
+ void drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id);
+ void drawPixel(int x, int y, int flags);
/* HE version 80 script opcodes */
void o80_loadSBNG();
@@ -1000,7 +1000,7 @@
void o80_setState();
void o80_drawBox();
void o80_drawWizPolygon();
- void o80_unknownE0();
+ void o80_drawLine();
void o80_pickVarRandom();
void o80_getResourceSize();
};
@@ -1286,7 +1286,7 @@
void o100_dim2dimArray();
void o100_redim2dimArray();
void o100_dimArray();
- void o100_unknownE0();
+ void o100_drawLine();
void o100_drawObject();
void o100_setSpriteGroupInfo();
void o100_resourceRoutines();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.149
retrieving revision 2.150
diff -u -d -r2.149 -r2.150
--- script_v100he.cpp 9 May 2005 06:10:17 -0000 2.149
+++ script_v100he.cpp 10 May 2005 05:34:48 -0000 2.150
@@ -89,7 +89,7 @@
/* 24 */
OPCODE(o72_drawWizImage),
OPCODE(o80_drawWizPolygon),
- OPCODE(o100_unknownE0),
+ OPCODE(o100_drawLine),
OPCODE(o100_drawObject),
/* 28 */
OPCODE(o6_dup),
@@ -801,7 +801,7 @@
defineArray(fetchScriptWord(), data, 0, 0, 0, pop());
}
-void ScummEngine_v100he::o100_unknownE0() {
+void ScummEngine_v100he::o100_drawLine() {
int id, unk1, unk2, x, x1, y1;
unk2 = pop();
@@ -815,16 +815,16 @@
switch (subOp) {
case 1:
- unknownE0(x1, y1, x, unk1, unk2, 2, id);
+ drawLine(x1, y1, x, unk1, unk2, 2, id);
break;
case 20:
- unknownE0(x1, y1, x, unk1, unk2, 1, id);
+ drawLine(x1, y1, x, unk1, unk2, 1, id);
break;
case 40:
- unknownE0(x1, y1, x, unk1, unk2, 3, id);
+ drawLine(x1, y1, x, unk1, unk2, 3, id);
break;
default:
- error("o100_unknownE0: default case %d", subOp);
+ error("o100_drawLine: default case %d", subOp);
}
}
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.106
retrieving revision 2.107
diff -u -d -r2.106 -r2.107
--- script_v80he.cpp 7 May 2005 07:57:58 -0000 2.106
+++ script_v80he.cpp 10 May 2005 05:34:49 -0000 2.107
@@ -324,7 +324,7 @@
OPCODE(o72_deleteFile),
OPCODE(o72_rename),
/* E0 */
- OPCODE(o80_unknownE0),
+ OPCODE(o80_drawLine),
OPCODE(o72_getPixel),
OPCODE(o60_localizeArrayToScript),
OPCODE(o80_pickVarRandom),
@@ -613,8 +613,8 @@
displayWizImage(&wi);
}
-void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id) {
- debug(0,"unknownE0: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id);
+void ScummEngine_v80he::drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id) {
+ debug(0,"drawLine: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id);
int eax, ebx, ecx, edx, esi;
int var_4, var_8, var_C, y;
@@ -638,7 +638,7 @@
}
if (type == 2) {
- Actor *a = derefActor(id, "unknownE0");
+ Actor *a = derefActor(id, "drawLine");
a->drawActorToBackBuf(x1, y1);
} else if (type == 3) {
WizImage wi;
@@ -649,7 +649,7 @@
wi.state = 0;
displayWizImage(&wi);
} else {
- unknownE0Helper(x1, y1, id);
+ drawPixel(x1, y1, id);
}
x1 = 0;
@@ -701,7 +701,7 @@
continue;
if (type == 2) {
- Actor *a = derefActor(id, "unknownE0");
+ Actor *a = derefActor(id, "drawLine");
a->drawActorToBackBuf(x, y);
} else if (type == 3) {
WizImage wi;
@@ -712,12 +712,12 @@
wi.state = 0;
displayWizImage(&wi);
} else {
- unknownE0Helper(x, y, id);
+ drawPixel(x, y, id);
}
}
}
-void ScummEngine_v80he::unknownE0Helper(int x, int y, int flags) {
+void ScummEngine_v80he::drawPixel(int x, int y, int flags) {
VirtScreen *vs;
if (x < 0 || x > 639)
@@ -744,7 +744,7 @@
}
}
-void ScummEngine_v80he::o80_unknownE0() {
+void ScummEngine_v80he::o80_drawLine() {
int id, unk1, unk2, x, x1, y1;
unk2 = pop();
@@ -758,16 +758,16 @@
switch (subOp) {
case 55:
- unknownE0(x1, y1, x, unk1, unk2, 2, id);
+ drawLine(x1, y1, x, unk1, unk2, 2, id);
break;
case 63:
- unknownE0(x1, y1, x, unk1, unk2, 3, id);
+ drawLine(x1, y1, x, unk1, unk2, 3, id);
break;
case 66:
- unknownE0(x1, y1, x, unk1, unk2, 1, id);
+ drawLine(x1, y1, x, unk1, unk2, 1, id);
break;
default:
- error("o80_unknownE0: default case %d", subOp);
+ error("o80_drawLine: default case %d", subOp);
}
}
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.251
retrieving revision 2.252
diff -u -d -r2.251 -r2.252
--- script_v90he.cpp 10 May 2005 01:01:45 -0000 2.251
+++ script_v90he.cpp 10 May 2005 05:34:50 -0000 2.252
@@ -323,7 +323,7 @@
OPCODE(o72_deleteFile),
OPCODE(o72_rename),
/* E0 */
- OPCODE(o80_unknownE0),
+ OPCODE(o80_drawLine),
OPCODE(o72_getPixel),
OPCODE(o60_localizeArrayToScript),
OPCODE(o80_pickVarRandom),
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.320,1.321 resource_v7he.cpp,1.38,1.39 scumm-md5.h,2.71,2.72 scumm.cpp,1.498,1.499
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.480,2.481 script_v72he.cpp,2.285,2.286 script_v80he.cpp,2.107,2.108 script_v90he.cpp,2.252,2.253
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list