Remove helicopters entirely

They're far too broken and certainly not a critical feature

BUGS.txt

@@ -6,8 +6,6 @@ Tank weapon shoots from wrong place
 Ute texture wrong
 Ute easily flipped
 
-Helicopter very broken
-
 Weapon pickups too small
 
 Odd black shadow line across the map

README.md

@@ -4,7 +4,7 @@ Chaotic Rage
 [![Build Status](https://travis-ci.org/TheJosh/chaotic-rage.png?branch=master)](https://travis-ci.org/TheJosh/chaotic-rage)
 [![Coverity Scan Status](https://scan.coverity.com/projects/2787/badge.svg)](https://scan.coverity.com/projects/thejosh-chaotic-rage)
 
-Chaotic Rage is a silly little shooter game. A simple graphical style allows for a focus on gameplay. The game is very customisable with full modding support. There are a variety of game types, with scripting done in Lua. Multiple view modes - top down, behind player and first-person - allow for a unique perspective of the action. Dynamic and scriptable weather and day/night effects create a dynamic environment. The gameplay is rounded out by a number of interesting vehicles including tanks, helicopters and trains. Last but not least is a wide range of weapons including shotguns, machine guns and flame throwers.
+Chaotic Rage is a silly little shooter game. A simple graphical style allows for a focus on gameplay. The game is very customisable with full modding support. There are a variety of game types, with scripting done in Lua. Multiple view modes - top down, behind player and first-person - allow for a unique perspective of the action. Dynamic and scriptable weather and day/night effects create a dynamic environment. The gameplay is rounded out by a number of interesting vehicles including tanks, utes, and trains. Last but not least is a wide range of weapons including shotguns, machine guns and flame throwers.
 
 At the moment there are a few game types and other game content which is zombie themed. This was mostly because zombie AI is very easy to code. There is [a discussion on the forum](http://chaoticrage.com/forum/topic/6) about actually defining a proper "theme" for the game, because most people agree that zombies is a bit dated.
 
@@ -67,4 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Some content contained within this archive is covered by other
 licenses. For full authorship information, see the Git log available
 at <https://github.com/TheJosh/chaotic-rage>.
-

data/cr/vehicletypes.conf

@@ -107,18 +107,6 @@ vehicletype {
 	joint-back = { 0.0, -2.5, -6.5 }
 }
 
-vehicletype {
-	name = "helicopter"
-	model = "helicopter.dae"
-	health = 70000
-	mass = 80.0
-	helicopter = 1
-
-	node { name="Blades"  axis={ 0.0, 0.0, 1.0 }  type=3 }
-
-	weapon-primary = "timed_mine"
-}
-
 vehicletype {
 	name = "boat"
 	model = "boat.dae"
@@ -128,4 +116,3 @@ vehicletype {
 	land = 0
 	water = 1
 }
-

data/test/maps/tanktest/map.conf

@@ -7,7 +7,7 @@ light {  type = 1  x = 100  y = 100  z = 10   diffuse = {150,150,150,0} specular
 
 vehicle {  type = "tank"        x = 120   y = 120  }
 vehicle {  type = "turret"      x = 50   y = 50   }
-vehicle {  type = "helicopter"  x = 150  y = 150  }
+vehicle {  type = "train"       x = 150  y = 150  }
 vehicle {  type = "ute"         x = 150  y = 50   }
 
 zone {  width = 2  height = 2  x = 100   y = 100  angle = 0  spawn = {0, 1, 2}  }

maps/therlor_valley/map.conf

@@ -52,7 +52,7 @@ object { type = "war_fence_metal"  x = 103 y = 103 }
 
 vehicle {  type = "ute"  x = 217.27  y = 172.89  }
 vehicle {  type = "tank"  x = 123.66  y = 186.43  }
-vehicle {  type = "helicopter"  x = 112.81  y = 44.08  }
+vehicle {  type = "ute"  x = 112.81  y = 44.08  }
 
 zone {  width = 2  height = 2  x = 40  y = 40  spawn = {0, 2}  }
 zone {  width = 2  height = 2  x = 160  y = 40  spawn = {0, 2}  }

src/map/map.cpp

@@ -32,7 +32,6 @@
 #include "../game_engine.h"
 #include "../entity/object.h"
 #include "../entity/vehicle.h"
-#include "../entity/helicopter.h"
 #include "../entity/wall.h"
 #include "../entity/pickup.h"
 #include "../util/sdl_util.h"
@@ -619,11 +618,7 @@ void Map::loadDefaultEntities()
 		VehicleType *vt = GEng()->mm->getVehicleType(type);
 		if (vt == NULL) reportFatalError("Unable to load map; missing or invalid vehicle type '" + type + "'");
 
-		if (vt->helicopter) {
-			v = new Helicopter(vt, this->st, (float)cfg_getfloat(cfg_sub, "x"), (float)cfg_getfloat(cfg_sub, "y"));
-		} else {
-			v = new Vehicle(vt, this->st, (float)cfg_getfloat(cfg_sub, "x"), (float)cfg_getfloat(cfg_sub, "y"));
-		}
+		v = new Vehicle(vt, this->st, (float)cfg_getfloat(cfg_sub, "x"), (float)cfg_getfloat(cfg_sub, "y"));
 
 		tid.num = cfg_getint(cfg_sub, "train-num");
 		tid.idx = cfg_getint(cfg_sub, "train-idx");

src/mod/vehicletype.cpp

@@ -46,7 +46,6 @@ cfg_opt_t vehicletype_opts[] =
 
 	CFG_INT((char*) "land", 1, CFGF_NONE),
 	CFG_INT((char*) "water", 0, CFGF_NONE),
-	CFG_INT((char*) "helicopter", 0, CFGF_NONE),
 	CFG_INT((char*) "engine", 1, CFGF_NONE),
 	CFG_INT((char*) "steer", 1, CFGF_NONE),
 
@@ -93,7 +92,6 @@ VehicleType* loadItemVehicleType(cfg_t* cfg_item, Mod* mod)
 	wt->mass = (float)cfg_getfloat(cfg_item, "mass");
 	wt->land = (cfg_getint(cfg_item, "land") == 1);
 	wt->water = (cfg_getint(cfg_item, "water") == 1);
-	wt->helicopter = (cfg_getint(cfg_item, "helicopter") == 1);
 	wt->engine = (cfg_getint(cfg_item, "engine") == 1);
 	wt->steer = (cfg_getint(cfg_item, "steer") == 1);
 

src/mod/vehicletype.h

@@ -70,7 +70,6 @@ class VehicleType
 
 		bool land;
 		bool water;
-		bool helicopter;
 		bool engine;
 		bool steer;
 
@@ -111,4 +110,3 @@ extern cfg_opt_t vehicletype_opts [];
 
 // Item loading function handler
 VehicleType* loadItemVehicleType(cfg_t* cfg_item, Mod* mod);
-

src/net/net_client.cpp

@@ -12,7 +12,6 @@
 #include "../game_engine.h"
 #include "../entity/ammo_round.h"
 #include "../entity/entity.h"
-#include "../entity/helicopter.h"
 #include "../entity/object.h"
 #include "../entity/pickup.h"
 #include "../entity/unit/unit.h"
@@ -568,12 +567,7 @@ unsigned int NetClient::handleVehicleState(Uint8 *data, unsigned int size)
 			return 34;
 		}
 
-		if (vt->helicopter) {
-			v = new Helicopter(vt, st, trans);
-		} else {
-			v = new Vehicle(vt, st, trans);
-		}
-
+		v = new Vehicle(vt, st, trans);
 		st->addVehicle(v);
 		v->eid = eid;
 	}

src/script/lua_entity_lib.cpp

@@ -10,7 +10,6 @@
 #include "../game_engine.h"
 #include "../game_state.h"
 #include "../entity/vehicle.h"
-#include "../entity/helicopter.h"
 #include "../entity/object.h"
 #include "../entity/unit/unit.h"
 #include "../entity/unit/player.h"
@@ -75,4 +74,3 @@ void load_entity_lib(lua_State *L)
 
 	.endNamespace();
 }
-