-/**
- * Purpose: common client state, usable on client and server
- * Client: singleton representing the viewed player
- * Server: instance per client
- */
-CLASS(ClientState, Object)
- ATTRIB(ClientState, m_client, entity, NULL)
- CONSTRUCTOR(ClientState, entity client)
- {
- CONSTRUCT(ClientState);
- this.m_client = client;
- }
-ENDCLASS(ClientState)
-
-.ClientState _cs;
-
-#if NDEBUG
-#define CS(this) (this._cs)
-#else
-ClientState CS(entity this) { assert(IS_CLIENT(this)); assert(this._cs); return this._cs; }
-#endif
-
-void ClientState_attach(entity this)
-{
- this._cs = NEW(ClientState, this);
-}
-
-void ClientState_detach(entity this)
-{
- remove(CS(this));
- this._cs = NULL;
-}
-
-
+#pragma once
/**
* Purpose: common player state, usable on client and server
* Server: instance per client, clients decoupled from players
*/
CLASS(PlayerState, Object)
- ATTRIB(PlayerState, m_client, entity, NULL)
+ ATTRIB(PlayerState, m_client, entity);
CONSTRUCTOR(PlayerState, entity client)
{
CONSTRUCT(PlayerState);
this.m_client = client;
}
- ATTRIB(PlayerState, m_switchingweapon, Weapon, Weapons_from(-1))
- ATTRIB(PlayerState, m_switchweapon, Weapon, Weapons_from(-1))
- ATTRIB(PlayerState, m_weapon, Weapon, Weapons_from(-1))
- METHOD(PlayerState, ps_push, void(PlayerState this))
+ ATTRIB(PlayerState, m_switchingweapon, Weapon, Weapons_from(-1));
+ ATTRIB(PlayerState, m_switchweapon, Weapon, Weapons_from(-1));
+ ATTRIB(PlayerState, m_weapon, Weapon, Weapons_from(-1));
+ METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
{
- STAT(SWITCHINGWEAPON, this.m_client) = this.m_switchingweapon.m_id;
- STAT(SWITCHWEAPON, this.m_client) = this.m_switchweapon.m_id;
+ TC(PlayerState, this);
+ STAT(ACTIVEWEAPON, cl) = this.m_weapon.m_id;
+ STAT(SWITCHINGWEAPON, cl) = this.m_switchingweapon.m_id;
+ STAT(SWITCHWEAPON, cl) = this.m_switchweapon.m_id;
}
ENDCLASS(PlayerState)
.PlayerState _ps;
+#define PS(this) ((this)._ps)
+
+// TODO: renew on death
+void PlayerState_attach(entity this);
+void PlayerState_detach(entity this);
+
+/**
+ * Purpose: common client state, usable on client and server
+ * Client: singleton representing the viewed player
+ * Server: instance per client
+ */
+CLASS(ClientState, Object)
+ ATTRIB(ClientState, m_client, entity);
+ CONSTRUCTOR(ClientState, entity client)
+ {
+ CONSTRUCT(ClientState);
+ this.m_client = client;
+ }
+ENDCLASS(ClientState)
+
+.ClientState _cs;
+
#if NDEBUG
-#define PS(this) (this._ps)
+ #define CS(this) (this._cs)
#else
-PlayerState PS(entity this) { assert(IS_CLIENT(this)); return this._ps; }
+ ClientState CS(Client this) { TC(Client, this); assert(this._cs); return this._cs; }
#endif
-void PlayerState_attach(entity this)
-{
- this._ps = NEW(PlayerState, this);
-}
-
-void PlayerState_detach(entity this)
-{
- if (!PS(this)) return; // initial connect
- remove(PS(this));
- this._ps = NULL;
-}
+void ClientState_attach(entity this);
+void ClientState_detach(entity this);