zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed clipshape feature as it is a feature of modern EDuke32 maps only.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-14 15:36:25 +02:00
parent 19ef0cd295
commit 117e78cb3b
8 changed files with 0 additions and 990 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/include/build.h
View file

@ -715,9 +715,6 @@ int32_t engineLoadBoard(const char *filename, char flags, vec3_t *dapos, int16
int32_t engineLoadMHK(const char *filename);
void G_LoadMapHack(const char* filename);
void engineClearLightsFromMHK();
#ifdef HAVE_CLIPSHAPE_FEATURE
int32_t engineLoadClipMaps(void);
#endif
int32_t saveboard(const char *filename, const vec3_t *dapos, int16_t daang, int16_t dacursectnum);
int32_t qloadkvx(int32_t voxindex, const char *filename);
@ -943,7 +940,6 @@ static FORCE_INLINE CONSTEXPR int32_t E_SpriteIsValid(const int32_t i)
return ((unsigned)i < MAXSPRITES && sprite[i].statnum != MAXSTATUS);
}
int clipshape_idx_for_sprite(uspriteptr_t curspr, int curidx);
void alignceilslope(int16_t dasect, int32_t x, int32_t y, int32_t z);
void alignflorslope(int16_t dasect, int32_t x, int32_t y, int32_t z);

49
source/build/include/clip.h
View file

@ -14,55 +14,6 @@
#define MAXCLIPSECTORS 512
#define MAXCLIPNUM 2048
#define CLIPCURBHEIGHT (1<<8)
#ifdef HAVE_CLIPSHAPE_FEATURE
#define CM_MAX 256 // must be a power of 2
// sectoidx bits
#undef CM_NONE
#define CM_NONE (CM_MAX<<1)
#define CM_SOME (CM_NONE-1)
#define CM_OUTER (CM_MAX) // sector surrounds clipping sector
// sprite -> sector tag mappings
#define CM_XREPEAT floorpal
#define CM_YREPEAT floorxpanning
#define CM_XOFFSET ceilingshade
#define CM_YOFFSET floorshade
#define CM_CSTAT hitag
#define CM_ANG extra
#define CM_FLOORZ(Sec) (*(int32_t *)&sector[Sec].ceilingxpanning) // ceilingxpanning,ceilingypanning,floorpicnum
#define CM_CEILINGZ(Sec) (*(int32_t *)&sector[Sec].visibility) // visibility,fogpal,lotag
// backup of original normalized coordinates
#define CM_WALL_X(Wal) (*(int32_t *)&wall[Wal].picnum) // picnum, overpicnum
#define CM_WALL_Y(Wal) (*(int32_t *)&wall[Wal].lotag) // lotag, hitag
// don't rotate when applying clipping, for models with rotational symmetry
#define CM_NOROT(Spri) (sprite[Spri].cstat&2)
#define CM_NOROTS(Sect) (sector[Sect].CM_CSTAT&2)
extern vec2_t hitscangoal;
typedef struct
{
int16_t qbeg, qend; // indices into sectq
int16_t picnum, next;
int32_t maxdist;
} clipinfo_t;
typedef struct
{
int16_t numsectors, numwalls;
usectorptr_t sector;
uwallptr_t wall;
} mapinfo_t;
extern int32_t quickloadboard;
extern void engineInitClipMaps();
extern void engineSetClipMap(mapinfo_t *bak, mapinfo_t *newmap);
#endif // HAVE_CLIPSHAPE_FEATURE
typedef struct
{
int32_t x1, y1, x2, y2;

2
source/build/include/common.h
View file

@ -64,8 +64,6 @@ static inline void realloc_copy(char **fn, const char *buf)
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens);
int32_t maybe_append_ext(char *wbuf, int32_t wbufsiz, const char *fn, const char *ext);
void COMMON_clearbackground(int32_t numcols, int32_t numrows);

9
source/build/include/compat.h
View file

@ -1045,13 +1045,4 @@ inline FVector3 GetSoundPos(const vec3_t *pos)
#define WITHKPLIB
#if DEBUGGINGAIDS>=2
# define DEBUG_MAIN_ARRAYS
#endif
#if !defined DEBUG_MAIN_ARRAYS
# define HAVE_CLIPSHAPE_FEATURE
#endif
#endif // compat_h_

883
source/build/src/clip.cpp
View file

File diff suppressed because it is too large Load diff

35
source/build/src/common.cpp
View file

@ -12,23 +12,6 @@
// def/clipmap handling
#ifdef HAVE_CLIPSHAPE_FEATURE
TArray<FString> g_clipMapFiles;
#endif
void SetClipshapes()
{
#ifdef HAVE_CLIPSHAPE_FEATURE
// pre-form the default 10 clipmaps
for (int j = '0'; j <= '9'; ++j)
{
char clipshape[16] = "_clipshape0.map";
clipshape[10] = j;
g_clipMapFiles.Push(clipshape);
}
#endif
}
//////////
@ -49,21 +32,3 @@ int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens)
return T_ERROR;
}
//////////
// Copy FN to WBUF and append an extension if it's not there, which is checked
// case-insensitively.
// Returns: 1 if not all characters could be written to WBUF, 0 else.
int32_t maybe_append_ext(char *wbuf, int32_t wbufsiz, const char *fn, const char *ext)
{
const int32_t slen=Bstrlen(fn), extslen=Bstrlen(ext);
const int32_t haveext = (slen>=extslen && Bstrcasecmp(&fn[slen-extslen], ext)==0);
Bassert((intptr_t)wbuf != (intptr_t)fn); // no aliasing
// If 'fn' has no extension suffixed, append one.
return (snprintf(wbuf, wbufsiz, "%s%s", fn, haveext ? "" : ext) >= wbufsiz);
}

6
source/build/src/engine.cpp
View file

@ -2018,9 +2018,6 @@ int32_t enginePreInit(void)
#endif
#ifdef HAVE_CLIPSHAPE_FEATURE
engineInitClipMaps();
#endif
preinitcalled = 1;
return 0;
}
@ -3532,9 +3529,6 @@ static int32_t engineFinishLoadBoard(const vec3_t *dapos, int16_t *dacursectnum,
//Must be after loading sectors, etc!
updatesector(dapos->x, dapos->y, dacursectnum);
#ifdef HAVE_CLIPSHAPE_FEATURE
if (!quickloadboard)
#endif
{
Bmemset(spriteext, 0, sizeof(spriteext_t)*MAXSPRITES);
#ifndef NEW_MAP_FORMAT

2
source/core/gamecontrol.cpp
View file

@ -105,7 +105,6 @@ FStartupInfo GameStartupInfo;
FMemArena dump; // this is for memory blocks than cannot be deallocated without some huge effort. Put them in here so that they do not register on shutdown.
InputState inputState;
void SetClipshapes();
int ShowStartupWindow(TArray<GrpEntry> &);
FString GetGameFronUserFiles();
void InitFileSystem(TArray<GrpEntry>&);
@ -731,7 +730,6 @@ int RunGame()
execLogfile(logfile);
}
I_DetectOS();
SetClipshapes();
userConfig.ProcessOptions();
G_LoadConfig();
ShutdownENet();