Borland C++ makefile for Darkplaces. Does NOT use asm objs yet, but works otherwise.

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index 84e3f8e16b1f1d91fd523f4d155079ae26fc66d6..ec31becdfda2d75e5ee1400cf58b1a159fad3b25 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -93,8 +93,8 @@ typedef struct
        int                     flags;
 } mtexinfo_t;
 
-// LordHavoc: was 7, I added two more for raw lightmap coordinates, and then 3 more for light accumulation
-#define        VERTEXSIZE      12
+// LordHavoc: was 7, I added one more for raw lightmap position
+#define        VERTEXSIZE      8
 
 typedef struct glpoly_s
 {
@@ -118,7 +118,7 @@ typedef struct msurface_s
        short           texturemins[2];
        short           extents[2];
 
-       int                     light_s, light_t;       // gl lightmap coordinates
+       short           light_s, light_t;       // gl lightmap coordinates
 
        glpoly_t        *polys;                         // multiple if warped
        struct  msurface_s      *texturechain;
@@ -127,15 +127,14 @@ typedef struct msurface_s
        
 // lighting info
        int                     dlightframe;
-//     int                     dlightbits[8];
+       int                     dlightbits[8];
 
        int                     lightframe; // avoid redundent addition of dlights
 
        int                     lightmaptexturenum;
        byte            styles[MAXLIGHTMAPS];
-       int                     cached_light[MAXLIGHTMAPS];     // values currently used in lightmap
-//     qboolean        cached_dlight;                          // true if dynamic light in cache
-       qboolean        cached_lighthalf;                       // LordHavoc: to cause lightmap to be rerendered when lighthalf changes
+       unsigned short  cached_light[MAXLIGHTMAPS];     // values currently used in lightmap
+       int                     cached_lighthalf;                       // LordHavoc: to cause lightmap to be rerendered when lighthalf changes
        float           cached_ambient;                         // LordHavoc: rerender lightmaps when r_ambient changes
        byte            *samples;               // [numstyles*surfsize]
 } msurface_t;