thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use vanilla hw_bsp.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 15:47:19 -04:00
parent 4e5d397eea
commit d2ecf0dd92
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/hardware/hw_bsp.c
View file

@ -1,11 +1,6 @@
// SONIC ROBO BLAST 2 // SONIC ROBO BLAST 2
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
<<<<<<< HEAD
// Copyright (C) 1993-1996 by id Software, Inc.
=======
>>>>>>> srb2/next
// Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 1999-2019 by Sonic Team Junior.
// //
// This program is free software distributed under the // This program is free software distributed under the
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
@ -17,7 +12,6 @@
#include "../doomdef.h" #include "../doomdef.h"
#include "../doomstat.h" #include "../doomstat.h"
#ifdef HWRENDER #ifdef HWRENDER
#include "hw_main.h"
#include "hw_glob.h" #include "hw_glob.h"
#include "../r_local.h" #include "../r_local.h"
#include "../z_zone.h" #include "../z_zone.h"
@ -59,8 +53,6 @@ static INT32 totalsubsecpolys = 0;
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Polygon fast alloc / free // Polygon fast alloc / free
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
<<<<<<< HEAD
=======
//hurdler: quick fix for those who wants to play with larger wad //hurdler: quick fix for those who wants to play with larger wad
#define ZPLANALLOC #define ZPLANALLOC
@ -109,15 +101,13 @@ void HWR_FreePolyPool(void)
gl_polypool = NULL; gl_polypool = NULL;
#endif #endif
} }
>>>>>>> srb2/next
static poly_t *HWR_AllocPoly(INT32 numpts) static poly_t *HWR_AllocPoly(INT32 numpts)
{ {
poly_t *p; poly_t *p;
size_t size = sizeof (poly_t) + sizeof (polyvertex_t) * numpts; size_t size = sizeof (poly_t) + sizeof (polyvertex_t) * numpts;
#ifdef ZPLANALLOC
p = Z_Malloc(size, PU_HWRPLANE, NULL); p = Z_Malloc(size, PU_HWRPLANE, NULL);
<<<<<<< HEAD
=======
#else #else
#ifdef PARANOIA #ifdef PARANOIA
if (!gl_polypool) if (!gl_polypool)
@ -134,7 +124,6 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
gl_ppcurrent += size; gl_ppcurrent += size;
gl_ppfree -= size; gl_ppfree -= size;
#endif #endif
>>>>>>> srb2/next
p->numpts = numpts; p->numpts = numpts;
return p; return p;
} }
@ -143,9 +132,8 @@ static polyvertex_t *HWR_AllocVertex(void)
{ {
polyvertex_t *p; polyvertex_t *p;
size_t size = sizeof (polyvertex_t); size_t size = sizeof (polyvertex_t);
#ifdef ZPLANALLOC
p = Z_Malloc(size, PU_HWRPLANE, NULL); p = Z_Malloc(size, PU_HWRPLANE, NULL);
<<<<<<< HEAD
=======
#else #else
if (gl_ppfree < size) if (gl_ppfree < size)
I_Error("HWR_AllocVertex(): no more memory %u bytes left, %u bytes needed\n\n%s\n", I_Error("HWR_AllocVertex(): no more memory %u bytes left, %u bytes needed\n\n%s\n",
@ -155,7 +143,6 @@ static polyvertex_t *HWR_AllocVertex(void)
gl_ppcurrent += size; gl_ppcurrent += size;
gl_ppfree -= size; gl_ppfree -= size;
#endif #endif
>>>>>>> srb2/next
return p; return p;
} }
@ -163,9 +150,16 @@ static polyvertex_t *HWR_AllocVertex(void)
/// for now don't free because it doesn't free in reverse order /// for now don't free because it doesn't free in reverse order
static void HWR_FreePoly(poly_t *poly) static void HWR_FreePoly(poly_t *poly)
{ {
#ifdef ZPLANALLOC
Z_Free(poly); Z_Free(poly);
#else
const size_t size = sizeof (poly_t) + sizeof (polyvertex_t) * poly->numpts;
memset(poly, 0x00, size);
//mempoly -= polysize;
#endif
} }
// Return interception along bsp line, // Return interception along bsp line,
// with the polygon segment // with the polygon segment
// //
@ -580,8 +574,8 @@ static inline void SearchDivline(node_t *bsp, fdivline_t *divline)
divline->dy = FIXED_TO_FLOAT(bsp->dy); divline->dy = FIXED_TO_FLOAT(bsp->dy);
} }
//Hurdler: implement a loading status
#ifdef HWR_LOADING_SCREEN #ifdef HWR_LOADING_SCREEN
//Hurdler: implement a loading status
static size_t ls_count = 0; static size_t ls_count = 0;
static UINT8 ls_percent = 0; static UINT8 ls_percent = 0;