366

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index f42c67eda890a8b689987118d40e469f10ef3ad7..5439f50655ad5fd63de08ab23ea405ce46c5eeef 100644 (file)
--- a/server.h
+++ b/server.h
@@ -77,7 +77,7 @@ typedef struct
        // LordHavoc: precaches are now MAX_QPATH rather than a pointer
        // updated by SV_SoundIndex
        char sound_precache[MAX_SOUNDS][MAX_QPATH];
-       char *lightstyles[MAX_LIGHTSTYLES];
+       char lightstyles[MAX_LIGHTSTYLES][64];
        int num_edicts;
        int max_edicts;
        // small edict_t structures which just contain pointers
@@ -160,6 +160,8 @@ typedef struct client_s
        char name[64], old_name[64];
        int colors, old_colors;
        int frags, old_frags;
+       char playermodel[MAX_QPATH], old_model[MAX_QPATH];
+       char playerskin[MAX_QPATH], old_skin[MAX_QPATH];
 
        // visibility state
        float visibletime[MAX_EDICTS];
@@ -275,9 +277,10 @@ extern cvar_t sv_gameplayfix_stepdown;
 extern cvar_t sv_gameplayfix_stepwhilejumping;
 extern cvar_t sv_gameplayfix_swiminbmodels;
 extern cvar_t sv_gameplayfix_setmodelrealbox;
+extern cvar_t sv_gameplayfix_blowupfallenzombies;
+extern cvar_t sv_gameplayfix_findradiusdistancetobox;
 
-extern mempool_t *sv_clients_mempool;
-extern mempool_t *sv_edicts_mempool;
+extern mempool_t *sv_mempool;
 
 // persistant server info
 extern server_static_t svs;
@@ -294,7 +297,7 @@ void SV_Init (void);
 
 void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count);
 void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate);
-void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, float attenuation);
+void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume, float attenuation);
 
 void SV_ConnectClient (int clientnum, netconn_t *netconnection);
 void SV_DropClient (qboolean crash);
@@ -308,8 +311,8 @@ void SV_ReadClientMessage(void);
 // 0 = fail if not precached,
 // 1 = warn if not found and precache if possible
 // 2 = precache
-int SV_ModelIndex(char *s, int precachemode);
-int SV_SoundIndex(char *s, int precachemode);
+int SV_ModelIndex(const char *s, int precachemode);
+int SV_SoundIndex(const char *s, int precachemode);
 
 void SV_SetIdealPitch (void);