From b07cc717d4cbb0458101c1e715369da15f404eb7 Mon Sep 17 00:00:00 2001
From: btd <bardadymchik@gmail.com>
Date: Mon, 4 Oct 2010 11:45:10 +0400
Subject: [PATCH] Fix plasmas

---
 src/game/server/entities/gun.cpp   | 2 +-
 src/game/server/entities/gun.h     | 4 ++--
 src/game/server/gamecontroller.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/server/entities/gun.cpp b/src/game/server/entities/gun.cpp
index 8126b5569..ee30e552a 100644
--- a/src/game/server/entities/gun.cpp
+++ b/src/game/server/entities/gun.cpp
@@ -12,7 +12,7 @@ const int RANGE=700;
 //////////////////////////////////////////////////
 // CGun
 //////////////////////////////////////////////////
-CGun::CGun(CGameWorld *pGameWorld, vec2 Pos, int Freeze, bool Explosive)
+CGun::CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive)
 : CEntity(pGameWorld, NETOBJTYPE_LASER)
 {
 	m_Delay = Server()->TickSpeed()*0.3f;
diff --git a/src/game/server/entities/gun.h b/src/game/server/entities/gun.h
index 264a29f98..61e39ddc8 100644
--- a/src/game/server/entities/gun.h
+++ b/src/game/server/entities/gun.h
@@ -13,14 +13,14 @@ class CGun : public CEntity
 	int m_EvalTick;
 
 	vec2 m_Core;
-	 int m_Freeze;
+	 bool m_Freeze;
 	 bool m_Explosive;
 
 	void Fire();
 	int m_Delay;
 	
 public:
-	CGun(CGameWorld *pGameWorld, vec2 Pos, int Freeze, bool Explosive);
+	CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive);
 
 	virtual void Reset();
 	virtual void Tick();
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 106451099..445e6c72e 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -273,19 +273,19 @@ bool IGameController::OnEntity(int Index, vec2 Pos, bool Front)
    }
    else if(Index==ENTITY_PLASMAE)
    {
-       new CGun(&GameServer()->m_World, Pos, 0, true);
+       new CGun(&GameServer()->m_World, Pos, false, true);
    }
    else if(Index==ENTITY_PLASMAF)
    {
-       new CGun(&GameServer()->m_World, Pos, 1, false);
+       new CGun(&GameServer()->m_World, Pos, true, false);
    }
    else if(Index==ENTITY_PLASMA)
    {
-       new CGun(&GameServer()->m_World, Pos, 1, true);
+       new CGun(&GameServer()->m_World, Pos, true, true);
    }
    else if(Index==ENTITY_PLASMAU)
    {
-       new CGun(&GameServer()->m_World, Pos, -1, false);
+       new CGun(&GameServer()->m_World, Pos, false, false);
    }
 	if(Type != -1)
 	{