project updates

8 files changed, 64 insertions, 18 deletions

diff --git a/osirion.kdevelop b/osirion.kdevelop
index 36d0544..dbc011b 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -15,8 +15,8 @@
     <projectname>osirion</projectname>
     <projectdirectory>./</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
-    <defaultencoding></defaultencoding>
+    <description>The OSiRiON Project is an SDL+OpenGL space game.</description>
+    <defaultencoding/>
     <versioncontrol>kdevsubversion</versioncontrol>
   </general>
   <kdevautoproject>
@@ -125,7 +125,7 @@
     <projectdoc>
       <docsystem>Doxygen documentatieverzameling</docsystem>
       <docurl>osirion.tag</docurl>
-      <usermanualurl></usermanualurl>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
   <substmap>
@@ -181,7 +181,7 @@
       <designerpluginpaths/>
     </qt>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -213,11 +213,11 @@
   </cppsupportpart>
   <kdevdebugger>
     <general>
-      <gdbpath></gdbpath>
-      <dbgshell></dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <gdbpath/>
+      <dbgshell/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
diff --git a/osirion.kdevelop.pcs b/osirion.kdevelop.pcs
index a805a83..659c0a2 100644
--- a/osirion.kdevelop.pcs
+++ b/osirion.kdevelop.pcs
diff --git a/osirion.kdevses b/osirion.kdevses
index 537606e..c8ca9fd 100644
--- a/osirion.kdevses
+++ b/osirion.kdevses
@@ -1,10 +1,34 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="1" >
-  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/server/console.h" >
-   <View0 Encoding="" line="0" Type="Source" />
+ <DocsAndViews NumberOfDocuments="9" >
+  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/game.cc" >
+   <View0 Encoding="" Type="Source" />
   </Doc0>
+  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/common/inifile.cc" >
+   <View0 Encoding="" Type="Source" />
+  </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/common/inifile.h" >
+   <View0 Encoding="" Type="Source" />
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/common/file.cc" >
+   <View0 Encoding="" Type="Source" />
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/common/file.h" >
+   <View0 Encoding="" line="32" Type="Source" />
+  </Doc4>
+  <Doc5 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/Makefile.am" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc5>
+  <Doc6 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/shipspecs.cc" >
+   <View0 Encoding="" line="9" Type="Source" />
+  </Doc6>
+  <Doc7 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/shipspecs.h" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc7>
+  <Doc8 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/ship.h" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc8>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 12b8f5d..4e5705c 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -12,5 +12,5 @@ INCLUDES = -I$(top_srcdir)/src
 osirion_CFLAGS = $(LIBSDL_CFLAGS)
 osirion_LDFLAGS = $(LIBSDL_LIBS)
 
-noinst_HEADERS = camera.h client.h console.h input.h shipdrawer.h stardrawer.h \
-	video.h view.h
+noinst_HEADERS = camera.h client.h console.h input.h shipdrawer.h shipspecs.h \
+	stardrawer.h video.h view.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 48c33d3..fc1b23e 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 libgame_la_LDFLAGS = -avoid-version -no-undefined
 noinst_LTLIBRARIES = libgame.la
 
-libgame_la_SOURCES = game.cc sector.cc ship.cc star.cc
+libgame_la_SOURCES = game.cc sector.cc ship.cc shipspecs.cc star.cc
 INCLUDES = -I$(top_srcdir)/src
 libgame_la_LIBADD = $(top_builddir)/src/common/libcommon.la
-noinst_HEADERS = game.h player.h sector.h ship.h star.h world.h
+noinst_HEADERS = game.h player.h sector.h ship.h shipspecs.h star.h world.h
diff --git a/src/game/shipspecs.cc b/src/game/shipspecs.cc
new file mode 100644
index 0000000..38a74cc
--- /dev/null
+++ b/src/game/shipspecs.cc
@@ -0,0 +1,9 @@
+/*
+   game/shipspecs.cc
+   This file is part of the Osirion project and is distributed under 
+   the terms and conditions of the GNU General Public License version 2 
+*/
+
+
+#include "shipspecs.h"
+
diff --git a/src/game/shipspecs.h b/src/game/shipspecs.h
new file mode 100644
index 0000000..a907057
--- /dev/null
+++ b/src/game/shipspecs.h
@@ -0,0 +1,13 @@
+/*
+   game/shipspecs.h
+   This file is part of the Osirion project and is distributed under 
+   the terms and conditions of the GNU General Public License version 2 
+*/
+
+#ifndef __INCLUDED_SHIPSPECS_H__
+#define __INCLUDED_SHIPSPECS_H__
+
+class ShipSpecs {
+};
+
+#endif // __INCLUDED_SHIPSPECS_H__
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index 671ff5f..291565d 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -5,5 +5,5 @@ libosiriongl_la_LDFLAGS = -avoid-version -no-undefined
 noinst_LTLIBRARIES = libosiriongl.la
 
 INCLUDES = -I$(top_srcdir)/src
-libosiriongl_la_SOURCES = box.h box.cc sphere.cc sphere.h osiriongl.cc \
-	osiriongl.h
+libosiriongl_la_SOURCES = box.cc sphere.cc osiriongl.cc
+noinst_HEADERS = box.h osiriongl.h sphere.h