]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
add unvanquished game support to q3map2
authorThomas Debesse <dev@illwieckz.net>
Wed, 17 Feb 2016 22:34:57 +0000 (23:34 +0100)
committerThomas Debesse <dev@illwieckz.net>
Thu, 14 Apr 2016 03:20:40 +0000 (05:20 +0200)
- import game_unvanquished.h from daemonmap
- tweak default values

tools/quake3/q3map2/game_unvanquished.h [new file with mode: 0644]
tools/quake3/q3map2/q3map2.h

diff --git a/tools/quake3/q3map2/game_unvanquished.h b/tools/quake3/q3map2/game_unvanquished.h
new file mode 100644 (file)
index 0000000..d623a24
--- /dev/null
@@ -0,0 +1,172 @@
+/* -------------------------------------------------------------------------------
+
+Copyright (C) 1999-2007 id Software, Inc. and contributors.
+For a list of contributors, see the accompanying CONTRIBUTORS file.
+
+This file is part of GtkRadiant.
+
+GtkRadiant is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+GtkRadiant is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GtkRadiant; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+----------------------------------------------------------------------------------
+
+This code has been altered significantly from its original form, to support
+several games based on the Quake III Arena engine, in the form of "Q3Map2."
+
+------------------------------------------------------------------------------- */
+
+/* Derived from Tremulous support by LinuxManMikeC */
+
+
+/* marker */
+#ifndef GAME_UNVANQUISHED_H
+#define GAME_UNVANQUISHED_H
+
+
+
+/* -------------------------------------------------------------------------------
+
+content and surface flags - also uses defines from game_quake3.h
+
+------------------------------------------------------------------------------- */
+
+#define UNV_CONT_NOALIENBUILD         0x1000
+#define UNV_CONT_NOHUMANBUILD         0x2000
+#define UNV_CONT_NOBUILD              0x4000
+
+#define UNV_SURF_NOALIENBUILDSURFACE  0x80000
+#define UNV_SURF_NOHUMANBUILDSURFACE  0x100000
+#define UNV_SURF_NOBUILDSURFACE       0x200000
+
+
+
+/* -------------------------------------------------------------------------------
+
+game_t struct
+
+------------------------------------------------------------------------------- */
+
+{
+       "unvanquished",         /* -game x */
+       "pkg",                  /* default base game data dir */
+       ".unvanquished",        /* unix home sub-dir */
+       "unvanquished",         /* magic path word */
+       "scripts",              /* shader directory */
+       1048575,                /* max lightmapped surface verts */
+       1048575,                /* max surface verts */
+       1048575,                /* max surface indexes */
+       qfalse,                 /* flares */
+       "flareshader",          /* default flare shader */
+       qfalse,                 /* wolf lighting model? */
+       128,                    /* lightmap width/height */
+       1.0f,                   /* lightmap gamma */
+       qfalse,                 /* lightmap sRGB */
+       qfalse,                 /* texture sRGB */
+       qfalse,                 /* color sRGB */
+       0.0f,                   /* lightmap exposure */
+       1.0f,                   /* lightmap compensate */
+       1.0f,                   /* lightgrid scale */
+       1.0f,                   /* lightgrid ambient scale */
+       qfalse,                 /* light angle attenuation uses half-lambert curve */
+       qfalse,                 /* disable shader lightstyles hack */
+       qtrue,                  /* keep light entities on bsp */
+       8,                      /* default patchMeta subdivisions tolerance */
+       qfalse,                 /* patch casting enabled */
+       qfalse,                 /* compile deluxemaps */
+       1,                      /* deluxemaps default mode */
+       512,                    /* minimap size */
+       1.0f,                   /* minimap sharpener */
+       0.0f,                   /* minimap border */
+       qtrue,                  /* minimap keep aspect */
+       MINIMAP_MODE_BLACK,     /* minimap mode */
+       "../minimaps/%s.tga",   /* minimap name format */
+       "IBSP",                 /* bsp file prefix */
+       46,                     /* bsp file version */
+       qfalse,                 /* cod-style lump len/ofs order */
+       LoadIBSPFile,           /* bsp load function */
+       WriteIBSPFile,          /* bsp write function */
+
+       {
+               /* name                 contentFlags            contentFlagsClear           surfaceFlags                   surfaceFlagsClear            compileFlags                    compileFlagsClear */
+
+               /* default */
+               { "default",            Q_CONT_SOLID,           -1,                         0,                              -1,                         C_SOLID,                        -1 },
+
+               /* ydnar */
+               { "lightgrid",          0,                      0,                          0,                              0,                          C_LIGHTGRID,                    0 },
+               { "antiportal",         0,                      0,                          0,                              0,                          C_ANTIPORTAL,                   0 },
+               { "skip",               0,                      0,                          0,                              0,                          C_SKIP,                         0 },
+
+               /* compiler */
+               { "origin",             Q_CONT_ORIGIN,          Q_CONT_SOLID,               0,                              0,                          C_ORIGIN | C_TRANSLUCENT,       C_SOLID },
+               { "areaportal",         Q_CONT_AREAPORTAL,      Q_CONT_SOLID,               0,                              0,                          C_AREAPORTAL | C_TRANSLUCENT,   C_SOLID },
+               { "trans",              Q_CONT_TRANSLUCENT,     0,                          0,                              0,                          C_TRANSLUCENT,                  0 },
+               { "detail",             Q_CONT_DETAIL,          0,                          0,                              0,                          C_DETAIL,                       0 },
+               { "structural",         Q_CONT_STRUCTURAL,      0,                          0,                              0,                          C_STRUCTURAL,                   0 },
+               { "hint",               0,                      0,                          Q_SURF_HINT,                    0,                          C_HINT,                         0 },
+               { "nodraw",             0,                      0,                          Q_SURF_NODRAW,                  0,                          C_NODRAW,                       0 },
+
+               { "alphashadow",        0,                      0,                          Q_SURF_ALPHASHADOW,             0,                          C_ALPHASHADOW | C_TRANSLUCENT,  0 },
+               { "lightfilter",        0,                      0,                          Q_SURF_LIGHTFILTER,             0,                          C_LIGHTFILTER | C_TRANSLUCENT,  0 },
+               { "nolightmap",         0,                      0,                          Q_SURF_VERTEXLIT,               0,                          C_VERTEXLIT,                    0 },
+               { "pointlight",         0,                      0,                          Q_SURF_VERTEXLIT,               0,                          C_VERTEXLIT,                    0 },
+
+               /* game */
+               { "nonsolid",           0,                      Q_CONT_SOLID,               Q_SURF_NONSOLID,                0,                          0,                              C_SOLID },
+
+               { "trigger",            Q_CONT_TRIGGER,         Q_CONT_SOLID,               0,                              0,                          C_TRANSLUCENT,                  C_SOLID },
+
+               { "water",              Q_CONT_WATER,           Q_CONT_SOLID,               0,                              0,                          C_LIQUID | C_TRANSLUCENT,       C_SOLID },
+               { "slime",              Q_CONT_SLIME,           Q_CONT_SOLID,               0,                              0,                          C_LIQUID | C_TRANSLUCENT,       C_SOLID },
+               { "lava",               Q_CONT_LAVA,            Q_CONT_SOLID,               0,                              0,                          C_LIQUID | C_TRANSLUCENT,       C_SOLID },
+
+               { "playerclip",         Q_CONT_PLAYERCLIP,      Q_CONT_SOLID,               0,                              0,                          C_DETAIL | C_TRANSLUCENT,       C_SOLID },
+               { "monsterclip",        Q_CONT_MONSTERCLIP,     Q_CONT_SOLID,               0,                              0,                          C_DETAIL | C_TRANSLUCENT,       C_SOLID },
+               { "nodrop",             Q_CONT_NODROP,          Q_CONT_SOLID,               0,                              0,                          C_TRANSLUCENT,                  C_SOLID },
+
+               { "clusterportal",      Q_CONT_CLUSTERPORTAL,   Q_CONT_SOLID,               0,                              0,                          C_TRANSLUCENT,                  C_SOLID },
+               { "donotenter",         Q_CONT_DONOTENTER,      Q_CONT_SOLID,               0,                              0,                          C_TRANSLUCENT,                  C_SOLID },
+               { "botclip",            Q_CONT_BOTCLIP,         Q_CONT_SOLID,               0,                              0,                          C_TRANSLUCENT,                  C_SOLID },
+
+               { "fog",                Q_CONT_FOG,             Q_CONT_SOLID,               0,                              0,                          C_FOG,                          C_SOLID },
+               { "sky",                0,                      0,                          Q_SURF_SKY,                     0,                          C_SKY,                          0 },
+
+               { "slick",              0,                      0,                          Q_SURF_SLICK,                   0,                          0,                              0 },
+
+               { "noimpact",           0,                      0,                          Q_SURF_NOIMPACT,                0,                          0,                              0 },
+               { "nomarks",            0,                      0,                          Q_SURF_NOMARKS,                 0,                          C_NOMARKS,                      0 },
+               { "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 },
+               { "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 },
+               { "dust",               0,                      0,                          Q_SURF_DUST,                    0,                          0,                              0 },
+
+               /* unvanquished */
+               {"noalienbuild",        UNV_CONT_NOALIENBUILD,  0,                         0,                               0,                          0,                              0 },
+               {"nohumanbuild",        UNV_CONT_NOHUMANBUILD,  0,                         0,                               0,                          0,                              0 },
+               {"nobuild",             UNV_CONT_NOBUILD,       0,                         0,                               0,                          0,                              0 },
+
+               {"noalienbuildsurface", 0,                      0,                         UNV_SURF_NOALIENBUILDSURFACE,    0,                          0,                              0 },
+               {"nohumanbuildsurface", 0,                      0,                         UNV_SURF_NOHUMANBUILDSURFACE,    0,                          0,                              0 },
+               {"nobuildsurface",      0,                      0,                         UNV_SURF_NOBUILDSURFACE,         0,                          0,                              0 },
+
+               /* null */
+               { NULL,                 0,                      0,                         0,                               0,                          0,                              0 }
+       }
+}
+
+/* end marker */
+#endif
index eaa964ffeb0268cf08273a5ac948dea51cbd6a33..7bbbc42be5e2cf4e5d011b59061152fce98dd1d2 100644 (file)
@@ -1961,6 +1961,8 @@ Q_EXTERN game_t games[]
                                                                #include "game_xonotic.h" /* most be after game_quake3.h as they share defines! */
        ,
                                                                #include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
+       ,
+                                                               #include "game_unvanquished.h"
        ,
                                                                #include "game_tenebrae.h"
        ,