aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-07-30 10:05:09 +0000
committerTravis Howell2003-07-30 10:05:09 +0000
commitf503013b5a155babf6b4ba6bca9c59d7f5aeb80d (patch)
treee4046b92af95726dc21b33c3f5d92d1e60099850
parent269757dabce941f87afd871c0eab19bb53ce358c (diff)
downloadscummvm-rg350-f503013b5a155babf6b4ba6bca9c59d7f5aeb80d.tar.gz
scummvm-rg350-f503013b5a155babf6b4ba6bca9c59d7f5aeb80d.tar.bz2
scummvm-rg350-f503013b5a155babf6b4ba6bca9c59d7f5aeb80d.zip
Small cleanup
svn-id: r9290
-rw-r--r--simon/simon.cpp19
-rw-r--r--simon/simon.h2
-rw-r--r--simon/vga.cpp2
3 files changed, 9 insertions, 14 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index f5a8f0e8af..e6ac57d70d 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -424,7 +424,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_dump_file = 0;
- _number_of_savegames = 0;
_saveload_row_curpos = 0;
_num_savegame_rows = 0;
_savedialog_flag = false;
@@ -2607,7 +2606,7 @@ void SimonEngine::savegame_dialog(char *buf) {
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 @@ void SimonEngine::save_or_load_dialog(bool load) {
_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;
diff --git a/simon/simon.h b/simon/simon.h
index 234bbe7802..f032fdb3cd 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -334,8 +334,6 @@ protected:
FILE *_dump_file;
- int _number_of_savegames;
-
int _saveload_row_curpos;
int _num_savegame_rows;
bool _savedialog_flag;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 4972fe9c6e..0f616a627b 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -673,8 +673,6 @@ void SimonEngine::vc_10_draw() {
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];