From 6762e292d02e37a69a807e01493d4e14319cca33 Mon Sep 17 00:00:00 2001 From: xolatile Date: Tue, 5 Aug 2025 01:05:35 +0200 Subject: Do not compile, deleting stuff... --- src/shared/ents.h | 2 +- src/shared/iengine.h | 9 --------- src/shared/igame.h | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src/shared') diff --git a/src/shared/ents.h b/src/shared/ents.h index ac6fa39..57e23fe 100644 --- a/src/shared/ents.h +++ b/src/shared/ents.h @@ -3,7 +3,7 @@ // ET_*: the only static entity types dictated by the engine... rest are gamecode dependent -enum { ET_EMPTY=0, ET_LIGHT, ET_MAPMODEL, ET_PLAYERSTART, ET_ENVMAP, ET_PARTICLES, ET_SOUND, ET_SPOTLIGHT, ET_GAMESPECIFIC }; +enum { ET_EMPTY=0, ET_LIGHT, ET_MAPMODEL, ET_PLAYERSTART, ET_NOENVMAP, ET_PARTICLES, ET_SOUND, ET_SPOTLIGHT, ET_GAMESPECIFIC }; struct entity // persistent map entity { diff --git a/src/shared/iengine.h b/src/shared/iengine.h index bc2f7a9..9f5dbb5 100644 --- a/src/shared/iengine.h +++ b/src/shared/iengine.h @@ -10,12 +10,10 @@ extern int gamespeed, paused; enum { MATF_INDEX_SHIFT = 0, - MATF_VOLUME_SHIFT = 2, MATF_CLIP_SHIFT = 5, MATF_FLAG_SHIFT = 8, MATF_INDEX = 3 << MATF_INDEX_SHIFT, - MATF_VOLUME = 7 << MATF_VOLUME_SHIFT, MATF_CLIP = 7 << MATF_CLIP_SHIFT, MATF_FLAGS = 0xFF << MATF_FLAG_SHIFT }; @@ -23,9 +21,6 @@ enum enum // cube empty-space materials { MAT_AIR = 0, // the default, fill the empty space with air - MAT_WATER = 1 << MATF_VOLUME_SHIFT, // fill with water, showing waves at the surface - MAT_LAVA = 2 << MATF_VOLUME_SHIFT, // fill with lava - MAT_GLASS = 3 << MATF_VOLUME_SHIFT, // behaves like clip but is blended blueish MAT_NOCLIP = 1 << MATF_CLIP_SHIFT, // collisions always treat cube as empty MAT_CLIP = 2 << MATF_CLIP_SHIFT, // collisions always treat cube as solid @@ -35,10 +30,6 @@ enum // cube empty-space materials MAT_ALPHA = 4 << MATF_FLAG_SHIFT // alpha blended }; -#define isliquid(mat) ((mat)==MAT_WATER || (mat)==MAT_LAVA) -#define isclipped(mat) ((mat)==MAT_GLASS) -#define isdeadly(mat) ((mat)==MAT_LAVA) - extern void lightent(extentity &e, float height = 8.0f); extern void lightreaching(const vec &target, vec &color, vec &dir, bool fast = false, extentity *e = 0, float ambient = 0.4f); extern entity *brightestlight(const vec &target, const vec &dir); diff --git a/src/shared/igame.h b/src/shared/igame.h index 1e7821a..0bb91c7 100644 --- a/src/shared/igame.h +++ b/src/shared/igame.h @@ -6,8 +6,6 @@ namespace entities extern const char *entnameinfo(entity &e); extern const char *entname(int i); extern int extraentinfosize(); - extern void writeent(entity &e, char *buf); - extern void readent(entity &e, char *buf, int ver); extern void fixentity(extentity &e); extern void entradius(extentity &e, bool color); extern bool mayattach(extentity &e); -- cgit v1.2.3