[Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.126,1.127
kirben
kirben at users.sourceforge.net
Fri May 6 05:30:22 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.118,1.119 simon.cpp,1.492,1.493 simon.h,1.135,1.136 vga.cpp,1.125,1.126 vga.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.h,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28714/simon
Modified Files:
vga.cpp
Log Message:
Ooops
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- vga.cpp 6 May 2005 12:23:18 -0000 1.126
+++ vga.cpp 6 May 2005 12:29:37 -0000 1.127
@@ -1609,7 +1609,7 @@
vfs = _vgaSleepStructs;
while (vfs->ident != 0) {
- if ((_game & GF_SIMON1) || (vfs->sprite_id == _vgaCurSpriteId && vfs->cur_vga_file == _vgaCurFileId)) {
+ if (vfs->sprite_id == _vgaCurSpriteId && ((_game & GF_SIMON1) || vfs->cur_vga_file == _vgaCurFileId)) {
while (vfs->ident != 0) {
memcpy(vfs, vfs + 1, sizeof(VgaSleepStruct));
vfs++;
@@ -1625,7 +1625,7 @@
vte = _vgaTimerList;
while (vte->delay != 0) {
- if ((_game & GF_SIMON1) || (vte->sprite_id == _vgaCurSpriteId && vte->cur_vga_file == _vgaCurFileId)) {
+ if (vte->sprite_id == _vgaCurSpriteId && ((_game & GF_SIMON1) || vte->cur_vga_file == _vgaCurFileId)) {
delete_vga_timer(vte);
break;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.118,1.119 simon.cpp,1.492,1.493 simon.h,1.135,1.136 vga.cpp,1.125,1.126 vga.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.h,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list