Merging in the latest master

13 years ago · b14c132a31
parent 447158e9d6
commit b14c132a31
1 changed files with 4 additions and 4 deletions
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@ -16,10 +16,10 @@ namespace MWGui
            SettingsWindow(WindowManager& parWindowManager);

        private:
-            static const float sFovMin = 30;
-            static const float sFovMax = 140;
-            static const float sViewDistMin = 2000;
-            static const float sViewDistMax = 5600;
+            static int const sFovMin = 30;
+            static int const sFovMax = 140;
+            static int const sViewDistMin = 2000;
+            static int const sViewDistMax = 5600;

        protected:
            MyGUI::Button* mOkButton;