From ee26e7930b7fc53e77667a1f7d5b65cdd00a7490 Mon Sep 17 00:00:00 2001
From: zilmar <zilmae@pj64-emu.com>
Date: Fri, 10 Mar 2017 16:36:38 +1100
Subject: [PATCH] [Glide64] Make ghq_enht_f16bpp private

---
 Source/Glide64/Main.cpp     | 2 +-
 Source/Glide64/Settings.cpp | 8 ++++----
 Source/Glide64/Settings.h   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index 6dca48f14..a7e88f459 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -673,7 +673,7 @@ int InitGfx()
             {
                 options |= TILE_HIRESTEX;
             }
-            if (g_settings->ghq_enht_f16bpp)
+            if (g_settings->ghq_enht_f16bpp())
             {
                 options |= FORCE16BPP_TEX;
             }
diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp
index 3d0576dbd..1578a9f58 100644
--- a/Source/Glide64/Settings.cpp
+++ b/Source/Glide64/Settings.cpp
@@ -41,7 +41,7 @@ CSettings::CSettings() :
     m_ghq_cmpr(TextureCompression_S3TC),
     m_ghq_hirs(HiResPackFormat_None),
     m_ghq_enht_cmpr(false),
-ghq_enht_f16bpp(0),
+    m_ghq_enht_f16bpp(false),
 ghq_enht_gz(0),
 ghq_enht_nobg(0),
 ghq_hirs_cmpr(0),
@@ -140,7 +140,7 @@ void CSettings::RegisterSettings(void)
     general_setting(Set_ghq_enht, "ghq_enht", TextureEnht_None);
     general_setting(Set_ghq_hirs, "ghq_hirs", HiResPackFormat_None);
     general_setting(Set_ghq_enht_cmpr, "ghq_enht_cmpr", false);
-    general_setting(Set_ghq_enht_f16bpp, "ghq_enht_f16bpp", 0);
+    general_setting(Set_ghq_enht_f16bpp, "ghq_enht_f16bpp", false);
     general_setting(Set_ghq_enht_gz, "ghq_enht_gz", 1);
     general_setting(Set_ghq_enht_nobg, "ghq_enht_nobg", 0);
     general_setting(Set_ghq_hirs_cmpr, "ghq_hirs_cmpr", 0);
@@ -477,7 +477,7 @@ void CSettings::ReadSettings()
     m_ghq_enht = (TextureEnhancement_t)GetSetting(Set_ghq_enht);
     m_ghq_hirs = (HiResPackFormat_t)GetSetting(Set_ghq_hirs);
     m_ghq_enht_cmpr = GetSetting(Set_ghq_enht_cmpr) != 0;
-    this->ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp);
+    m_ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp) !=0;
     this->ghq_enht_gz = GetSetting(Set_ghq_enht_gz);
     this->ghq_enht_nobg = GetSetting(Set_ghq_enht_nobg);
     this->ghq_hirs_cmpr = GetSetting(Set_ghq_hirs_cmpr);
@@ -746,7 +746,7 @@ void CSettings::WriteSettings(void)
     SetSetting(Set_ghq_enht, m_ghq_enht);
     SetSetting(Set_ghq_hirs, m_ghq_hirs);
     SetSetting(Set_ghq_enht_cmpr, m_ghq_enht_cmpr);
-    SetSetting(Set_ghq_enht_f16bpp, g_settings->ghq_enht_f16bpp);
+    SetSetting(Set_ghq_enht_f16bpp, m_ghq_enht_f16bpp);
     SetSetting(Set_ghq_enht_gz, g_settings->ghq_enht_gz);
     SetSetting(Set_ghq_enht_nobg, g_settings->ghq_enht_nobg);
     SetSetting(Set_ghq_hirs_cmpr, g_settings->ghq_hirs_cmpr);
diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h
index bd9d95470..302376822 100644
--- a/Source/Glide64/Settings.h
+++ b/Source/Glide64/Settings.h
@@ -208,7 +208,7 @@ public:
     inline TextureCompression_t ghq_cmpr(void) const { return m_ghq_cmpr; }
     inline HiResPackFormat_t ghq_hirs(void) const { return m_ghq_hirs; }
     inline bool ghq_enht_cmpr(void) const { return m_ghq_enht_cmpr; }
-    int ghq_enht_f16bpp;
+    inline bool ghq_enht_f16bpp(void) const { return m_ghq_enht_f16bpp; }
     int ghq_enht_gz;
     int ghq_enht_nobg;
     int ghq_hirs_cmpr;
@@ -322,6 +322,7 @@ private:
     TextureCompression_t m_ghq_cmpr;
     HiResPackFormat_t m_ghq_hirs;
     bool m_ghq_enht_cmpr;
+    bool m_ghq_enht_f16bpp;
     ucode_t m_ucode;
     StippleMode_t m_stipple_mode;
     hacks_t m_hacks;