Optimize Draw_CylindricLine: replace a normalize call with a cheaper division, avoid...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qh

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index bd42503250027f29e0879607ae93296dcc5513f4..df39de0c45c3659384afa39f156832e7a7117816 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -72,7 +72,9 @@ float autocvar_sv_player_scale;
 .int spectatee_status;
 .bool zoomstate;
 
 .int spectatee_status;
 .bool zoomstate;
 

+.bool team_selected;

 .bool just_joined;
 .bool just_joined;

+.bool wants_join;

 
 .int pressedkeys;
 
 
 .int pressedkeys;
 


@@ -83,9 +85,6 @@ float autocvar_sv_player_scale;
 
 void ClientState_attach(entity this);
 
 
 void ClientState_attach(entity this);
 

-IntrusiveList g_players;
-STATIC_INIT(g_players) { g_players = IL_NEW(); }
-

 CLASS(Client, Object)
     /** Client name */
     ATTRIB(Client, netname, string, this.netname);
 CLASS(Client, Object)
     /** Client name */
     ATTRIB(Client, netname, string, this.netname);


@@ -161,6 +160,7 @@ CLASS(Client, Object)
     ATTRIB(Client, teamkill_soundsource, entity, this.teamkill_soundsource);
     ATTRIB(Client, usekeypressed, bool, this.usekeypressed);
     ATTRIB(Client, jointime, float, this.jointime);
     ATTRIB(Client, teamkill_soundsource, entity, this.teamkill_soundsource);
     ATTRIB(Client, usekeypressed, bool, this.usekeypressed);
     ATTRIB(Client, jointime, float, this.jointime);

+    ATTRIB(Client, wants_join, bool, this.wants_join);

     ATTRIB(Client, spectatortime, float, this.spectatortime);
     ATTRIB(Client, startplaytime, float, this.startplaytime);
     ATTRIB(Client, version_nagtime, float, this.version_nagtime);
     ATTRIB(Client, spectatortime, float, this.spectatortime);
     ATTRIB(Client, startplaytime, float, this.startplaytime);
     ATTRIB(Client, version_nagtime, float, this.version_nagtime);


@@ -207,7 +207,8 @@ CLASS(Client, Object)
     ATTRIB(Client, cvar_cl_pokenade_type, string, this.cvar_cl_pokenade_type);
     ATTRIB(Client, cvar_cl_spawn_near_teammate, bool, this.cvar_cl_spawn_near_teammate);
     ATTRIB(Client, cvar_cl_gunalign, int, this.cvar_cl_gunalign);
     ATTRIB(Client, cvar_cl_pokenade_type, string, this.cvar_cl_pokenade_type);
     ATTRIB(Client, cvar_cl_spawn_near_teammate, bool, this.cvar_cl_spawn_near_teammate);
     ATTRIB(Client, cvar_cl_gunalign, int, this.cvar_cl_gunalign);

-    ATTRIB(Client, cvar_cl_handicap, float, this.cvar_cl_handicap);
+    ATTRIB(Client, cvar_cl_handicap_damage_given, float, this.cvar_cl_handicap_damage_given);
+    ATTRIB(Client, cvar_cl_handicap_damage_taken, float, this.cvar_cl_handicap_damage_taken);

     ATTRIB(Client, cvar_cl_clippedspectating, bool, this.cvar_cl_clippedspectating);
     ATTRIB(Client, cvar_cl_autoscreenshot, int, this.cvar_cl_autoscreenshot);
     ATTRIB(Client, cvar_cl_jetpack_jump, bool, this.cvar_cl_jetpack_jump);
     ATTRIB(Client, cvar_cl_clippedspectating, bool, this.cvar_cl_clippedspectating);
     ATTRIB(Client, cvar_cl_autoscreenshot, int, this.cvar_cl_autoscreenshot);
     ATTRIB(Client, cvar_cl_jetpack_jump, bool, this.cvar_cl_jetpack_jump);


@@ -278,10 +279,8 @@ CLASS(Player, Client)
 
     INIT(Player) {
         this.classname = STR_PLAYER;
 
     INIT(Player) {
         this.classname = STR_PLAYER;

-        IL_PUSH(g_players, this);

     }
     DESTRUCTOR(Player) {
     }
     DESTRUCTOR(Player) {

-        IL_REMOVE(g_players, this);

     }
 ENDCLASS(Player)
 
     }
 ENDCLASS(Player)
 


@@ -366,8 +365,6 @@ bool PlayerInIPList(entity p, string iplist);
 
 void ClientData_Touch(entity e);
 
 
 void ClientData_Touch(entity e);
 

-int nJoinAllowed(entity this, entity ignore);
-

 void PlayerUseKey(entity this);
 
 void FixClientCvars(entity e);
 void PlayerUseKey(entity this);
 
 void FixClientCvars(entity e);


@@ -404,8 +401,12 @@ void ClientInit_misc(entity this);
 int GetPlayerLimit();
 
 const int MIN_SPEC_TIME = 1;
 int GetPlayerLimit();
 
 const int MIN_SPEC_TIME = 1;

+void Join(entity this, bool queued_join);
+int nJoinAllowed(entity this, entity ignore);
+bool queuePlayer(entity this, int team_index);

 bool joinAllowed(entity this);
 bool joinAllowed(entity this);

-void Join(entity this);
+
+void PlayerFrame (entity this);

 
 #define SPECTATE_COPY() ACCUMULATE void SpectateCopy(entity this, entity spectatee)
 #define SPECTATE_COPYFIELD(fld) SPECTATE_COPY() { this.(fld) = spectatee.(fld); }
 
 #define SPECTATE_COPY() ACCUMULATE void SpectateCopy(entity this, entity spectatee)
 #define SPECTATE_COPYFIELD(fld) SPECTATE_COPY() { this.(fld) = spectatee.(fld); }