summaryrefslogtreecommitdiff
path: root/src/fpsgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/fpsgame')
-rw-r--r--src/fpsgame/ai.h1
-rw-r--r--src/fpsgame/entities.cpp12
-rw-r--r--src/fpsgame/fps.cpp26
-rw-r--r--src/fpsgame/game.h3
-rw-r--r--src/fpsgame/scoreboard.cpp1
-rw-r--r--src/fpsgame/server.cpp21
6 files changed, 6 insertions, 58 deletions
diff --git a/src/fpsgame/ai.h b/src/fpsgame/ai.h
index b6db1fc..40c8513 100644
--- a/src/fpsgame/ai.h
+++ b/src/fpsgame/ai.h
@@ -236,4 +236,3 @@ namespace ai {
extern void render();
}
-
diff --git a/src/fpsgame/entities.cpp b/src/fpsgame/entities.cpp
index 9336c4e..21d44a6 100644
--- a/src/fpsgame/entities.cpp
+++ b/src/fpsgame/entities.cpp
@@ -9,8 +9,6 @@ namespace entities {
#ifndef STANDALONE
vector<extentity *> ents;
vector<extentity *> &getents() { return ents; }
- bool mayattach(extentity &e) { return false; }
- bool attachent(extentity &e, extentity &a) { return false; }
const char *itemname(int i) {
int t = ents[i]->type;
if(t<I_SHELLS || t>I_QUAD) return NULL;
@@ -306,7 +304,7 @@ namespace entities {
void fixentity(extentity &e) {
if(e.type == TELEDEST) e.attr3 = e.attr2;
}
- void entradius(extentity &e, bool color) {
+ void entradius(extentity &e) {
switch(e.type) {
case TELEDEST: {
vec dir;
@@ -326,13 +324,9 @@ namespace entities {
default: break;
}
}
- bool printent(extentity &e, char *buf, int len) {
- return false;
- }
- const char *entnameinfo(entity &e) { return ""; }
const char *entname(int i) {
static const char * const entnames[] = {
- "none?", "light", "mapmodel", "playerstart", "none?", "particles", "sound", "spotlight",
+ "none?", "light", "mapmodel", "playerstart", "none?", "particles", "sound",
"shells", "bullets", "rockets", "riflerounds", "grenades", "cartridges",
"health", "healthboost", "tinyhealth", "tinyarmour", "greenarmour", "yellowarmour", "quaddamage",
"teleport", "teledest",
@@ -345,7 +339,5 @@ namespace entities {
extentity &e = *ents[i];
if(local) addmsg(N_EDITENT, "rii3ii5", i, (int)(e.o.x*DMF), (int)(e.o.y*DMF), (int)(e.o.z*DMF), e.type, e.attr1, e.attr2, e.attr3, e.attr4, e.attr5);
}
-
#endif
}
-
diff --git a/src/fpsgame/fps.cpp b/src/fpsgame/fps.cpp
index c74f5f4..eadb2c8 100644
--- a/src/fpsgame/fps.cpp
+++ b/src/fpsgame/fps.cpp
@@ -9,7 +9,6 @@ namespace game {
fpsent *player1 = NULL; // our client
vector<fpsent *> players; // other clients
int savedammo[NUMGUNS];
- bool clientoption(const char *arg) { return false; }
void taunt() {
if(player1->state!=CS_ALIVE || player1->physstate<PHYS_SLOPE) return;
if(lastmillis-player1->lasttaunt<1000) return;
@@ -454,9 +453,6 @@ namespace game {
lasthit = 0;
execident("mapstart");
}
- void loadingmap(const char *name) {
- execident("playsong");
- }
void startmap(const char *name) { // called just after a map load {
pwreset();
ai::savewaypoints();
@@ -474,14 +470,11 @@ namespace game {
const char *getscreenshotinfo() {
return server::modename(gamemode, NULL);
}
- void physicstrigger(physent *d, bool local, int floorlevel, int material) {
+ void physicstrigger(physent *d, int floorlevel) {
if(d->type==ENT_INANIMATE) return;
- if (floorlevel>0) { if(d==player1 || d->type!=ENT_PLAYER || ((fpsent *)d)->ai) msgsound(S_JUMP, d); }
+ if (floorlevel>0) { if(d==player1 || d->type!=ENT_PLAYER || ((fpsent *)d)->ai) msgsound(S_JUMP, d); }
else if(floorlevel<0) { if(d==player1 || d->type!=ENT_PLAYER || ((fpsent *)d)->ai) msgsound(S_LAND, d); }
}
- void dynentcollide(physent *d, physent *o, const vec &dir) {
- return;
- }
void msgsound(int n, physent *d) {
if(!d || d==player1) {
addmsg(N_SOUND, "ci", d, n);
@@ -564,6 +557,7 @@ namespace game {
gle::end();
}
float abovegameplayhud(int w, int h) {
+ (void)w;(void)h;
switch(hudplayer()->state) {
case CS_EDITING:
case CS_SPECTATOR:
@@ -888,9 +882,6 @@ namespace game {
pophudmatrix();
}
}
- int clipconsole(int w, int h) {
- return 0;
- }
VARP(teamcrosshair, 0, 1, 1);
VARP(hitcrosshair, 0, 425, 1000);
const char *defaultcrosshair(int index) {
@@ -920,15 +911,6 @@ namespace game {
if(d->gunwait) color.mul(0.5f);
return crosshair;
}
- void lighteffects(dynent *e, vec &color, vec &dir) {
-#if 0
- fpsent *d = (fpsent *)e;
- if(d->state!=CS_DEAD && d->quadmillis) {
- float t = 0.5f + 0.5f*sinf(2*M_PI*lastmillis/1000.0f);
- color.y = color.y*(1-t) + t;
- }
-#endif
- }
int maxsoundradius(int n) {
switch(n) {
case S_JUMP:
@@ -1038,8 +1020,6 @@ namespace game {
return false;
}
// any data written into this vector will get saved with the map data. Must take care to do own versioning, and endianess if applicable. Will not get called when loading maps from other games, so provide defaults.
- void writegamedata(vector<char> &extras) {}
- void readgamedata(vector<char> &extras) {}
const char *savedconfig() { return "config.cfg"; }
const char *restoreconfig() { return "restore.cfg"; }
const char *defaultconfig() { return "data/defaults.cfg"; }
diff --git a/src/fpsgame/game.h b/src/fpsgame/game.h
index 974f1f3..dadebd5 100644
--- a/src/fpsgame/game.h
+++ b/src/fpsgame/game.h
@@ -26,7 +26,6 @@ enum { // static entity types {
PLAYERSTART, // attr1 = angle, attr2 = team
PARTICLES = ET_PARTICLES,
MAPSOUND = ET_SOUND,
- SPOTLIGHT = ET_SPOTLIGHT,
I_SHELLS, I_BULLETS, I_ROCKETS, I_ROUNDS, I_GRENADES, I_CARTRIDGES,
I_HEALTH, I_BOOST,
/**/I_TINYHEALTH, I_TINYARMOUR,
@@ -510,7 +509,6 @@ namespace game {
extern int respawnent;
extern int following;
extern int smoothmove, smoothdist;
- extern bool clientoption(const char *arg);
extern fpsent *getclient(int cn);
extern fpsent *newclient(int cn);
extern const char *colorname(fpsent *d, const char *name = NULL, const char *prefix = "", const char *suffix = "", const char *alt = NULL);
@@ -613,7 +611,6 @@ namespace server {
extern void forcegamespeed(int speed);
extern void hashpassword(int cn, int sessionid, const char *pwd, char *result, int maxlen = MAXSTRLEN);
extern int msgsizelookup(int msg);
- extern bool serveroption(const char *arg);
extern bool delayspawn(int type);
}
diff --git a/src/fpsgame/scoreboard.cpp b/src/fpsgame/scoreboard.cpp
index 81f93a1..b1c7477 100644
--- a/src/fpsgame/scoreboard.cpp
+++ b/src/fpsgame/scoreboard.cpp
@@ -112,6 +112,7 @@ namespace game {
return color;
}
void renderscoreboard(g3d_gui &g, bool firstpass) {
+ (void) firstpass;
const ENetAddress *address = connectedpeer();
if(showservinfo && address) {
string hostname;
diff --git a/src/fpsgame/server.cpp b/src/fpsgame/server.cpp
index 2095dd1..7070fb8 100644
--- a/src/fpsgame/server.cpp
+++ b/src/fpsgame/server.cpp
@@ -1,17 +1,5 @@
#include "game.h"
-namespace game {
- void parseoptions(vector<const char *> &args) {
- loopv(args)
-#ifndef STANDALONE
- if(!game::clientoption(args[i]))
-#endif
- if(!server::serveroption(args[i]))
- conoutf(CON_ERROR, "unknown command-line option: %s", args[i]);
- }
- const char *gameident() { return "fps"; }
-}
-
VAR(regenbluearmour, 0, 1, 1);
extern ENetAddress masteraddress;
@@ -573,15 +561,6 @@ namespace server {
sents.setsize(0);
//cps.reset();
}
- bool serveroption(const char *arg) {
- if(arg[0]=='-') switch(arg[1]) {
- case 'n': setsvar("serverdesc", &arg[2]); return true;
- case 'y': setsvar("serverpass", &arg[2]); return true;
- case 'p': setsvar("adminpass", &arg[2]); return true;
- case 'o': setvar("publicserver", atoi(&arg[2])); return true;
- }
- return false;
- }
void serverinit() {
smapname[0] = '\0';
resetitems();
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-21 06:34:05 +0000