project files updates

7 files changed, 106 insertions, 20 deletions

diff --git a/configure.in b/configure.in
index ea9eb07..3372790 100644
--- a/configure.in
+++ b/configure.in
@@ -87,4 +87,5 @@ AC_SUBST(LIBSDL_LIBS)
 AC_SUBST(LIBSDL_CFLAGS)
 AC_SUBST(LIBSDL_RPATH)
 
-AC_OUTPUT(Makefile src/Makefile src/game/Makefile src/gl/Makefile src/client/Makefile src/common/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/client/Makefile src/common/Makefile \
+	src/game/Makefile src/gl/Makefile src/server/Makefile)
diff --git a/osirion.kdevelop b/osirion.kdevelop
index 915757e..dc4a677 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -12,10 +12,16 @@
       <keyword>SDL</keyword>
     </keywords>
     <ignoreparts/>
+    <projectname>osirion</projectname>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description></description>
+    <defaultencoding></defaultencoding>
+    <versioncontrol>kdevsubversion</versioncontrol>
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>src/client/osirion</activetarget>
+      <activetarget>src/server/osiriond</activetarget>
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
@@ -24,7 +30,14 @@
       <directoryradio>executable</directoryradio>
       <runarguments>
         <osirion/>
+        <osiriond/>
       </runarguments>
+      <debugarguments>
+        <osiriond/>
+      </debugarguments>
+      <cwd>
+        <osiriond>/home/ingar/projects/osirion/debug/./src/game</osiriond>
+      </cwd>
     </run>
     <configurations>
       <optimized>
@@ -107,8 +120,9 @@
   </kdevfilecreate>
   <kdevdocumentation>
     <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docsystem>Doxygen documentatieverzameling</docsystem>
       <docurl>osirion.tag</docurl>
+      <usermanualurl></usermanualurl>
     </projectdoc>
   </kdevdocumentation>
   <substmap>
@@ -137,7 +151,45 @@
       <codeCompletionDelay>250</codeCompletionDelay>
       <argumentsHintDelay>400</argumentsHintDelay>
       <headerCompletionDelay>250</headerCompletionDelay>
+      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
+      <completionBoxItemOrder>0</completionBoxItemOrder>
+      <howEvaluationContextMenu>true</howEvaluationContextMenu>
+      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
+      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
+      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
+      <processPrimaryTypes>true</processPrimaryTypes>
+      <processFunctionArguments>false</processFunctionArguments>
+      <preProcessAllHeaders>false</preProcessAllHeaders>
+      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
+      <alwaysParseInBackground>true</alwaysParseInBackground>
+      <usePermanentCaching>true</usePermanentCaching>
+      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+      <includePaths>.;</includePaths>
     </codecompletion>
+    <qt>
+      <used>false</used>
+      <version>3</version>
+      <includestyle>3</includestyle>
+      <root>/opt/qt</root>
+      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <qmake>/opt/qt/bin/qmake</qmake>
+      <designer>/opt/qt/bin/designer</designer>
+      <designerpluginpaths/>
+    </qt>
+    <creategettersetter>
+      <prefixGet></prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
   </kdevcppsupport>
   <kdevfileview>
     <groups>
@@ -147,6 +199,36 @@
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
     </tree>
   </kdevfileview>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cc</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevdebugger>
+    <general>
+      <gdbpath></gdbpath>
+      <dbgshell></dbgshell>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+      <raiseGDBOnStart>false</raiseGDBOnStart>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <ctagspart>
+    <customArguments/>
+    <customTagfilePath>/home/ingar/projects/osirion/tags</customTagfilePath>
+    <activeTagsFiles/>
+  </ctagspart>
 </kdevelop>
diff --git a/osirion.kdevelop.pcs b/osirion.kdevelop.pcs
index 818f139..3b63e15 100644
--- a/osirion.kdevelop.pcs
+++ b/osirion.kdevelop.pcs
diff --git a/osirion.kdevses b/osirion.kdevses
index c6fee45..05ea41e 100644
--- a/osirion.kdevses
+++ b/osirion.kdevses
@@ -1,27 +1,29 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="4" >
-  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/game.cc" >
-   <View0 line="10" Type="Source" />
+ <DocsAndViews NumberOfDocuments="2" >
+  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/gl/osiriongl.h" >
+   <View0 Encoding="" line="0" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/star.cc" >
-   <View0 line="0" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/gl/osiriongl.cc" >
+   <View0 Encoding="" line="69" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/world.h" >
-   <View0 line="0" Type="Source" />
-  </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/src/game/sector.h" >
-   <View0 line="20" Type="Source" />
-  </Doc3>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
    <breakpointList/>
+   <showInternalCommands value="0" />
   </kdevdebugger>
+  <kdevastyle>
+   <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
+   <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
+  </kdevastyle>
   <kdevbookmarks>
    <bookmarks/>
   </kdevbookmarks>
+  <kdevsubversion>
+   <subversion base="" />
+  </kdevsubversion>
   <kdevvalgrind>
    <executable path="" params="" />
    <valgrind path="" params="" />
diff --git a/src/Makefile.am b/src/Makefile.am
index b30324a..499aaed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,4 +3,5 @@
 AM_CPPFLAGS =  $(LIBSDL_CFLAGS) $(all_includes)
 
 # the library search path.
-SUBDIRS = common game gl client
+SUBDIRS = common game server gl client
+noinst_HEADERS = osirion.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 4f556bf..5770301 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,7 @@
 METASOURCES = AUTO
 libcommon_la_LDFLAGS = -avoid-version -no-undefined
 noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = color.cc color.h functions.cc functions.h osirion.h\
-	vector3f.cc vector3f.h
+libcommon_la_SOURCES = color.cc color.h functions.cc functions.h vector3f.cc \
+	vector3f.h
 
 
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 754c168..9e86c15 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 libgame_la_LDFLAGS = -avoid-version
 noinst_LTLIBRARIES = libgame.la
 
-libgame_la_SOURCES = game.cc game.h ship.cc ship.h player.h world.h star.cc \
-		star.h sector.h
+libgame_la_SOURCES = console.h file.cc file.h game.cc game.h player.h sector.h \
+	ship.cc ship.h star.cc star.h world.h
 INCLUDES = -I$(top_srcdir)/src
-noinst_HEADERS = world.h sector.h
+noinst_HEADERS = console.h file.h sector.h world.h