diff --git a/common/common_quakedef.h b/common/common_quakedef.h index 96c1a12..65c9e1b 100644 --- a/common/common_quakedef.h +++ b/common/common_quakedef.h @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define QUAKE_GAME // as opposed to utilities -//define PARANOID // speed sapping error checking +#define PARANOID // speed sapping error checking #define VERSION 0.1 diff --git a/standalone/Makefile b/standalone/Makefile index c3f5fbc..0d00730 100644 --- a/standalone/Makefile +++ b/standalone/Makefile @@ -76,11 +76,12 @@ DO_GL_AS=$(CC) $(CFLAGS) $(GL_CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< # SETUP AND BUILD ############################################################################# -TARGETS=$(BUILDDIR)/bin/squake \ - $(BUILDDIR)/bin/xquake \ - $(BUILDDIR)/bin/glquake \ - $(BUILDDIR)/bin/glquake.3dfx - # $(BUILDDIR)/bin/unixded +#TARGETS=$(BUILDDIR)/bin/squake \ +# $(BUILDDIR)/bin/xquake \ +# $(BUILDDIR)/bin/glquake \ +# $(BUILDDIR)/bin/glquake.3dfx +# # $(BUILDDIR)/bin/unixded +TARGETS=$(BUILDDIR)/bin/glquake.3dfx build_debug: @-mkdir $(BUILD_DEBUG_DIR) \ diff --git a/standalone/gl_draw.c b/standalone/gl_draw.c index 9e988b9..45f13d7 100644 --- a/standalone/gl_draw.c +++ b/standalone/gl_draw.c @@ -410,9 +410,9 @@ void Draw_Init (void) // hack the version number directly into the pic #if defined(__linux__) - sprintf (ver, "SourceForge (Linux GL) Version %4.2f", (float)VERSION); + snprintf (ver, sizeof(ver), "SourceForge (Linux GL) Version %4.2f", (float)VERSION); #else - sprintf (ver, "SourceForge (GL) Version %4.2f", (float)VERSION); + snprintf (ver, sizeof(ver), "SourceForge (GL) Version %4.2f", (float)VERSION); #endif dest = cb->data + 320*186 + 320 - 11 - 8*strlen(ver); y = strlen(ver); diff --git a/standalone/gl_refrag.c b/standalone/gl_refrag.c index 0526745..c5b67f5 100644 --- a/standalone/gl_refrag.c +++ b/standalone/gl_refrag.c @@ -135,8 +135,8 @@ void R_SplitEntityOnNode (mnode_t *node) // NODE_MIXED splitplane = node->plane; -// sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane); - sides = BoxOnPlaneSide(r_emins, r_emaxs, splitplane); + sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane); +// sides = BoxOnPlaneSide(r_emins, r_emaxs, splitplane); if (sides == 3) { diff --git a/standalone/world.c b/standalone/world.c index e1acfea..4cd23d5 100644 --- a/standalone/world.c +++ b/standalone/world.c @@ -657,6 +657,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) ) return false; +#if 0 #ifdef PARANOID if (SV_HullPointContents (sv_hullmodel, mid, node->children[side]) == CONTENTS_SOLID) @@ -664,6 +665,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec Con_Printf ("mid PointInHullSolid\n"); return false; } +#endif #endif if (SV_HullPointContents (hull, node->children[side^1], mid)