mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-11-10 15:22:20 +00:00
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
This commit is contained in:
commit
5320424269
5 changed files with 0 additions and 8 deletions
|
@ -16,7 +16,6 @@
|
|||
#include "g_input.h"
|
||||
#include "keys.h"
|
||||
#include "hu_stuff.h" // need HUFONT start & end
|
||||
#include "keys.h"
|
||||
#include "d_net.h"
|
||||
#include "console.h"
|
||||
|
||||
|
|
|
@ -52,9 +52,6 @@
|
|||
#include "hardware/hw_main.h"
|
||||
#endif
|
||||
|
||||
// Index of the special effects (INVUL inverse) map.
|
||||
#define INVERSECOLORMAP 32
|
||||
|
||||
#if 0
|
||||
static void P_NukeAllPlayers(player_t *player);
|
||||
#endif
|
||||
|
|
|
@ -32,7 +32,6 @@ sector_t *backsector;
|
|||
// 896 drawsegs! So too bad here's a limit removal a-la-Boom
|
||||
drawseg_t *drawsegs = NULL;
|
||||
drawseg_t *ds_p = NULL;
|
||||
drawseg_t *firstnewseg = NULL;
|
||||
|
||||
// indicates doors closed wrt automap bugfix:
|
||||
INT32 doorclosed;
|
||||
|
|
|
@ -30,7 +30,6 @@ extern INT32 checkcoord[12][4];
|
|||
|
||||
extern drawseg_t *drawsegs;
|
||||
extern drawseg_t *ds_p;
|
||||
extern drawseg_t *firstnewseg;
|
||||
extern INT32 doorclosed;
|
||||
|
||||
typedef void (*drawfunc_t)(INT32 start, INT32 stop);
|
||||
|
|
|
@ -1486,13 +1486,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||
if (ds_p == drawsegs+maxdrawsegs)
|
||||
{
|
||||
size_t pos = ds_p - drawsegs;
|
||||
size_t pos2 = firstnewseg - drawsegs;
|
||||
size_t newmax = maxdrawsegs ? maxdrawsegs*2 : 128;
|
||||
if (firstseg)
|
||||
firstseg = (drawseg_t *)(firstseg - drawsegs);
|
||||
drawsegs = Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL);
|
||||
ds_p = drawsegs + pos;
|
||||
firstnewseg = drawsegs + pos2;
|
||||
maxdrawsegs = newmax;
|
||||
if (firstseg)
|
||||
firstseg = drawsegs + (size_t)firstseg;
|
||||
|
|
Loading…
Reference in a new issue