game launch code bugfix

3 files changed, 33 insertions, 36 deletions

diff --git a/doc/GAMEPLAY b/doc/GAMEPLAY
index 6774968..54766ad 100644
--- a/doc/GAMEPLAY
+++ b/doc/GAMEPLAY
@@ -7,7 +7,7 @@
 
 	This document describes what the gameplay of Project::OSiRiON should
 	eventually become. This document is a work in progress and is subject
-	to change.
+	to change. Many features haven't been implemented yet.
 
 Overview
 
@@ -23,7 +23,6 @@ Overview
 	The player can not change the game world itself: he can not purchase 
 	planets or starbases, nor destroy existing ones.
 
-
 Guidelines
 
 	Project::OSiRiON is a 'serious' game. Names of objects, people and
@@ -47,9 +46,7 @@ Universe
 	The universe is a collection of stand-alone star systems. Each star system
 	is a small world on its own. The only direct interaction between systems
 	is a player traveling between them. The background story should provide
-	(most of the) star systems and their relations. The game world is static:
-	players can not intentionally destroyed planets, stations or other static
-	scenery.
+	(most of the) star systems and their relations. 
 
 	The Project::OSiRiON universe is an open universe. This means players are
 	free to travel around and visit the places they want, but this does not
@@ -84,7 +81,7 @@ The Player
 	players will not be limited to certain ships and weapons depending on
 	their allegiances.
 	
-	Players can be hostile or friendly to each other regardless
+	Players can be hostile or friendly towards each other regardless
 	of their allegiances.
 
 	Flying missions, mercenary, military or mercantile in nature.
@@ -150,25 +147,19 @@ Traveling
 	create jumps holes on intergalactic scales. It would probably take a generator the size of a
 	large moon to achieve it.
 
-Fleets
-	
-	As the player earns money, he will hopefully eventually be able
-	to buy large ships.
+Capital Ships
 
-	The flagship
-	The player's fleet is limited to one convoy. The convoy's task is to
-	protect the flagship. The player can be in control of any ship in his 
-	fleet. 
+	As the player earns money, he will hopefully eventually be able
+	to buy very large capital ships. Apart from beeing large and powerful,
+	capship can be docked by other players and used like any other dockable
+	planet or station.
 
-	...
-	More like a convoy. 
+	A ship docked at the capship is able to use it as a carrier, and launch
+	when the carrier has reached its destination, or circumstances require it.
 	
-	... about fleet combat
-
-	Once the flagship is destroyed, the convoy is lost.
-	The player respawns at base with the flagships and any ships
-	docked on it while it was destroyed. Other cargo and other convoy ships are lost.
-
+	A capship can be setup as a trading vessel, allowing smaller ships to dock
+	and buy and sell items at prices set by the owner. The capship would become
+	a moveable trading outpost.
 	
 Planet and Stations
 
@@ -184,10 +175,14 @@ Objects in space
 Weapons
 
 	What kind of weapons are there. how do they work.
+	- Lasgun technology
+	- Pulse rifle technology
 
 Fighting
 
-	How does fighting work.
+	How does fighting work? Aim weapon at enemy. Pull trigger.
+
+	Fleeing from battle.
 
 Economy 
 
@@ -210,5 +205,3 @@ Missions
 	- Search and Destroy
 	- Transport / Delivery
 	- Courier missions
-
-
diff --git a/doc/ROADMAP b/doc/ROADMAP
index 8e907f9..92f6db1 100644
--- a/doc/ROADMAP
+++ b/doc/ROADMAP
@@ -6,7 +6,7 @@
   ------------------------------------------------------------------
 
   General:
-	
+
 	This document describes the gameplay objectives for each 
 	milestone of the project. Currently, milestone 0.1 has been 
 	reached and the game universe is ready to be refined and 
@@ -18,7 +18,7 @@
 	happen independent of the gamplay roadmap.
 
 	This roadmap is not to be used as a roadplanner but as a
-	guide to reach a playable game.
+	gentle guide to reach a playable game.
 
   ------------------------------------------------------------------
 
@@ -56,7 +56,7 @@
 
   ------------------------------------------------------------------
 
-  version 0.2.0 - Items
+  version 0.2.0 - Items and Trading
 
   Description:
 
@@ -68,8 +68,8 @@
 
 	player credits
 	item info + lazy server-client exchange
-	
-	trading 
+	trading
+	inventories
 
   Related:
 
@@ -80,6 +80,7 @@
 	model weapon slots and positioning
 	
   Optional:
+
 	fuel system
 	economy
 	tool to generate item icons from models
@@ -150,10 +151,15 @@
 
   ------------------------------------------------------------------
 
-* version 1.0.0 - public release
+  version 1.0.0 - public release
+
+  Requires:
 
-Requires:
 	stable network protocol
 	background story
 	zip archive support
 	http downloads
+
+  ------------------------------------------------------------------
+
+  version 2.0.0 - rewrite of the engine
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 667a4c1..bf139a3 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -256,10 +256,8 @@ void Game::func_launch(core::Player *player, std::string const &args)
 				break;
 			
 			default:
-				if (other_ship->state() != ) {
-					player->send("^BCan not launch from carrier!");	
-					return;
-				}
+				player->send("^BCan not launch from carrier!");	
+				return;
 				break;
 		}
 	}