summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/ents.h5
-rw-r--r--src/shared/geom.cpp1
-rw-r--r--src/shared/iengine.h4
-rw-r--r--src/shared/igame.h16
-rw-r--r--src/shared/stream.cpp75
-rw-r--r--src/shared/tools.h5
-rw-r--r--src/shared/zip.cpp1
7 files changed, 6 insertions, 101 deletions
diff --git a/src/shared/ents.h b/src/shared/ents.h
index 6b1dfca..fece7bf 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_PARTICLES, ET_SOUND, ET_SPOTLIGHT, ET_GAMESPECIFIC };
+enum { ET_EMPTY=0, ET_LIGHT, ET_MAPMODEL, ET_PLAYERSTART, ET_PARTICLES, ET_SOUND, ET_GAMESPECIFIC };
// persistent map entity
struct entity {
@@ -35,8 +35,7 @@ enum {
struct extentity : entity {
int flags; // the only dynamic state of a map entity
entitylight light;
- extentity *attached;
- extentity() : flags(0), attached(NULL) {}
+ extentity() : flags(0) {}
bool spawned() const { return (flags&EF_SPAWNED) != 0; }
void setspawned(bool val) { if(val) flags |= EF_SPAWNED; else flags &= ~EF_SPAWNED; }
void setspawned() { flags |= EF_SPAWNED; }
diff --git a/src/shared/geom.cpp b/src/shared/geom.cpp
index ad71841..13a75dc 100644
--- a/src/shared/geom.cpp
+++ b/src/shared/geom.cpp
@@ -235,4 +235,3 @@ extern const vec2 sincos360[721] = {
vec2(0.99452190, -0.10452846), vec2(0.99619470, -0.08715574), vec2(0.99756405, -0.06975647), vec2(0.99862953, -0.05233596), vec2(0.99939083, -0.03489950), vec2(0.99984770, -0.01745241), // 714
vec2(1.00000000, 0.00000000) // 720
};
-
diff --git a/src/shared/iengine.h b/src/shared/iengine.h
index f4e822d..3b2c662 100644
--- a/src/shared/iengine.h
+++ b/src/shared/iengine.h
@@ -186,9 +186,6 @@ extern void conoutf(int type, const char *s, ...) PRINTFARGS(2, 3);
extern void conoutf(int type, int tag, const char *s, ...) PRINTFARGS(3, 4);
extern void conoutfv(int type, const char *fmt, va_list args);
-extern FILE *getlogfile();
-extern void setlogfile(const char *fname);
-extern void closelogfile();
extern void logoutfv(const char *fmt, va_list args);
extern void logoutf(const char *fmt, ...) PRINTFARGS(1, 2);
@@ -222,7 +219,6 @@ extern int getworldsize();
extern int getmapversion();
extern void renderentcone(const extentity &e, const vec &dir, float radius, float angle);
extern void renderentarrow(const extentity &e, const vec &dir, float radius);
-extern void renderentattachment(const extentity &e);
extern void renderentsphere(const extentity &e, float radius);
extern void renderentring(const extentity &e, float radius, int axis = 0);
diff --git a/src/shared/igame.h b/src/shared/igame.h
index 03a9163..4b0e933 100644
--- a/src/shared/igame.h
+++ b/src/shared/igame.h
@@ -2,14 +2,10 @@
namespace entities {
extern void editent(int i, bool local);
- extern const char *entnameinfo(entity &e);
extern const char *entname(int i);
extern int extraentinfosize();
extern void fixentity(extentity &e);
- extern void entradius(extentity &e, bool color);
- extern bool mayattach(extentity &e);
- extern bool attachent(extentity &e, extentity &a);
- extern bool printent(extentity &e, char *buf, int len);
+ extern void entradius(extentity &e);
extern extentity *newentity();
extern void deleteentity(extentity *e);
extern void clearents();
@@ -18,7 +14,6 @@ namespace entities {
}
namespace game {
- extern void parseoptions(vector<const char *> &args);
extern void gamedisconnect(bool cleanup);
extern void parsepacketclient(int chan, packetbuf &p);
extern void connectattempt(const char *name, const char *password, const ENetAddress &address);
@@ -33,7 +28,6 @@ namespace game {
extern bool ispaused();
extern int scaletime(int t);
extern bool allowmouselook();
- extern const char *gameident();
extern const char *savedconfig();
extern const char *restoreconfig();
extern const char *defaultconfig();
@@ -42,11 +36,10 @@ namespace game {
extern void loadconfigs();
extern void updateworld();
extern void initclient();
- extern void physicstrigger(physent *d, bool local, int floorlevel, int material = 0);
+ extern void physicstrigger(physent *d, int floorlevel);
extern void bounced(physent *d, const vec &surface);
extern void edittrigger(const selinfo &sel, int op, int arg1 = 0, int arg2 = 0, int arg3 = 0, const VSlot *vs = NULL);
extern void vartrigger(ident *id);
- extern void dynentcollide(physent *d, physent *o, const vec &dir);
extern const char *getclientmap();
extern const char *getmapinfo();
extern const char *getscreenshotinfo();
@@ -54,7 +47,6 @@ namespace game {
extern void suicide(physent *d);
extern float ratespawn(dynent *d, const extentity &e);
extern void newmap(int size);
- extern void loadingmap(const char *name);
extern void startmap(const char *name);
extern void preload();
extern float abovegameplayhud(int w, int h);
@@ -67,13 +59,9 @@ namespace game {
extern void rendergame(bool mainpass);
extern void renderavatar();
extern void renderplayerpreview(int model, int team, int weap);
- extern void writegamedata(vector<char> &extras);
- extern void readgamedata(vector<char> &extras);
- extern int clipconsole(int w, int h);
extern void g3d_gamemenus();
extern const char *defaultcrosshair(int index);
extern int selectcrosshair(vec &color);
- extern void lighteffects(dynent *d, vec &color, vec &dir);
extern void setupcamera();
extern bool allowthirdperson(bool msg = false);
extern bool detachcamera();
diff --git a/src/shared/stream.cpp b/src/shared/stream.cpp
index 1878801..3a5c6e2 100644
--- a/src/shared/stream.cpp
+++ b/src/shared/stream.cpp
@@ -232,7 +232,6 @@ done:
#include <sys/types.h>
#include <dirent.h>
-string homedir = "";
struct packagedir {
char *dir, *filter;
size_t dirlen, filterlen;
@@ -260,7 +259,6 @@ char *makerelpath(const char *dir, const char *file, const char *prefix, const c
return tmp;
}
-
char *path(char *s) {
for(char *curpart = s;;) {
char *endpart = strchr(curpart, '&');
@@ -330,75 +328,8 @@ bool createdir(const char *path) {
return mkdir(path, 0777)==0;
}
-size_t fixpackagedir(char *dir) {
- path(dir);
- size_t len = strlen(dir);
- if(len > 0 && dir[len-1] != PATHDIV) {
- dir[len] = PATHDIV;
- dir[len+1] = '\0';
- }
- return len;
-}
-
-bool subhomedir(char *dst, int len, const char *src) {
- const char *sub = strstr(src, "$HOME");
- if(!sub) sub = strchr(src, '~');
- if(sub && sub-src < len) {
- const char *home = getenv("HOME");
- if(!home || !home[0]) return false;
- dst[sub-src] = '\0';
- concatstring(dst, home, len);
- concatstring(dst, sub+(*sub == '~' ? 1 : strlen("$HOME")), len);
- }
- return true;
-}
-
-const char *sethomedir(const char *dir) {
- string pdir;
- copystring(pdir, dir);
- if(!subhomedir(pdir, sizeof(pdir), dir) || !fixpackagedir(pdir)) return NULL;
- copystring(homedir, pdir);
- return homedir;
-}
-
-const char *addpackagedir(const char *dir) {
- string pdir;
- copystring(pdir, dir);
- if(!subhomedir(pdir, sizeof(pdir), dir) || !fixpackagedir(pdir)) return NULL;
- char *filter = pdir;
- for(;;) {
- static int len = strlen("packages");
- filter = strstr(filter, "packages");
- if(!filter) break;
- if(filter > pdir && filter[-1] == PATHDIV && filter[len] == PATHDIV) break;
- filter += len;
- }
- packagedir &pf = packagedirs.add();
- pf.dir = filter ? newstring(pdir, filter-pdir) : newstring(pdir);
- pf.dirlen = filter ? filter-pdir : strlen(pdir);
- pf.filter = filter ? newstring(filter) : NULL;
- pf.filterlen = filter ? strlen(filter) : 0;
- return pf.dir;
-}
-
const char *findfile(const char *filename, const char *mode) {
static string s;
- if(homedir[0]) {
- formatstring(s, "%s%s", homedir, filename);
- if(fileexists(s, mode)) return s;
- if(mode[0]=='w' || mode[0]=='a') {
- string dirs;
- copystring(dirs, s);
- char *dir = strchr(dirs[0]==PATHDIV ? dirs+1 : dirs, PATHDIV);
- while(dir) {
- *dir = '\0';
- if(!fileexists(dirs, "d") && !createdir(dirs)) return s;
- *dir = PATHDIV;
- dir = strchr(dir+1, PATHDIV);
- }
- return s;
- }
- }
if(mode[0]=='w' || mode[0]=='a') return filename;
loopv(packagedirs) {
packagedir &pf = packagedirs[i];
@@ -442,10 +373,8 @@ int listfiles(const char *dir, const char *ext, vector<char *> &files) {
int dirs = 0;
if(listdir(dirname, true, ext, files)) dirs++;
string s;
- if(homedir[0]) {
- formatstring(s, "%s%s", homedir, dirname);
- if(listdir(s, false, ext, files)) dirs++;
- }
+ formatstring(s, "%s%s", ".", dirname);
+ if(listdir(s, false, ext, files)) dirs++;
loopv(packagedirs) {
packagedir &pf = packagedirs[i];
if(pf.filter && strncmp(dirname, pf.filter, dirlen == pf.filterlen-1 ? dirlen : pf.filterlen))
diff --git a/src/shared/tools.h b/src/shared/tools.h
index 709f056..6e7eeab 100644
--- a/src/shared/tools.h
+++ b/src/shared/tools.h
@@ -1012,17 +1012,12 @@ static inline uchar cubeupper(uchar c) {
extern size_t decodeutf8(uchar *dst, size_t dstlen, const uchar *src, size_t srclen, size_t *carry = NULL);
extern size_t encodeutf8(uchar *dstbuf, size_t dstlen, const uchar *srcbuf, size_t srclen, size_t *carry = NULL);
-extern string homedir;
-
extern char *makerelpath(const char *dir, const char *file, const char *prefix = NULL, const char *cmd = NULL);
extern char *path(char *s);
extern char *path(const char *s, bool copy);
extern const char *parentdir(const char *directory);
extern bool fileexists(const char *path, const char *mode);
extern bool createdir(const char *path);
-extern size_t fixpackagedir(char *dir);
-extern const char *sethomedir(const char *dir);
-extern const char *addpackagedir(const char *dir);
extern const char *findfile(const char *filename, const char *mode);
extern bool findzipfile(const char *filename);
extern stream *openrawfile(const char *filename, const char *mode);
diff --git a/src/shared/zip.cpp b/src/shared/zip.cpp
index c60ea16..98ac8fb 100644
--- a/src/shared/zip.cpp
+++ b/src/shared/zip.cpp
@@ -200,7 +200,6 @@ static void mountzip(ziparchive &arch, vector<zipfile> &files, const char *mount
string mdir = "", fname;
if(mountdir) {
copystring(mdir, mountdir);
- if(fixpackagedir(mdir) <= 1) mdir[0] = '\0';
}
loopv(files) {
zipfile &f = files[i];
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-21 07:42:40 +0000