import some q3map2 game options from gtkradiant tree

diff --git a/tools/quake3/q3map2/game_etut.h b/tools/quake3/q3map2/game_etut.h
index 0841283da3179b83a7d76bfdcd387435a29b58e1..f4303f2e63153470c2f3431d8d14567239c923f2 100644 (file)
--- a/tools/quake3/q3map2/game_etut.h
+++ b/tools/quake3/q3map2/game_etut.h
@@ -147,7 +147,7 @@
        "flareshader",      /* default flare shader */
        qfalse,             /* wolf lighting model? */
        128,                /* lightmap width/height */
-       1.0f,               /* lightmap gamma */
+       2.2f,               /* lightmap gamma */
        qtrue,              /* lightmap sRGB */
        qfalse,             /* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
        qfalse,             /* color sRGB */

diff --git a/tools/quake3/q3map2/game_quakelive.h b/tools/quake3/q3map2/game_quakelive.h
index a130ead1312941f2efbe31ec5923983c34d99f1d..3f7a29daa659119121701e1b59164a702223e7b5 100644 (file)
--- a/tools/quake3/q3map2/game_quakelive.h
+++ b/tools/quake3/q3map2/game_quakelive.h
@@ -43,6 +43,18 @@
    ------------------------------------------------------------------------------- */
 
 
+   /* -------------------------------------------------------------------------------
+
+   Additional surface flags for Quake Live
+
+   ------------------------------------------------------------------------------- */
+
+#define Q_SURF_SNOWSTEPS       0x80000         // snow footsteps
+#define Q_SURF_WOODSTEPS       0x100000        // wood footsteps
+#define Q_SURF_DMGTHROUGH      0x200000        // Missile dmg through surface(?)
+                                                                               // (This is not in use atm, will
+                                                                               //  probably be re-purposed some day.)
+
 
 /* -------------------------------------------------------------------------------
 
@@ -52,9 +64,9 @@
 
 {
        "quakelive",        /* -game x */
-       "baseq3",           /* default base game data dir (FIXME what does quake live really use?) */
-       ".q3a",             /* unix home sub-dir (FIXME what does quake live really use?) */
-       "quake",            /* magic path word (FIXME where does quake live install to?) */
+       "baseq3",           /* default base game data dir */
+       ".quakelive/quakelive/home",             /* unix home sub-dir */
+       "quake",            /* magic path word */
        "scripts",          /* shader directory */
        64,                 /* max lightmapped surface verts */
        999,                /* max surface verts */
@@ -145,6 +157,9 @@
                { "ladder",         0,                          0,                          Q_SURF_LADDER,              0,                          0,                          0 },
                { "nodamage",       0,                          0,                          Q_SURF_NODAMAGE,            0,                          0,                          0 },
                { "metalsteps",     0,                          0,                          Q_SURF_METALSTEPS,          0,                          0,                          0 },
+               { "snowsteps",      0,                          0,                          Q_SURF_SNOWSTEPS,           0,                          0,                          0 },
+               { "woodsteps",      0,                          0,                          Q_SURF_WOODSTEPS,           0,                          0,                          0 },
+               { "dmgthrough",     0,                          0,                          Q_SURF_DMGTHROUGH,          0,                          0,                          0 },
                { "flesh",          0,                          0,                          Q_SURF_FLESH,               0,                          0,                          0 },
                { "nosteps",        0,                          0,                          Q_SURF_NOSTEPS,             0,                          0,                          0 },
                { "nodlight",       0,                          0,                          Q_SURF_NODLIGHT,            0,                          0,                          0 },

diff --git a/tools/quake3/q3map2/game_unvanquished.h b/tools/quake3/q3map2/game_unvanquished.h
index a9e7d699dede92303ada7095f24070e4d3e49846..75d6804e52f3b056ddac01ae0209b5cc10d1a717 100644 (file)
--- a/tools/quake3/q3map2/game_unvanquished.h
+++ b/tools/quake3/q3map2/game_unvanquished.h
@@ -27,6 +27,7 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
 ------------------------------------------------------------------------------- */
 
 /* Derived from Tremulous support by LinuxManMikeC */
+/* Updated to Unvanquished support by Neumond */
 
 
 /* marker */