From 52ee12693228563a8e2de1095acebe0c8637ebe1 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Sat, 3 Mar 2018 22:27:27 +0100 Subject: [PATCH] import some q3map2 game options from gtkradiant tree --- tools/quake3/q3map2/game_etut.h | 2 +- tools/quake3/q3map2/game_quakelive.h | 21 ++++++++++++++++++--- tools/quake3/q3map2/game_unvanquished.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/quake3/q3map2/game_etut.h b/tools/quake3/q3map2/game_etut.h index 0841283d..f4303f2e 100644 --- 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 a130ead1..3f7a29da 100644 --- 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 a9e7d699..75d6804e 100644 --- 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 */ -- 2.39.2