mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-18 01:31:21 +00:00
POQ now actually works!!
This commit is contained in:
parent
7e9e2f177a
commit
d322adc60d
5 changed files with 13 additions and 10 deletions
|
@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#define QUAKE_GAME // as opposed to utilities
|
#define QUAKE_GAME // as opposed to utilities
|
||||||
|
|
||||||
//define PARANOID // speed sapping error checking
|
#define PARANOID // speed sapping error checking
|
||||||
|
|
||||||
#define VERSION 0.1
|
#define VERSION 0.1
|
||||||
|
|
||||||
|
|
|
@ -76,11 +76,12 @@ DO_GL_AS=$(CC) $(CFLAGS) $(GL_CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||||
# SETUP AND BUILD
|
# SETUP AND BUILD
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
||||||
TARGETS=$(BUILDDIR)/bin/squake \
|
#TARGETS=$(BUILDDIR)/bin/squake \
|
||||||
$(BUILDDIR)/bin/xquake \
|
# $(BUILDDIR)/bin/xquake \
|
||||||
$(BUILDDIR)/bin/glquake \
|
# $(BUILDDIR)/bin/glquake \
|
||||||
$(BUILDDIR)/bin/glquake.3dfx
|
# $(BUILDDIR)/bin/glquake.3dfx
|
||||||
# $(BUILDDIR)/bin/unixded
|
# # $(BUILDDIR)/bin/unixded
|
||||||
|
TARGETS=$(BUILDDIR)/bin/glquake.3dfx
|
||||||
|
|
||||||
build_debug:
|
build_debug:
|
||||||
@-mkdir $(BUILD_DEBUG_DIR) \
|
@-mkdir $(BUILD_DEBUG_DIR) \
|
||||||
|
|
|
@ -410,9 +410,9 @@ void Draw_Init (void)
|
||||||
|
|
||||||
// hack the version number directly into the pic
|
// hack the version number directly into the pic
|
||||||
#if defined(__linux__)
|
#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
|
#else
|
||||||
sprintf (ver, "SourceForge (GL) Version %4.2f", (float)VERSION);
|
snprintf (ver, sizeof(ver), "SourceForge (GL) Version %4.2f", (float)VERSION);
|
||||||
#endif
|
#endif
|
||||||
dest = cb->data + 320*186 + 320 - 11 - 8*strlen(ver);
|
dest = cb->data + 320*186 + 320 - 11 - 8*strlen(ver);
|
||||||
y = strlen(ver);
|
y = strlen(ver);
|
||||||
|
|
|
@ -135,8 +135,8 @@ void R_SplitEntityOnNode (mnode_t *node)
|
||||||
// NODE_MIXED
|
// NODE_MIXED
|
||||||
|
|
||||||
splitplane = node->plane;
|
splitplane = node->plane;
|
||||||
// sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
|
sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
|
||||||
sides = BoxOnPlaneSide(r_emins, r_emaxs, splitplane);
|
// sides = BoxOnPlaneSide(r_emins, r_emaxs, splitplane);
|
||||||
|
|
||||||
if (sides == 3)
|
if (sides == 3)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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) )
|
if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
#if 0
|
||||||
#ifdef PARANOID
|
#ifdef PARANOID
|
||||||
if (SV_HullPointContents (sv_hullmodel, mid, node->children[side])
|
if (SV_HullPointContents (sv_hullmodel, mid, node->children[side])
|
||||||
== CONTENTS_SOLID)
|
== CONTENTS_SOLID)
|
||||||
|
@ -664,6 +665,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec
|
||||||
Con_Printf ("mid PointInHullSolid\n");
|
Con_Printf ("mid PointInHullSolid\n");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (SV_HullPointContents (hull, node->children[side^1], mid)
|
if (SV_HullPointContents (hull, node->children[side^1], mid)
|
||||||
|
|
Loading…
Reference in a new issue