From 241dfc3401841ec17cd47a512f1622b2b5793432 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Fri, 18 Apr 2008 11:30:10 +0000
Subject: [PATCH] gcc compile fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1802 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/entities.cpp | 26 --------------------------
 source/src/entity.h     |  3 ++-
 source/src/pch.h        |  3 ++-
 source/src/weapon.cpp   |  2 +-
 source/src/weapon.h     |  5 +++--
 5 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index b319b53c..21347bf0 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -3,32 +3,6 @@
 #include "pch.h"
 #include "cube.h"
 
-
-grenadeent::grenadeent (playerent *owner, int millis)
-{
-    ASSERT(owner);
-    bounceent::owner = owner;
-    bounceent::millis = lastmillis;
-    timetolife = 2000-millis;
-    bouncestate = NADE_ACTIVATED;
-    maxspeed = 27.0f;
-    rotspeed = 6.0f;
-}
-
-void grenadeent::explode()
-{
-    static vec n(0,0,0);
-    if(bouncestate != NADE_THROWED) owner->weapons[GUN_GRENADE]->attack(n);
-    playsound(S_FEXPLODE, &o);
-    newprojectile(o, o, 1, owner==player1, owner, GUN_GRENADE, millis);
-}
-
-void grenadeent::destroy()
-{
-    if(bouncestate==NADE_ACTIVATED || bouncestate==NADE_THROWED) explode();
-}
-
-
 vector<entity> ents;
 
 const char *entnames[] =
diff --git a/source/src/entity.h b/source/src/entity.h
index ec5db7c7..107db5d1 100644
--- a/source/src/entity.h
+++ b/source/src/entity.h
@@ -464,4 +464,5 @@ struct grenadeent : bounceent
     grenadeent (playerent *owner, int millis = 0);
     void explode();
     virtual void destroy();
-};
\ No newline at end of file
+};
+
diff --git a/source/src/pch.h b/source/src/pch.h
index 5f924215..bb41d088 100644
--- a/source/src/pch.h
+++ b/source/src/pch.h
@@ -46,4 +46,5 @@
 #endif
 
 #include <zlib.h>
-#include <enet/enet.h>
\ No newline at end of file
+#include <enet/enet.h>
+
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 75ba08b1..306b5828 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -912,7 +912,7 @@ bool subgun::selectable() { return weapon::selectable() && !m_noprimary && this
 
 // sniperrifle
 
-sniperrifle::sniperrifle(playerent *owner) : scoped(false), gun(owner, GUN_SNIPER) {}
+sniperrifle::sniperrifle(playerent *owner) : gun(owner, GUN_SNIPER), scoped(false) {}
 
 void sniperrifle::attackfx(vec &from, vec &to, int millis)
 {
diff --git a/source/src/weapon.h b/source/src/weapon.h
index 401c8521..1e63bdb9 100644
--- a/source/src/weapon.h
+++ b/source/src/weapon.h
@@ -70,7 +70,7 @@ struct grenades : weapon
 
 struct gun : weapon
 {
-    gun::gun(playerent *owner, int type);
+    gun(playerent *owner, int type);
     virtual bool attack(vec &targ);
     virtual void attackfx(vec &from, vec &to, int millis);
     int modelanim();
@@ -159,4 +159,5 @@ struct knife : weapon
     void drawstats();
     void attackfx(vec &from, vec &to, int millis);
     void renderstats();
-};
\ No newline at end of file
+};
+