stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next

Browse source
This commit is contained in:
Inuyasha 2016-02-03 18:09:08 -08:00
commit 5320424269
5 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_input.c
View file

@ -16,7 +16,6 @@
#include "g_input.h" #include "g_input.h"
#include "keys.h" #include "keys.h"
#include "hu_stuff.h" // need HUFONT start & end #include "hu_stuff.h" // need HUFONT start & end
#include "keys.h"
#include "d_net.h" #include "d_net.h"
#include "console.h" #include "console.h"

3
src/p_user.c
View file

@ -52,9 +52,6 @@
#include "hardware/hw_main.h" #include "hardware/hw_main.h"
#endif #endif
// Index of the special effects (INVUL inverse) map.
#define INVERSECOLORMAP 32
#if 0 #if 0
static void P_NukeAllPlayers(player_t *player); static void P_NukeAllPlayers(player_t *player);
#endif #endif

1
src/r_bsp.c
View file

@ -32,7 +32,6 @@ sector_t *backsector;
// 896 drawsegs! So too bad here's a limit removal a-la-Boom // 896 drawsegs! So too bad here's a limit removal a-la-Boom
drawseg_t *drawsegs = NULL; drawseg_t *drawsegs = NULL;
drawseg_t *ds_p = NULL; drawseg_t *ds_p = NULL;
drawseg_t *firstnewseg = NULL;
// indicates doors closed wrt automap bugfix: // indicates doors closed wrt automap bugfix:
INT32 doorclosed; INT32 doorclosed;

1
src/r_bsp.h
View file

@ -30,7 +30,6 @@ extern INT32 checkcoord[12][4];
extern drawseg_t *drawsegs; extern drawseg_t *drawsegs;
extern drawseg_t *ds_p; extern drawseg_t *ds_p;
extern drawseg_t *firstnewseg;
extern INT32 doorclosed; extern INT32 doorclosed;
typedef void (*drawfunc_t)(INT32 start, INT32 stop); typedef void (*drawfunc_t)(INT32 start, INT32 stop);

2
src/r_segs.c
View file

@ -1486,13 +1486,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (ds_p == drawsegs+maxdrawsegs) if (ds_p == drawsegs+maxdrawsegs)
{ {
size_t pos = ds_p - drawsegs; size_t pos = ds_p - drawsegs;
size_t pos2 = firstnewseg - drawsegs;
size_t newmax = maxdrawsegs ? maxdrawsegs*2 : 128; size_t newmax = maxdrawsegs ? maxdrawsegs*2 : 128;
if (firstseg) if (firstseg)
firstseg = (drawseg_t *)(firstseg - drawsegs); firstseg = (drawseg_t *)(firstseg - drawsegs);
drawsegs = Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL); drawsegs = Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL);
ds_p = drawsegs + pos; ds_p = drawsegs + pos;
firstnewseg = drawsegs + pos2;
maxdrawsegs = newmax; maxdrawsegs = newmax;
if (firstseg) if (firstseg)
firstseg = drawsegs + (size_t)firstseg; firstseg = drawsegs + (size_t)firstseg;