[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.20,1.21 simon.cpp,1.326,1.327
Travis Howell
kirben at users.sourceforge.net
Sat Oct 25 21:08:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv19674/simon
Modified Files:
charset.cpp simon.cpp
Log Message:
Update issues
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- charset.cpp 21 Oct 2003 10:14:42 -0000 1.20
+++ charset.cpp 26 Oct 2003 04:03:51 -0000 1.21
@@ -61,23 +61,23 @@
}
}
-void SimonEngine::render_string(uint vga_struct_id, uint color, uint width, uint height, const char *txt) {
+void SimonEngine::render_string(uint vga_sprite_id, uint color, uint width, uint height, const char *txt) {
VgaPointersEntry *vpe = &_vga_buffer_pointers[2];
byte *src, *dst, *p, *dst_org, chr;
uint count;
- if (vga_struct_id >= 100) {
- vga_struct_id -= 100;
+ if (vga_sprite_id >= 100) {
+ vga_sprite_id -= 100;
vpe++;
}
src = dst = vpe->vgaFile2;
count = 4000;
- if (vga_struct_id == 1)
+ if (vga_sprite_id == 1)
count *= 2;
- p = dst + vga_struct_id * 8;
+ p = dst + vga_sprite_id * 8;
*(uint16 *)(p + 4) = TO_BE_16(height);
*(uint16 *)(p + 6) = TO_BE_16(width);
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- simon.cpp 26 Oct 2003 03:20:13 -0000 1.326
+++ simon.cpp 26 Oct 2003 04:03:51 -0000 1.327
@@ -4015,8 +4015,8 @@
uint m, n;
uint height;
- // FIXME: Simon1dos Dwarf Mine - Fix text for dwarf song
- if (vga_sprite_id >= 100)
+ // FIXME: Shows Dwarf Song subtitles in Dwarf Mine under simon1dos/simon1talkie
+ if ((_game == GAME_SIMON1DOS) && (vga_sprite_id >= 100))
vga_sprite_id -= 100;
char_buf = print_str_buf;
More information about the Scummvm-git-logs
mailing list