merge branch work back into trunk

[xonotic/netradiant.git] / tools / quake3 / q3map2 / q3map2.h

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 9d8daddecc0c67391e74bc8cfdcae4daa5462764..7c90baad52b80501b0df2daa8f4fa1021776f6fa 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------------------------
 
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+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.
@@ -67,6 +67,7 @@ dependencies
 
 #include "cmdlib.h"
 #include "mathlib.h"
+#include "md5lib.h"
 #include "ddslib.h"
 
 #include "picomodel.h"
@@ -78,7 +79,6 @@ dependencies
 #include "inout.h"
 #include "vfs.h"
 #include "png.h"
-#include "radiant_jpeglib.h"
 #include "mhash.h"
 
 #include <stdlib.h>
@@ -169,7 +169,6 @@ constants
 #define C_ANTIPORTAL                   0x00004000      /* like hint, but doesn't generate portals */
 #define C_SKIP                                 0x00008000      /* like hint, but skips this face (doesn't split bsp) */
 #define C_NOMARKS                              0x00010000      /* no decals */
-
 #define C_DETAIL                               0x08000000      /* THIS MUST BE THE SAME AS IN RADIANT! */
 
 
@@ -323,6 +322,7 @@ abstracted bsp file
 #define        MAX_MAP_DRAW_VERTS              0x80000
 #define        MAX_MAP_DRAW_INDEXES    0x80000
 
+#define MAX_MAP_ADVERTISEMENTS 30
 
 /* key / value pair sizes in the entities lump */
 #define        MAX_KEY                                 32
@@ -502,6 +502,14 @@ typedef struct
 bspDrawSurface_t;
 
 
+/* advertisements */
+typedef struct {
+       int                     cellId;
+       vec3_t          normal;
+       vec3_t          rect[4];
+       char            model[ MAX_QPATH ];
+} bspAdvertisement_t;
+
 
 /* -------------------------------------------------------------------------------
 
@@ -2316,6 +2324,8 @@ Q_EXTERN bspDrawSurface_t *bspDrawSurfaces Q_ASSIGN( NULL );
 Q_EXTERN int                           numBSPFogs Q_ASSIGN( 0 );
 Q_EXTERN bspFog_t                      bspFogs[ MAX_MAP_FOGS ];
 
+Q_EXTERN int                           numBSPAds Q_ASSIGN( 0 );
+Q_EXTERN bspAdvertisement_t    bspAds[ MAX_MAP_ADVERTISEMENTS ];
 
 
 /* end marker */