[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.96,1.97 vga.cpp,1.83,1.84
Travis Howell
kirben at users.sourceforge.net
Tue Oct 21 04:19:22 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.94,1.95 simon.cpp,1.317,1.318 simon.h,1.92,1.93
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.h,1.30,1.31 graphics.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv25554/simon
Modified Files:
items.cpp vga.cpp
Log Message:
Rename a few vars
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- items.cpp 21 Oct 2003 10:14:42 -0000 1.96
+++ items.cpp 21 Oct 2003 10:34:56 -0000 1.97
@@ -1551,11 +1551,11 @@
}
}
-void SimonEngine::o_play_sound(uint a) {
+void SimonEngine::o_play_sound(uint sound_id) {
if (_game == GAME_SIMON1DOS)
- playSting(a);
+ playSting(sound_id);
else
- _sound->playEffects(a);
+ _sound->playEffects(sound_id);
}
void SimonEngine::o_unk_160(uint a) {
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- vga.cpp 16 Oct 2003 09:41:35 -0000 1.83
+++ vga.cpp 21 Oct 2003 10:34:56 -0000 1.84
@@ -267,7 +267,7 @@
}
void SimonEngine::vc_3_new_sprite() {
- uint16 a, b, c, d, e, f;
+ uint16 a, f, base_color, x, y, vga_struct_id;
uint16 res;
VgaSprite *vsp;
VgaPointersEntry *vpe;
@@ -278,32 +278,32 @@
if (_game & GF_SIMON2) {
f = vc_read_next_word(); /* 0 */
- b = vc_read_next_word(); /* 2 */
+ vga_struct_id = vc_read_next_word(); /* 2 */
} else {
- b = vc_read_next_word(); /* 2 */
- f = b / 100;
+ vga_struct_id = vc_read_next_word(); /* 2 */
+ f = vga_struct_id / 100;
}
- c = vc_read_next_word(); /* 4 */
- d = vc_read_next_word(); /* 6 */
- e = vc_read_next_word(); /* 8 */
+ x = vc_read_next_word(); /* 4 */
+ y = vc_read_next_word(); /* 6 */
+ base_color = vc_read_next_word(); /* 8 */
/* 2nd param ignored with simon1 */
- if (has_vgastruct_with_id(b, f))
+ if (has_vgastruct_with_id(vga_struct_id, f))
return;
vsp = _vga_sprites;
while (vsp->id)
vsp++;
- vsp->base_color = e;
+ vsp->base_color = base_color;
vsp->unk6 = a;
vsp->priority = 0;
vsp->unk4 = 0;
vsp->image = 0;
- vsp->x = c;
- vsp->y = d;
- vsp->id = b;
+ vsp->x = x;
+ vsp->y = y;
+ vsp->id = vga_struct_id;
vsp->unk7 = res = f;
old_file_1 = _cur_vga_file_1;
@@ -324,7 +324,7 @@
p = pp + READ_BE_UINT16(&((VgaFile1Header *) pp)->hdr2_start);
p = pp + READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_table);
- while (READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->id) != b)
+ while (READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->id) != vga_struct_id)
p += sizeof(VgaFile1Struct0x6);
#ifdef DUMP_FILE_NR
@@ -347,9 +347,9 @@
}
#endif
- //dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x6*)p)->script_offs), res, b);
+ //dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x6*)p)->script_offs), res, vga_struct_id);
- add_vga_timer(gss->VGA_DELAY_BASE, _cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->script_offs), b, res);
+ add_vga_timer(gss->VGA_DELAY_BASE, _cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->script_offs), vga_struct_id, res);
_cur_vga_file_1 = old_file_1;
}
@@ -1530,18 +1530,18 @@
}
void SimonEngine::vc_52_play_sound() {
- uint16 a = vc_read_next_word();
+ uint16 sound_id = vc_read_next_word();
if (_game == GAME_SIMON1DOS) {
- playSting(a);
+ playSting(sound_id);
} else if (!(_game & GF_SIMON2)) {
- _sound->playEffects(a);
+ _sound->playEffects(sound_id);
} else {
- if (a >= 0x8000) {
- a = -a;
- _sound->playAmbient(a);
+ if (sound_id >= 0x8000) {
+ sound_id = -sound_id;
+ _sound->playAmbient(sound_id);
} else {
- _sound->playEffects(a);
+ _sound->playEffects(sound_id);
}
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.94,1.95 simon.cpp,1.317,1.318 simon.h,1.92,1.93
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.h,1.30,1.31 graphics.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list