[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.268,1.269 simon.h,1.84,1.85 vga.cpp,1.74,1.75
Travis Howell
kirben at users.sourceforge.net
Wed Jul 30 03:06:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv8307/simon
Modified Files:
simon.cpp simon.h vga.cpp
Log Message:
Small cleanup
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- simon.cpp 30 Jul 2003 09:36:48 -0000 1.268
+++ simon.cpp 30 Jul 2003 10:05:09 -0000 1.269
@@ -424,7 +424,6 @@
_dump_file = 0;
- _number_of_savegames = 0;
_saveload_row_curpos = 0;
_num_savegame_rows = 0;
_savedialog_flag = false;
@@ -2607,7 +2606,7 @@
void SimonEngine::save_or_load_dialog(bool load) {
time_t save_time;
- int num = _number_of_savegames;
+ int number_of_savegames;
int i;
int unk132_result;
FillOrCopyStruct *fcs;
@@ -2622,18 +2621,18 @@
_copy_partial_mode = 1;
- _number_of_savegames = num = count_savegames();
+ number_of_savegames = count_savegames();
if (!load)
- num++;
- num -= 6;
- if (num < 0)
- num = 0;
- num++;
- _num_savegame_rows = num;
+ number_of_savegames++;
+ number_of_savegames -= 6;
+ if (number_of_savegames < 0)
+ number_of_savegames = 0;
+ number_of_savegames++;
+ _num_savegame_rows = number_of_savegames;
_saveload_row_curpos = 1;
if (!load)
- _saveload_row_curpos = num;
+ _saveload_row_curpos = number_of_savegames;
_saveload_flag = false;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- simon.h 30 Jul 2003 09:36:48 -0000 1.84
+++ simon.h 30 Jul 2003 10:05:09 -0000 1.85
@@ -334,8 +334,6 @@
FILE *_dump_file;
- int _number_of_savegames;
-
int _saveload_row_curpos;
int _num_savegame_rows;
bool _savedialog_flag;
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- vga.cpp 30 Jul 2003 09:36:48 -0000 1.74
+++ vga.cpp 30 Jul 2003 10:05:09 -0000 1.75
@@ -673,8 +673,6 @@
state.depack_src = vc_10_depack_swap(state.depack_src, width, height);
} else if (state.e & 1) {
state.depack_src = vc_10_no_depack_swap(state.depack_src, width, height);
-// debug(5,"vc_10_no_depack_swap unimpl");
-// state.depack_src = vc_10_depack_swap(state.depack_src, width, height);
}
vlut = &_video_windows[_video_palette_mode * 4];
More information about the Scummvm-git-logs
mailing list