[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.3,1.4 items.cpp,1.7,1.8 simon.cpp,1.50,1.51 verb.cpp,1.7,1.8
Travis Howell
kirben at users.sourceforge.net
Mon Nov 4 21:42:05 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv22098/simon
Modified Files:
debug.cpp items.cpp simon.cpp verb.cpp
Log Message:
Fix some weird formating
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debug.cpp 22 Oct 2002 13:03:40 -0000 1.3
+++ debug.cpp 5 Nov 2002 05:41:51 -0000 1.4
@@ -414,9 +414,7 @@
{
SubroutineLine *sl;
- fprintf(_dump_file,
- "\n******************************************\n;Subroutine, ID=%d:\nSUB_%d:\n", sub->id,
- sub->id);
+ fprintf(_dump_file, "\n******************************************\n;Subroutine, ID=%d:\nSUB_%d:\n", sub->id, sub->id);
sl = (SubroutineLine *)((byte *)sub + sub->first);
for (; (byte *)sl != (byte *)sub; sl = (SubroutineLine *)((byte *)sub + sl->next)) {
dumpSubroutineLine(sl, sub);
@@ -626,9 +624,7 @@
while (--count >= 0) {
int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id);
- dump_vga_script_always(vga +
- READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs),
- id / 100, id);
+ dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), id / 100, id);
p += sizeof(VgaFile1Struct0x6);
}
}
@@ -645,9 +641,7 @@
while (--c >= 0) {
int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->id);
- dump_vga_script_always(vga +
- READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs),
- id / 100, id);
+ dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs), id / 100, id);
b += sizeof(VgaFile1Struct0x8);
}
}
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- items.cpp 5 Nov 2002 02:34:05 -0000 1.7
+++ items.cpp 5 Nov 2002 05:41:51 -0000 1.8
@@ -386,7 +386,7 @@
break;
case 67:{ /* set array 3 and 4 */
- if (_game == GAME_SIMON1WIN || _game == GAME_SIMON2WIN) {
+ if (_game & GAME_WIN) {
uint var = getVarOrByte();
uint string_id = getNextStringID();
uint value = getNextWord();
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- simon.cpp 5 Nov 2002 02:34:05 -0000 1.50
+++ simon.cpp 5 Nov 2002 05:41:51 -0000 1.51
@@ -36,87 +36,87 @@
#endif
static const GameSpecificSettings simon1_settings = {
- 1, /* VGA_DELAY_BASE */
- 1576 / 4, /* TABLE_INDEX_BASE */
- 1460 / 4, /* TEXT_INDEX_BASE */
- 1700 / 4, /* NUM_GAME_OFFSETS */
- 64, /* NUM_VIDEO_OP_CODES */
- 1000000, /* VGA_MEM_SIZE */
- 50000, /* TABLES_MEM_SIZE */
- 3624, /* NUM_VOICE_RESOURCES */
- 141, /* NUM_EFFECT_RESOURCES */
- 1316 / 4, /* MUSIC_INDEX_BASE */
- 0, /* SOUND_INDEX_BASE */
+ 1, /* VGA_DELAY_BASE */
+ 1576 / 4, /* TABLE_INDEX_BASE */
+ 1460 / 4, /* TEXT_INDEX_BASE */
+ 1700 / 4, /* NUM_GAME_OFFSETS */
+ 64, /* NUM_VIDEO_OP_CODES */
+ 1000000, /* VGA_MEM_SIZE */
+ 50000, /* TABLES_MEM_SIZE */
+ 3624, /* NUM_VOICE_RESOURCES */
+ 141, /* NUM_EFFECT_RESOURCES */
+ 1316 / 4, /* MUSIC_INDEX_BASE */
+ 0, /* SOUND_INDEX_BASE */
"SIMON.GME", /* gme_filename */
"SIMON.WAV", /* wav_filename */
"SIMON.VOC", /* voc_filename */
"SIMON.MP3", /* mp3_filename */
"EFFECTS.VOC", /* voc_effects_filename */
"EFFECTS.MP3", /* mp3_effects_filename */
- "GAMEPC", /* gamepc_filename */
+ "GAMEPC", /* gamepc_filename */
};
static const GameSpecificSettings simon1demo_settings = {
- 1, /* VGA_DELAY_BASE */
- 1576 / 4, /* TABLE_INDEX_BASE */
- 1460 / 4, /* TEXT_INDEX_BASE */
- 1700 / 4, /* NUM_GAME_OFFSETS */
- 64, /* NUM_VIDEO_OP_CODES */
- 1000000, /* VGA_MEM_SIZE */
- 50000, /* TABLES_MEM_SIZE */
- 3624, /* NUM_VOICE_RESOURCES */
- 141, /* NUM_EFFECT_RESOURCES */
- 1316 / 4, /* MUSIC_INDEX_BASE */
- 0, /* SOUND_INDEX_BASE */
- "", /* gme_filename */
- "", /* wav_filename */
- "", /* voc_filename */
- "", /* mp3_filename */
- "", /* voc_effects_filename */
- "", /* mp3_effects_filename */
- "GDEMO", /* gamepc_filename */
+ 1, /* VGA_DELAY_BASE */
+ 1576 / 4, /* TABLE_INDEX_BASE */
+ 1460 / 4, /* TEXT_INDEX_BASE */
+ 1700 / 4, /* NUM_GAME_OFFSETS */
+ 64, /* NUM_VIDEO_OP_CODES */
+ 1000000, /* VGA_MEM_SIZE */
+ 50000, /* TABLES_MEM_SIZE */
+ 3624, /* NUM_VOICE_RESOURCES */
+ 141, /* NUM_EFFECT_RESOURCES */
+ 1316 / 4, /* MUSIC_INDEX_BASE */
+ 0, /* SOUND_INDEX_BASE */
+ "", /* gme_filename */
+ "", /* wav_filename */
+ "", /* voc_filename */
+ "", /* mp3_filename */
+ "", /* voc_effects_filename */
+ "", /* mp3_effects_filename */
+ "GDEMO", /* gamepc_filename */
};
static const GameSpecificSettings simon2win_settings = {
- 5, /* VGA_DELAY_BASE */
- 1580 / 4, /* TABLE_INDEX_BASE */
- 1500 / 4, /* TEXT_INDEX_BASE */
- 2116 / 4, /* NUM_GAME_OFFSETS */
- 75, /* NUM_VIDEO_OP_CODES */
- 2000000, /* VGA_MEM_SIZE */
- 100000, /* TABLES_MEM_SIZE */
- 12256, /* NUM_VOICE_RESOURCES */
- 0,
- 1128 / 4, /* MUSIC_INDEX_BASE */
- 1660 / 4, /* SOUND_INDEX_BASE */
+ 5, /* VGA_DELAY_BASE */
+ 1580 / 4, /* TABLE_INDEX_BASE */
+ 1500 / 4, /* TEXT_INDEX_BASE */
+ 2116 / 4, /* NUM_GAME_OFFSETS */
+ 75, /* NUM_VIDEO_OP_CODES */
+ 2000000, /* VGA_MEM_SIZE */
+ 100000, /* TABLES_MEM_SIZE */
+ 12256, /* NUM_VOICE_RESOURCES */
+ 0, /* NUM_EFFECT_RESOURCES */
+ 1128 / 4, /* MUSIC_INDEX_BASE */
+ 1660 / 4, /* SOUND_INDEX_BASE */
"SIMON2.GME", /* gme_filename */
"SIMON2.WAV", /* wav_filename */
"SIMON2.VOC", /* voc_filename */
"SIMON2.MP3", /* mp3_filename */
"", /* voc_effects_filename */
"", /* mp3_effects_filename */
- "GSPTR30", /* gamepc_filename */
+ "GSPTR30", /* gamepc_filename */
};
static const GameSpecificSettings simon2dos_settings = {
- 5, /* VGA_DELAY_BASE */
- 1580 / 4, /* TABLE_INDEX_BASE */
- 1500 / 4, /* TEXT_INDEX_BASE */
- 2116 / 4, /* NUM_GAME_OFFSETS */
- 75, /* NUM_VIDEO_OP_CODES */
- 2000000, /* VGA_MEM_SIZE */
- 100000, /* TABLES_MEM_SIZE */
- 12256, /* NUM_VOICE_RESOURCES */
- 0,
- 1128 / 4, /* MUSIC_INDEX_BASE */
- 1660 / 4, /* SOUND_INDEX_BASE */
+ 5, /* VGA_DELAY_BASE */
+ 1580 / 4, /* TABLE_INDEX_BASE */
+ 1500 / 4, /* TEXT_INDEX_BASE */
+ 2116 / 4, /* NUM_GAME_OFFSETS */
+ 75, /* NUM_VIDEO_OP_CODES */
+ 2000000, /* VGA_MEM_SIZE */
+ 100000, /* TABLES_MEM_SIZE */
+ 12256, /* NUM_VOICE_RESOURCES */
+ 0, /* NUM_EFFECT_RESOURCES */
+ 1128 / 4, /* MUSIC_INDEX_BASE */
+ 1660 / 4, /* SOUND_INDEX_BASE */
"SIMON2.GME", /* gme_filename */
"", /* wav_filename */
"", /* voc_filename */
"", /* mp3_filename */
"", /* voc_effects_filename */
"", /* mp3_effects_filename */
- "GAME32", /* gamepc_filename */
+ "GAME32", /* gamepc_filename */
};
@@ -3585,9 +3585,7 @@
//dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
- add_vga_timer(gss->VGA_DELAY_BASE,
- pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs),
- vga_struct_id, vga_res);
+ add_vga_timer(gss->VGA_DELAY_BASE, pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), vga_struct_id, vga_res);
break;
}
p += sizeof(VgaFile1Struct0x6);
@@ -3648,8 +3646,7 @@
}
}
-void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint threeval_a,
- int threeval_b, uint width)
+void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint threeval_a, int threeval_b, uint width)
{
char print_str_buf[0x140];
char *char_buf;
@@ -3659,7 +3656,8 @@
uint m, n;
uint height;
- if (num_1 >= 100) // FIXME: Simon1 Mine - Fix text for dwarf song
+ // FIXME: Simon1 Mine - Fix text for dwarf song
+ if (num_1 >= 100)
num_1 -= 100;
char_buf = print_str_buf;
Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- verb.cpp 5 Nov 2002 02:34:05 -0000 1.7
+++ verb.cpp 5 Nov 2002 05:41:52 -0000 1.8
@@ -196,8 +196,7 @@
return (ha->flags & 0x40) == 0;
}
-void SimonState::addNewHitArea(int id, int x, int y, int width, int height,
- int flags, int unk3, Item *item_ptr)
+void SimonState::addNewHitArea(int id, int x, int y, int width, int height, int flags, int unk3, Item *item_ptr)
{
HitArea *ha;
More information about the Scummvm-git-logs
mailing list