From 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 12 Feb 2011 12:40:36 +0200 Subject: Refactoring & fixed WEAPONSPEC_GUN in content.py --- datasrc/content.py | 2 +- datasrc/network.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'datasrc') diff --git a/datasrc/content.py b/datasrc/content.py index 0b55bc68..8a971d8c 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -150,7 +150,7 @@ class Weapons(Struct): def __init__(self): Struct.__init__(self, "WEAPONSPECS") self.hammer = Weapon_Hammer() - self.gun = Weapon_Hammer() + self.gun = Weapon_Gun() self.shotgun = Weapon_Shotgun() self.grenade = Weapon_Grenade() self.rifle = Weapon_Rifle() diff --git a/datasrc/network.py b/datasrc/network.py index 9b153016..656a1d84 100644 --- a/datasrc/network.py +++ b/datasrc/network.py @@ -147,7 +147,7 @@ Objects = [ NetObject("PlayerInfo", [ NetIntRange("m_Local", 0, 1), - NetIntRange("m_ClientId", 0, 'MAX_CLIENTS-1'), + NetIntRange("m_ClientID", 0, 'MAX_CLIENTS-1'), NetIntRange("m_Team", 'TEAM_SPECTATORS', 'TEAM_BLUE'), NetIntAny("m_Score"), @@ -183,15 +183,15 @@ Objects = [ NetEvent("HammerHit:Common", []), NetEvent("Death:Common", [ - NetIntRange("m_ClientId", 0, 'MAX_CLIENTS-1'), + NetIntRange("m_ClientID", 0, 'MAX_CLIENTS-1'), ]), NetEvent("SoundGlobal:Common", [ - NetIntRange("m_SoundId", 0, 'NUM_SOUNDS-1'), + NetIntRange("m_SoundID", 0, 'NUM_SOUNDS-1'), ]), NetEvent("SoundWorld:Common", [ - NetIntRange("m_SoundId", 0, 'NUM_SOUNDS-1'), + NetIntRange("m_SoundID", 0, 'NUM_SOUNDS-1'), ]), NetEvent("DamageInd:Common", [ @@ -212,7 +212,7 @@ Messages = [ NetMessage("Sv_Chat", [ NetIntRange("m_Team", 'TEAM_SPECTATORS', 'TEAM_BLUE'), - NetIntRange("m_Cid", -1, 'MAX_CLIENTS-1'), + NetIntRange("m_ClientID", -1, 'MAX_CLIENTS-1'), NetString("m_pMessage"), ]), @@ -224,7 +224,7 @@ Messages = [ ]), NetMessage("Sv_SoundGlobal", [ - NetIntRange("m_Soundid", 0, 'NUM_SOUNDS-1'), + NetIntRange("m_SoundID", 0, 'NUM_SOUNDS-1'), ]), NetMessage("Sv_TuneParams", []), @@ -236,7 +236,7 @@ Messages = [ ]), NetMessage("Sv_Emoticon", [ - NetIntRange("m_Cid", 0, 'MAX_CLIENTS-1'), + NetIntRange("m_ClientID", 0, 'MAX_CLIENTS-1'), NetIntRange("m_Emoticon", 0, 'NUM_EMOTICONS-1'), ]), -- cgit 1.4.1