From 2a35194fba6cc2c8011f09901d1576321a2a32b5 Mon Sep 17 00:00:00 2001 From: giantpune Date: Thu, 18 Jun 2009 08:37:24 +0000 Subject: [PATCH] Added sitting for the screensaver. new images from the steering wheel. --- gui.pnproj | 2 +- source/images/wheel.png | Bin 2530 -> 2573 bytes source/images/wheelR.png | Bin 2326 -> 2421 bytes source/menu.cpp | 36 ++++++++++++++++++++++++++++++++--- source/settings/Settings.cpp | 19 ++++++++++++++++-- source/settings/cfg.c | 9 +++++++++ source/settings/cfg.h | 11 +++++++++++ 7 files changed, 71 insertions(+), 6 deletions(-) diff --git a/gui.pnproj b/gui.pnproj index 64f4f4b2..a175a35e 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/images/wheel.png b/source/images/wheel.png index ba5597e90139cfe835898e61d280f7f29d0b3bd4..495ac127df1e9351e2cba0d62d10f1a0affe9053 100644 GIT binary patch delta 2563 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 diff --git a/source/images/wheelR.png b/source/images/wheelR.png index 041bcf1440f8d1c8c1318b723c179f4267166c50..9cc004c579148d5062f3ab8d54027fc0926c92e0 100644 GIT binary patch delta 2411 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 settings_rumble_max) Settings.rumble = 0; //RUMBLE + if(Settings.screensaver >= settings_screensaver_max) + Settings.screensaver = 0; //RUMBLE if ( Settings.unicodefix > 3 ) Settings.unicodefix = 0; if(Settings.titlesOverride >= 2) @@ -565,6 +568,14 @@ int MenuSettings() if (Settings.titlesOverride == 0) options2.SetValue(10,"%s",LANGUAGE.OFF); else if (Settings.titlesOverride == 1) options2.SetValue(10,"%s",LANGUAGE.ON); + if (Settings.screensaver == 0) options2.SetValue(11,"%s",LANGUAGE.OFF); + else if (Settings.screensaver == 1) options2.SetValue(11,"3 min"); + else if (Settings.screensaver == 2) options2.SetValue(11,"5 min"); + else if (Settings.screensaver == 3) options2.SetValue(11,"10 min"); + else if (Settings.screensaver == 4) options2.SetValue(11,"20 min"); + else if (Settings.screensaver == 5) options2.SetValue(11,"30 min"); + else if (Settings.screensaver == 6) options2.SetValue(11,"1 hour"); + if(backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); @@ -680,7 +691,11 @@ int MenuSettings() //__Menu_GetEntries(); //ResumeGui(); break; - } + case 11: + Settings.screensaver++; + break; + + } } optionBrowser2.SetEffect(EFFECT_FADE, -20); while(optionBrowser2.GetEffect() > 0) usleep(50); diff --git a/source/settings/cfg.c b/source/settings/cfg.c index 64faacb8..ff668b54 100644 --- a/source/settings/cfg.c +++ b/source/settings/cfg.c @@ -330,6 +330,7 @@ void Global_Default(void) Settings.wiilight = 1; Settings.patchcountrystrings = 0; Settings.titlesOverride = 0; + Settings.screensaver = 3; Settings.error002 = 0; } @@ -981,6 +982,13 @@ void global_cfg_set(char *name, char *val) } return; } + else if (strcmp(name, "screensaver") == 0) { + int i; + if (sscanf(val, "%d", &i) == 1) { + Settings.screensaver = i; + } + return; + } cfg_bool("godmode", &Settings.godmode); @@ -1215,6 +1223,7 @@ bool cfg_save_global()// save global settings fprintf(f, "Cheatcodespath = %s\n ", Settings.Cheatcodespath); fprintf(f, "titlesOverride = %d\n ", Settings.titlesOverride); fprintf(f, "patchcountrystrings = %d\n ", Settings.patchcountrystrings); + fprintf(f, "screensaver = %d\n ", Settings.screensaver); fprintf(f, "error002 = %d\n ", Settings.error002); fclose(f); return true; diff --git a/source/settings/cfg.h b/source/settings/cfg.h index 275f7d8e..47ef1ea0 100644 --- a/source/settings/cfg.h +++ b/source/settings/cfg.h @@ -272,6 +272,16 @@ enum { settings_tooltips_max // always the last entry }; +enum { + min3=1, + min5, + min10, + min20, + min30, + min60, + settings_screensaver_max // always the last entry +}; + enum { no=0, yes, @@ -323,6 +333,7 @@ struct SSettings { int wiilight; int gameDisplay; int patchcountrystrings; + int screensaver; short godmode; char covers_path[100]; char theme_path[100];