[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.22,1.23 simon.cpp,1.101,1.102 simon.h,1.24,1.25 vga.cpp,1.17,1.18
Travis Howell
kirben at users.sourceforge.net
Fri Nov 29 02:19:02 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/debian changelog.in,1.1,1.2 control,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.h,1.1,1.2 items.cpp,1.23,1.24 simon.cpp,1.102,1.103 simon.h,1.25,1.26 vga.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv14574/simon
Modified Files:
items.cpp simon.cpp simon.h vga.cpp
Log Message:
Rename video opcodes phase one
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- items.cpp 24 Nov 2002 12:53:00 -0000 1.22
+++ items.cpp 29 Nov 2002 10:18:32 -0000 1.23
@@ -1676,7 +1676,7 @@
uint16 b = TO_BE_16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte *)&b;
- vc_60();
+ vc_60_kill_thread();
_lock_word &= ~0x4000;
}
@@ -1689,7 +1689,7 @@
_lock_word |= 0x4000;
_vc_ptr = (byte *)&items;
- vc_60();
+ vc_60_kill_thread();
_lock_word &= ~0x4000;
}
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- simon.cpp 29 Nov 2002 09:09:35 -0000 1.101
+++ simon.cpp 29 Nov 2002 10:18:32 -0000 1.102
@@ -2243,7 +2243,7 @@
void SimonState::o_force_lock()
{
_lock_word |= 0x4000;
- vc_34();
+ vc_34_force_lock();
_lock_word &= ~0x4000;
}
@@ -2513,11 +2513,16 @@
delay(10);
-// if (_timer_1 >= 500) {
-// warning("wait timed out");
-// break;
-// }
-
+ if (_game & GAME_SIMON2)
+ if (_timer_1 > 1000) {
+ warning("wait timed out");
+ break;
+ } else {
+ if (_timer_1 > 500) {
+ warning("wait timed out");
+ break;
+ }
+ }
}
// warning("waiting on %d done", a);
_system->show_mouse(true);
@@ -2563,7 +2568,7 @@
}
_vc_ptr = (byte *)params;
- vc_10();
+ vc_10_draw();
vsp++;
}
@@ -2616,7 +2621,7 @@
VgaSprite *vsp;
VgaPointersEntry *vpe;
byte *vc_ptr_org = _vc_ptr;
- uint16 params[5]; /* parameters to vc_10 */
+ uint16 params[5]; /* parameters to vc_10_draw */
if (_video_var_9 == 2)
_video_var_9 = 1;
@@ -2640,7 +2645,7 @@
params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte *)params;
- vc_10();
+ vc_10_draw();
vsp++;
}
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- simon.h 28 Nov 2002 00:22:24 -0000 1.24
+++ simon.h 29 Nov 2002 10:18:32 -0000 1.25
@@ -578,16 +578,16 @@
void run_vga_script();
// Simon1/Simon2 video script opcodes
- void vc_1();
- void vc_2();
- void vc_3();
- void vc_4();
- void vc_5();
+ void vc_1_dummy_op();
+ void vc_2_call();
+ void vc_3_new_thread();
+ void vc_4_dummy_op();
+ void vc_5_skip_if_neq();
void vc_6_maybe_skip_3_inv();
void vc_7_maybe_skip_3();
void vc_8_maybe_skip_2();
void vc_9_maybe_skip();
- void vc_10();
+ void vc_10_draw();
void vc_11_clear_pathfind_array();
void vc_12_sleep_variable();
void vc_13_offset_x();
@@ -596,24 +596,24 @@
void vc_16_setup_funkystruct();
void vc_17_set_pathfind_item();
void vc_18_jump_rel();
- void vc_19();
- void vc_20();
- void vc_21();
- void vc_22();
+ void vc_19_chain_to_script();
+ void vc_20_set_code_word();
+ void vc_21_jump_if_code_word();
+ void vc_22_set_pal();
void vc_23_set_pri();
void vc_24_set_image_xy();
void vc_25_del_sprite_and_get_out();
- void vc_26();
+ void vc_26_set_window();
void vc_27_reset();
void vc_27_reset_simon1();
void vc_27_reset_simon2();
- void vc_28();
+ void vc_28_dummy_op();
void vc_29_stop_all_sounds();
void vc_30_set_base_delay();
void vc_31_set_palette_mode();
void vc_32_copy_var();
- void vc_33();
- void vc_34();
+ void vc_33_force_unlock();
+ void vc_34_force_lock();
void vc_35();
void vc_36();
void vc_37_sprite_unk3_add();
@@ -638,10 +638,10 @@
void vc_56_no_op();
void vc_57_no_op();
void vc_59();
- void vc_60();
+ void vc_60_kill_thread();
void vc_61_sprite_change();
- void vc_62();
- void vc_63();
+ void vc_62_palette_thing();
+ void vc_63_palette_thing_2();
// Simon2 specific Video Script Opcodes
void vc_64();
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- vga.cpp 29 Nov 2002 09:09:35 -0000 1.17
+++ vga.cpp 29 Nov 2002 10:18:32 -0000 1.18
@@ -31,16 +31,16 @@
// Opcode tables
static const VgaOpcodeProc vga_opcode_table[] = {
NULL,
- &SimonState::vc_1,
- &SimonState::vc_2,
- &SimonState::vc_3,
- &SimonState::vc_4,
- &SimonState::vc_5,
+ &SimonState::vc_1_dummy_op,
+ &SimonState::vc_2_call,
+ &SimonState::vc_3_new_thread,
+ &SimonState::vc_4_dummy_op,
+ &SimonState::vc_5_skip_if_neq,
&SimonState::vc_6_maybe_skip_3_inv,
&SimonState::vc_7_maybe_skip_3,
&SimonState::vc_8_maybe_skip_2,
&SimonState::vc_9_maybe_skip,
- &SimonState::vc_10,
+ &SimonState::vc_10_draw,
&SimonState::vc_11_clear_pathfind_array,
&SimonState::vc_12_sleep_variable,
&SimonState::vc_13_offset_x,
@@ -49,22 +49,22 @@
&SimonState::vc_16_setup_funkystruct,
&SimonState::vc_17_set_pathfind_item,
&SimonState::vc_18_jump_rel,
- &SimonState::vc_19,
- &SimonState::vc_20,
- &SimonState::vc_21,
- &SimonState::vc_22,
+ &SimonState::vc_19_chain_to_script,
+ &SimonState::vc_20_set_code_word,
+ &SimonState::vc_21_jump_if_code_word,
+ &SimonState::vc_22_set_pal,
&SimonState::vc_23_set_pri,
&SimonState::vc_24_set_image_xy,
&SimonState::vc_25_del_sprite_and_get_out,
- &SimonState::vc_26,
+ &SimonState::vc_26_set_window,
&SimonState::vc_27_reset,
- &SimonState::vc_28,
+ &SimonState::vc_28_dummy_op,
&SimonState::vc_29_stop_all_sounds,
&SimonState::vc_30_set_base_delay,
&SimonState::vc_31_set_palette_mode,
&SimonState::vc_32_copy_var,
- &SimonState::vc_33,
- &SimonState::vc_34,
+ &SimonState::vc_33_force_unlock,
+ &SimonState::vc_34_force_lock,
&SimonState::vc_35,
&SimonState::vc_36,
&SimonState::vc_37_sprite_unk3_add,
@@ -90,10 +90,10 @@
&SimonState::vc_57_no_op,
&SimonState::vc_58,
&SimonState::vc_59,
- &SimonState::vc_60,
+ &SimonState::vc_60_kill_thread,
&SimonState::vc_61_sprite_change,
- &SimonState::vc_62,
- &SimonState::vc_63,
+ &SimonState::vc_62_palette_thing,
+ &SimonState::vc_63_palette_thing_2,
&SimonState::vc_64,
&SimonState::vc_65,
&SimonState::vc_66,
@@ -222,13 +222,13 @@
// VGA Script commands
-void SimonState::vc_1()
+void SimonState::vc_1_dummy_op()
{
/* dummy opcode */
_vc_ptr += 6;
}
-void SimonState::vc_2()
+void SimonState::vc_2_call()
{
VgaPointersEntry *vpe;
uint num;
@@ -277,7 +277,7 @@
_vc_ptr = vc_ptr_org;
}
-void SimonState::vc_3()
+void SimonState::vc_3_new_thread()
{
uint16 a, b, c, d, e, f;
uint16 res;
@@ -362,13 +362,13 @@
add_vga_timer(gss->VGA_DELAY_BASE, _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), b, res);
}
-void SimonState::vc_4()
+void SimonState::vc_4_dummy_op()
{
/* dummy opcode */
_vc_ptr += 6;
}
-void SimonState::vc_5()
+void SimonState::vc_5_skip_if_neq()
{
uint var = vc_read_next_word();
uint value = vc_read_next_word();
@@ -593,7 +593,7 @@
}
}
-void SimonState::vc_10()
+void SimonState::vc_10_draw()
{
byte *p2;
uint width, height;
@@ -894,7 +894,7 @@
if (_game & GAME_SIMON2 && state.e & 0x4 && _bit_array[10] & 0x800) {
state.surf_addr = state.surf2_addr;
state.surf_pitch = state.surf2_pitch;
- warning("vc_10: (state.e&0x4)");
+ warning("vc_10_draw: (state.e&0x4)");
}
if (state.e & 0x8) {
@@ -1082,10 +1082,10 @@
}
/* chain to script? */
-void SimonState::vc_19()
+void SimonState::vc_19_chain_to_script()
{
/* XXX: not implemented */
- error("vc_19: chain to script not implemented");
+ error("vc_19_chain_to_script: not implemented");
}
@@ -1105,7 +1105,7 @@
}
/* FIXME: unaligned access */
-void SimonState::vc_20()
+void SimonState::vc_20_set_code_word()
{
uint16 a = vc_read_next_word();
write_16_le(_vc_ptr, a);
@@ -1113,7 +1113,7 @@
}
/* FIXME: unaligned access */
-void SimonState::vc_21()
+void SimonState::vc_21_jump_if_code_word()
{
if (!(_game & GAME_SIMON2)) {
int16 a = vc_read_next_word();
@@ -1136,7 +1136,7 @@
}
}
-void SimonState::vc_22()
+void SimonState::vc_22_set_pal()
{
uint a = vc_read_next_word();
uint b = vc_read_next_word();
@@ -1231,7 +1231,7 @@
_vga_sprite_changed++;
}
-void SimonState::vc_26()
+void SimonState::vc_26_set_window()
{
uint16 *as = &_video_windows[vc_read_next_word() * 4];
as[0] = vc_read_next_word();
@@ -1332,7 +1332,7 @@
vc_27_reset_simon2();
}
-void SimonState::vc_28()
+void SimonState::vc_28_dummy_op()
{
/* dummy opcode */
_vc_ptr += 8;
@@ -1370,7 +1370,7 @@
vc_write_var(vc_read_next_word(), a);
}
-void SimonState::vc_33()
+void SimonState::vc_33_force_unlock()
{
if (_lock_counter != 0) {
_lock_counter = 1;
@@ -1378,7 +1378,7 @@
}
}
-void SimonState::vc_34()
+void SimonState::vc_34_force_lock()
{
lock();
_lock_counter = 200;
@@ -1645,7 +1645,7 @@
void SimonState::vc_56_no_op()
{
- /* No-Op in simon1 */
+ /* no op in simon1 */
if (_game & GAME_SIMON2) {
uint num = vc_read_var_or_word() * _vga_base_delay;
@@ -1750,9 +1750,7 @@
_vc_ptr = vc_org;
}
-
-/* kill thread */
-void SimonState::vc_60()
+void SimonState::vc_60_kill_thread()
{
uint file;
@@ -1778,7 +1776,7 @@
_vga_sprite_changed++;
}
-void SimonState::vc_62()
+void SimonState::vc_62_palette_thing()
{
uint i;
byte *vc_ptr_org = _vc_ptr;
@@ -1787,7 +1785,7 @@
vc_29_stop_all_sounds();
if ((_game & GAME_SIMON2) && (!_video_var_3)) {
- warning("vc_62: music stuff?");
+ warning("vc_62_palette_thing: music stuff?");
}
_video_var_3 = true;
@@ -1804,7 +1802,7 @@
}
if (!(_game & GAME_SIMON2)) {
- uint16 params[5]; /* parameters to vc_10 */
+ uint16 params[5]; /* parameters to vc_10_draw */
VgaSprite *vsp;
VgaPointersEntry *vpe;
@@ -1826,7 +1824,7 @@
params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte *)params;
- vc_10();
+ vc_10_draw();
_video_palette_mode = palmode;
_cur_vga_file_1 = f1;
@@ -1842,7 +1840,7 @@
_vc_ptr = vc_ptr_org;
}
-void SimonState::vc_63()
+void SimonState::vc_63_palette_thing_2()
{
_palette_color_count = 208;
if (_video_palette_mode != 4) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/debian changelog.in,1.1,1.2 control,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.h,1.1,1.2 items.cpp,1.23,1.24 simon.cpp,1.102,1.103 simon.h,1.25,1.26 vga.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list