(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ship.h b/src/ship.h
new file mode 100644
index 000000000..4f91276ef
--- /dev/null
+++ b/src/ship.h
@@ -0,0 +1,22 @@
+/* $Id$ */
+
+#ifndef SHIP_H
+#define SHIP_H
+
+#include "vehicle.h"
+
+void CcCloneShip(bool success, TileIndex tile, uint32 p1, uint32 p2);
+void RecalcShipStuff(Vehicle *v);
+
+static inline bool IsShipInDepot(const Vehicle* v)
+{
+	assert(v->type == VEH_Ship);
+	return v->u.ship.state == 0x80;
+}
+
+static inline bool IsShipInDepotStopped(const Vehicle* v)
+{
+	return IsShipInDepot(v) && v->vehstatus & VS_STOPPED;
+}
+
+#endif /* SHIP_H */