From 70fd45d1d29288113a7e23fe2668346d2a5514e2 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Tue, 10 Jun 2008 01:06:29 +0100
Subject: [PATCH] Add config file to options screen class

---
 src/Options.cpp | 9 ++++++++-
 src/Options.hpp | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Options.cpp b/src/Options.cpp
index da5fa6d..f93bcd5 100644
--- a/src/Options.cpp
+++ b/src/Options.cpp
@@ -29,9 +29,10 @@ Options::Options()
      fadeAlpha(0.0),
      selected(0)
 {
-   Item fullscreen = { "Fullscreen", 0 };
+   Item fullscreen = { "Fullscreen" };
    fullscreen.values.push_back("Yes");
    fullscreen.values.push_back("No");
+   fullscreen.active = (cfile.get_bool("fullscreen") ? 0 : 1);
 
    // TODO: It would be better to query SDL for these values
    Item resolution = { "Resolution", 0 };
@@ -92,6 +93,11 @@ void Options::ProcessMain()
    }
 }
 
+void Options::Apply()
+{
+   
+}
+
 void Options::ProcessFadeOut()
 {
    fadeAlpha -= FADE_SPEED;
@@ -99,6 +105,7 @@ void Options::ProcessFadeOut()
    if (fadeAlpha <= 0.0) {
       fadeAlpha = 0.0;
 
+      Apply();
       ScreenManager::GetInstance().SelectScreen("MAIN MENU");
    }
 }
diff --git a/src/Options.hpp b/src/Options.hpp
index 88a1b9b..284684e 100644
--- a/src/Options.hpp
+++ b/src/Options.hpp
@@ -21,6 +21,7 @@
 #include "Platform.hpp"
 #include "ScreenManager.hpp"
 #include "Font.hpp"
+#include "ConfigFile.hpp"
 
 class Options : public Screen {
 public:
@@ -38,6 +39,8 @@ private:
    void DisplayHelpText();
    void DisplayItems();
 
+   void Apply();
+
    static const double FADE_SPEED;
    
    enum OptionState {
@@ -60,6 +63,7 @@ private:
    double fadeAlpha;
    ItemList items;
    unsigned int selected;
+   ConfigFile cfile;
 };
 
 #endif
-- 
2.39.2