X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fpreferences.h;h=51c9ccb4e903247523be8038eff05af7d5390476;hp=9fc92ac20b9283f5bfe4573ea9564d3ccf71f710;hb=8d530e8707069a0cb030df07696c223522b1f990;hpb=e4b1c1a55c5db801601ce3459bc061dd3f3a4ebd

diff --git a/radiant/preferences.h b/radiant/preferences.h
index 9fc92ac2..51c9ccb4 100644
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gtkr_list.h"
 //#include "profile.h"
 
+#ifdef _WIN32
+#define NVIDIA_AERO_HACK
+#endif
+
 #define MAX_TEXTURE_QUALITY 3
 
 enum PrefTypes_t
@@ -171,6 +175,7 @@ public:
   Str mBaseGame; ///< basegame directory
   Str mEnginePath; ///< path to the engine
   Str mEngine; ///< engine name
+  Str mMultiplayerEngine; ///< engine name
 #if defined (__linux__) || defined (__APPLE__)
   Str mUserPathPrefix; ///< prefix for ~/.q3a ~/.wolf init, only on *nix
 #endif
@@ -181,6 +186,7 @@ public:
   bool mNoPatch; ///< this game doesn't support patch technology
   Str mCaulkShader; ///< the shader to use for caulking
   bool quake2; ///< set this to true to get quake2
+  bool noMapsInHome; ///< set this if you want to open the engine path/base dir/maps dir for map open/save dialoges */
 
   CGameDescription() { mpDoc = NULL; }
   /*!
@@ -205,6 +211,9 @@ select games, copy editing assets and write out configuration files
 #define WARSOW_PACK "WarsowPack"
 #define NEXUIZ_PACK "NexuizPack"
 #define Q2_PACK "Q2Pack"
+#define TREMULOUS_PACK "TremulousPack"
+#define JA_PACK "JAPack"
+#define REACTION_PACK "ReactionPack"
 
 class CGameInstall : public Dialog {
 public:
@@ -225,6 +234,9 @@ public:
 		GAME_WARSOW,
 		GAME_NEXUIZ,
 		GAME_Q2,
+		GAME_TREMULOUS,
+		GAME_JA,
+		GAME_REACTION,
 		GAME_COUNT
 	};
 
@@ -467,7 +479,7 @@ public:
   // Gef: updated preferences dialog
   /*! Preference notebook page numbers */
   enum {PTAB_FRONT = 0, PTAB_GAME_SETTINGS, PTAB_2D, PTAB_CAMERA, PTAB_TEXTURE, PTAB_LAYOUT, PTAB_MOUSE,
-        PTAB_EDITING, PTAB_STARTUP, PTAB_PATHS, PTAB_MISC, PTAB_BSPMONITOR} pref_tabs;
+        PTAB_EDITING, PTAB_STARTUP, PTAB_PATHS, PTAB_BRUSH, PTAB_MISC, PTAB_BSPMONITOR} pref_tabs;
 
   GtkWidget *notebook;
 
@@ -477,6 +489,10 @@ public:
   void UpdateATIHack();
 #endif
 
+#ifdef NVIDIA_AERO_HACK
+  void UpdateNvidiaAeroHack();
+#endif
+
   void LoadPrefs();
   void SavePrefs();
   void LoadTexdefPref(texdef_t* pTexdef, char* pName);
@@ -575,6 +591,7 @@ public:
   bool  m_bPluginToolbar;
   bool  m_bNoClamp;
 	//++timo this is most likely broken, I don't know what it's supposed to do
+  bool  m_bSnap;
   Str   m_strUserPath;
   int   m_nRotation;
   bool  m_bChaseMouse;
@@ -604,6 +621,7 @@ public:
   bool  m_bGLLighting;
   bool  m_bTexturesShaderlistOnly;
   int   m_nSubdivisions;
+  float m_fDefTextureScale;
   bool  m_bFloatingZ;
   bool  m_bLatchedFloatingZ;
   // Gef: Kyro GL_POINT workaround
@@ -677,7 +695,12 @@ public:
   bool m_bQ3Map2Texturing;
 
 #ifdef ATIHACK_812
-	bool m_bGlATIHack;
+  bool m_bGlATIHack;
+#endif
+
+#ifdef NVIDIA_AERO_HACK
+  bool m_bGlNvidiaAeroHack;
+  int m_bGlNvidiaAeroHackPrevState;
 #endif
 
   void UpdateData (bool retrieve);