Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [212] src
|
From: <qr...@us...> - 2006-11-26 21:04:52
|
Revision: 212
http://svn.sourceforge.net/opengate/?rev=212&view=rev
Author: qrstuvw
Date: 2006-11-26 13:04:49 -0800 (Sun, 26 Nov 2006)
Log Message:
-----------
Update Fedora-happy
Modified Paths:
--------------
aclocal.m4
configure.in
data/Faction/Makefile.in
opengate.kdevelop
src/Makefile.am
src/client/Makefile.am
src/client/network.h
src/client/ui/ActionConfig.cpp
src/client/ui/ActionConfig.h
src/client/ui/ActionMap.cpp
src/client/ui/ActionMap.h
src/client/ui/Makefile.am
src/client/ui/avatar.h
src/client/ui/camera.h
src/client/ui/framelistener.cpp
src/client/ui/framelistener.h
src/common/loader.h
src/common/objects/object.h
src/opengate_client.cpp
src/server/network.h
Added Paths:
-----------
debug/
debug/data/
debug/data/Faction/
debug/data/Rankings/
debug/data/Ships/
debug/data/Ships/Conflux/
debug/data/Ships/Conflux/C-0/
debug/data/Ships/Conflux/C-1/
debug/data/Ships/Conflux/C-2/
debug/data/Ships/Conflux/C-3/
debug/data1.x/
debug/data1.x/GUI/
debug/data1.x/GUI/BlueHighway.ttf
debug/data1.x/GUI/OpenGateLook.tga
debug/data1.x/GUI/OpenGateLook.xcf
debug/data1.x/Materials/
debug/data1.x/Materials/skybox.zip
debug/doc/
debug/src/
debug/src/client/
debug/src/client/ui/
debug/src/common/
debug/src/common/components/
debug/src/common/equipment/
debug/src/common/objects/
debug/src/deps/
debug/src/deps/tinyxml/
debug/src/server/
src/deps/
src/deps/tinyxml/
Modified: aclocal.m4
===================================================================
--- aclocal.m4 2006-11-26 18:35:35 UTC (rev 211)
+++ aclocal.m4 2006-11-26 21:04:49 UTC (rev 212)
@@ -219,14 +219,6 @@
[pic_mode=default])
test -z "$pic_mode" && pic_mode=default
-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
-#
-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-# calls AC_LIBTOOL_CONFIG and creates libtool.
-#
-_LT_VERSION_CHECK
-
# Use C for the default configuration in the libtool script
tagname=
AC_LIBTOOL_LANG_C_CONFIG
@@ -234,41 +226,6 @@
])# AC_LIBTOOL_SETUP
-# _LT_VERSION_CHECK
-# -----------------
-AC_DEFUN([_LT_VERSION_CHECK],
-[AC_MSG_CHECKING([for correct ltmain.sh version])
-if test "x$ltmain" = "x" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
-])
-fi
-gentoo_lt_version="1.5.22"
-gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** libtool.m4 and ltmain.sh have a version mismatch! ***
-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
-
-Please run:
-
- libtoolize --copy --force
-
-if appropriate, please contact the maintainer of this
-package (or your distribution) for help.
-])
-else
- AC_MSG_RESULT(yes)
-fi
-])# _LT_VERSION_CHECK
-
-
# _LT_AC_SYS_COMPILER
# -------------------
AC_DEFUN([_LT_AC_SYS_COMPILER],
@@ -1399,30 +1356,6 @@
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -1487,14 +1420,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -1505,12 +1431,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1658,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -6606,8 +6543,7 @@
_PKG_TEXT
])],
- [AC_MSG_RESULT([no])
- $4])
+ [$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
Modified: configure.in
===================================================================
--- configure.in 2006-11-26 18:35:35 UTC (rev 211)
+++ configure.in 2006-11-26 21:04:49 UTC (rev 212)
@@ -14,7 +14,8 @@
AM_LDFLAGS="$AM_LDFLAGS $OGRE_LIBS"
# CEGUI - http://www.cegui.org.uk/wiki/
-PKG_CHECK_MODULES(CEGUI, [CEGUI >= 0.5.0])
+# Tim: Converting the GUI to 5.0 as we speak ;]
+PKG_CHECK_MODULES(CEGUI, [CEGUI >= 0.4.1])
AM_CXXFLAGS="$AM_CXXFLAGS $CEGUI_CFLAGS"
AM_LDFLAGS="$AM_LDFLAGS $CEGUI_LIBS"
PKG_CHECK_MODULES(CEGUI_OGRE, [CEGUI-OGRE >= 1.2.1])
@@ -44,4 +45,4 @@
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS")
AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS")
-AC_OUTPUT(Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile data/Ships/Conflux/Makefile data/Ships/Makefile data/Rankings/Makefile data/Makefile src/server/Makefile src/Makefile src/client/ui/Makefile src/client/Makefile src/common/Makefile src/common/objects/Makefile src/common/components/Makefile src/common/equipment/Makefile doc/Makefile data/Faction/Makefile)
+AC_OUTPUT(Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile data/Ships/Conflux/Makefile data/Ships/Makefile data/Rankings/Makefile data/Makefile src/server/Makefile src/Makefile src/client/ui/Makefile src/client/Makefile src/common/Makefile src/common/objects/Makefile src/common/components/Makefile src/common/equipment/Makefile doc/Makefile data/Faction/Makefile src/deps/Makefile src/deps/tinyxml/Makefile)
Modified: data/Faction/Makefile.in
===================================================================
--- data/Faction/Makefile.in 2006-11-26 18:35:35 UTC (rev 211)
+++ data/Faction/Makefile.in 2006-11-26 21:04:49 UTC (rev 212)
@@ -94,7 +94,6 @@
FFLAGS = @FFLAGS@
GRAPPLE_CFLAGS = @GRAPPLE_CFLAGS@
GRAPPLE_LIBS = @GRAPPLE_LIBS@
-GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -128,9 +127,13 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -147,30 +150,23 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
-localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
-psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
Added: debug/data1.x/GUI/BlueHighway.ttf
===================================================================
(Binary files differ)
Property changes on: debug/data1.x/GUI/BlueHighway.ttf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: debug/data1.x/GUI/OpenGateLook.tga
===================================================================
(Binary files differ)
Property changes on: debug/data1.x/GUI/OpenGateLook.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: debug/data1.x/GUI/OpenGateLook.xcf
===================================================================
(Binary files differ)
Property changes on: debug/data1.x/GUI/OpenGateLook.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: debug/data1.x/Materials/skybox.zip
===================================================================
(Binary files differ)
Property changes on: debug/data1.x/Materials/skybox.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: opengate.kdevelop
===================================================================
--- opengate.kdevelop 2006-11-26 18:35:35 UTC (rev 211)
+++ opengate.kdevelop 2006-11-26 21:04:49 UTC (rev 212)
@@ -13,26 +13,26 @@
<ignoreparts/>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
+ <description/>
<versioncontrol>kdevsubversion</versioncontrol>
</general>
<kdevautoproject>
<general>
- <activetarget>src/client/ui/libopengate-ui.la</activetarget>
+ <activetarget>src/opengate-server</activetarget>
<useconfiguration>debug</useconfiguration>
<useactivetarget>true</useactivetarget>
</general>
<run>
- <mainprogram>src/opengate-server</mainprogram>
+ <mainprogram/>
<terminal>true</terminal>
- <directoryradio>executable</directoryradio>
+ <directoryradio>build</directoryradio>
<runarguments>
<opengate/>
<opengate-server/>
<opengate-client/>
</runarguments>
<customdirectory>/</customdirectory>
- <programargs></programargs>
+ <programargs/>
<autocompile>true</autocompile>
<envvars/>
</run>
@@ -170,7 +170,7 @@
</kdevfileview>
<kdevdocumentation>
<projectdoc>
- <docsystem>Doxygen-Dokumentation</docsystem>
+ <docsystem>Doxygen Documentation Collection</docsystem>
<docurl>opengate.tag</docurl>
<usermanualurl/>
</projectdoc>
@@ -224,12 +224,12 @@
</kdevcppsupport>
<kdevdebugger>
<general>
- <programargs></programargs>
- <gdbpath></gdbpath>
+ <programargs/>
+ <gdbpath/>
<dbgshell>libtool</dbgshell>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
Modified: src/Makefile.am
===================================================================
--- src/Makefile.am 2006-11-26 18:35:35 UTC (rev 211)
+++ src/Makefile.am 2006-11-26 21:04:49 UTC (rev 212)
@@ -2,22 +2,27 @@
# set the include path found by configure
-INCLUDES= $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/client -I$(top_srcdir)/src/deps \
+ -I/usr/local/include/CEGUI -I/usr/local/include/OGRE -I/usr/include/libxml2 $(all_includes)
# the library search path.
-SUBDIRS = common client server
+SUBDIRS = deps common client server
opengate_server_SOURCES = opengate_server.cpp
opengate_server_LDADD = $(top_builddir)/src/server/libopengate-server.la \
$(top_builddir)/src/common/libopengate-common.la
opengate_client_SOURCES = opengate_client.cpp
-opengate_client_LDADD = $(top_builddir)/src/client/libopengate-client.la \
- $(top_builddir)/src/common/libopengate-common.la $(top_builddir)/src/common/equipment/libopengate-equipment.la
+opengate_client_LDADD = $(top_builddir)/src/deps/tinyxml/libTinyXML.la \
+ $(top_builddir)/src/client/libopengate-client.la $(top_builddir)/src/common/libopengate-common.la \
+ $(top_builddir)/src/common/equipment/libopengate-equipment.la $(top_builddir)/src/deps/tinyxml/libTinyXML.a
pkgdatadir = $(datadir)/games/@PACKAGE@
pkgdata_DATA = ogre.cfg \
plugins.cfg \
resources.cfg
+AM_CXXFLAGS = -DTIXML_USE_STL
+
+
Modified: src/client/Makefile.am
===================================================================
--- src/client/Makefile.am 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/Makefile.am 2006-11-26 21:04:49 UTC (rev 212)
@@ -1,7 +1,11 @@
-INCLUDES = $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/deps -I/usr/local/include/CEGUI $(all_includes) \
+ -I/usr/local/include/OGRE
METASOURCES = AUTO
noinst_LTLIBRARIES = libopengate-client.la
-noinst_HEADERS = network.h
-libopengate_client_la_SOURCES = network.cpp
+noinst_HEADERS = network.h GameState.h GameStateManager.h Global.h \
+ GameManager.h CFunctions.h
+libopengate_client_la_SOURCES = network.cpp GameStateManager.cpp \
+ GameManager.cpp
SUBDIRS = ui
libopengate_client_la_LIBADD = $(top_builddir)/src/client/ui/libopengate-ui.la
+AM_CXXFLAGS = -DTIXML_USE_STL
Modified: src/client/network.h
===================================================================
--- src/client/network.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/network.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -25,7 +25,7 @@
#ifndef _OPENGATE_NETWORK_
#define _OPENGATE_NETWORK_
-#include <grapple.h>
+#include <grapple/grapple.h>
#include <string>
/*!
Modified: src/client/ui/ActionConfig.cpp
===================================================================
--- src/client/ui/ActionConfig.cpp 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/ActionConfig.cpp 2006-11-26 21:04:49 UTC (rev 212)
@@ -29,14 +29,14 @@
#include <CEGUI/elements/CEGUIMultiColumnList.h>
#include <CEGUI/elements/CEGUIListboxTextItem.h>
-#include "OgreSceneManager.h"
-#include "OgreCamera.h"
-#include "OgreRoot.h"
+#include "OGRE/OgreSceneManager.h"
+#include "OGRE/OgreCamera.h"
+#include "OGRE/OgreRoot.h"
#include "ActionConfig.h"
-#include "OISMouse.h"
-#include "OISKeyboard.h"
-#include "OISJoyStick.h"
+#include "OIS/OISMouse.h"
+#include "OIS/OISKeyboard.h"
+#include "OIS/OISJoyStick.h"
//Some Simple Configurable Action IDs
const int A_JUMP = 1; //All
Modified: src/client/ui/ActionConfig.h
===================================================================
--- src/client/ui/ActionConfig.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/ActionConfig.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -24,12 +24,12 @@
#define ActionConfig_Header
#include <CEGUI/CEGUIForwardRefs.h>
-#include "OISPrereqs.h"
-#include "OISEvents.h"
+#include <OIS/OISPrereqs.h>
+#include <OIS/OISEvents.h>
-#include "OgrePrerequisites.h"
-#include "OgreFrameListener.h"
-#include "OgreVector3.h"
+#include <OGRE/OgrePrerequisites.h>
+#include <OGRE/OgreFrameListener.h>
+#include <OGRE/OgreVector3.h>
#include "ActionMap.h"
#include "avatar.h"
Modified: src/client/ui/ActionMap.cpp
===================================================================
--- src/client/ui/ActionMap.cpp 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/ActionMap.cpp 2006-11-26 21:04:49 UTC (rev 212)
@@ -1,7 +1,7 @@
#include "ActionMap.h"
-#include "OISMouse.h"
-#include "OISKeyboard.h"
-#include "OISJoyStick.h"
+#include "OIS/OISMouse.h"
+#include "OIS/OISKeyboard.h"
+#include "OIS/OISJoyStick.h"
using namespace OIS;
Modified: src/client/ui/ActionMap.h
===================================================================
--- src/client/ui/ActionMap.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/ActionMap.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -22,10 +22,10 @@
*/
#ifndef _OIS_ACTIONMAPHEADERS_
#define _OIS_ACTIONMAPHEADERS_
-#include "OISPrereqs.h"
-#include "OISJoyStick.h"
-#include "OISMouse.h"
-#include "OISKeyboard.h"
+#include <OIS/OISPrereqs.h>
+#include <OIS/OISJoyStick.h>
+#include <OIS/OISMouse.h>
+#include <OIS/OISKeyboard.h>
namespace OIS
{
Modified: src/client/ui/Makefile.am
===================================================================
--- src/client/ui/Makefile.am 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/Makefile.am 2006-11-26 21:04:49 UTC (rev 212)
@@ -1,7 +1,12 @@
-INCLUDES = $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/client -I$(top_srcdir)/src/deps \
+ -I/usr/local/include/CEGUI -I/usr/local/include/OGRE $(all_includes)
METASOURCES = AUTO
noinst_LTLIBRARIES = libopengate-ui.la
libopengate_ui_la_SOURCES = application.cpp framelistener.cpp ActionConfig.cpp \
- ActionMap.cpp
+ ActionMap.cpp Graphics.cpp InputManager.cpp MainMenu.cpp PlayState.cpp Console.cpp \
+ OpenGateConsole.cpp GUIManager.cpp
noinst_HEADERS = application.h framelistener.h ActionConfig.h ActionMap.h \
- camera.h
+ camera.h Graphics.h InputManager.h IntroState.h MainMenu.h PlayState.h Console.h \
+ OpenGateConsole.h
+AM_CXXFLAGS = -DTIXML_USE_STL
+libopengate_ui_la_LIBADD = $(top_builddir)/src/deps/tinyxml/libTinyXML.a
Modified: src/client/ui/avatar.h
===================================================================
--- src/client/ui/avatar.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/avatar.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -25,7 +25,7 @@
#ifndef _OPENGATE_AVATAR_
#define _OPENGATE_AVATAR_
-#include "Ogre.h"
+#include <OGRE/Ogre.h>
class Character {
// Attributes ------------------------------------------------------------------------------
Modified: src/client/ui/camera.h
===================================================================
--- src/client/ui/camera.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/camera.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -25,7 +25,7 @@
#ifndef _OPENGATE_CAMERA_
#define _OPENGATE_CAMERA_
-#include "Ogre.h"
+#include <OGRE/Ogre.h>
// Our extended camera class
class ExtendedCamera {
Modified: src/client/ui/framelistener.cpp
===================================================================
--- src/client/ui/framelistener.cpp 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/framelistener.cpp 2006-11-26 21:04:49 UTC (rev 212)
@@ -25,8 +25,8 @@
#include "framelistener.h"
#include <CEGUI/CEGUISystem.h>
-#include <OISInputManager.h>
-#include <OISJoyStick.h>
+#include <OIS/OISInputManager.h>
+#include <OIS/OISJoyStick.h>
CEGUI::MouseButton convertOISMouseButtonToCegui(int buttonID) {
switch (buttonID) {
Modified: src/client/ui/framelistener.h
===================================================================
--- src/client/ui/framelistener.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/client/ui/framelistener.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -26,10 +26,10 @@
#define _OPENGATE_FRAMELISTENER_
#include "OGRE/Ogre.h"
-#include "OgreCEGUIRenderer.h"
+#include "OGRE/OgreCEGUIRenderer.h"
-#include "OISMouse.h"
-#include "OISKeyboard.h"
+#include "OIS/OISMouse.h"
+#include "OIS/OISKeyboard.h"
#ifdef __cplusplus
extern "C" {
Modified: src/common/loader.h
===================================================================
--- src/common/loader.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/common/loader.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -29,9 +29,9 @@
#include <config.h>
#endif
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
+#include <libxml2/libxml/parser.h>
+#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xpath.h>
#include <iostream>
#include <vector>
Modified: src/common/objects/object.h
===================================================================
--- src/common/objects/object.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/common/objects/object.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -25,7 +25,7 @@
#ifndef _OPENGATE_OBJECT_
#define _OPENGATE_OBJECT_
-#include <OgreVector3.h>
+#include <OGRE/OgreVector3.h>
#ifdef __cplusplus
extern "C"
Modified: src/opengate_client.cpp
===================================================================
--- src/opengate_client.cpp 2006-11-26 18:35:35 UTC (rev 211)
+++ src/opengate_client.cpp 2006-11-26 21:04:49 UTC (rev 212)
@@ -6,6 +6,17 @@
* Email <eg...@us...>
****************************************************************************/
+/**
+ Tim: pbbly won't compile anymore using the default CEGUI 0.4.1
+ Please recompile CEGUI with -DTIXML_USE_STL (or recompile with xerces)
+ This is fixed in the latest stable branch where TinyXML is in it's own
+ namespace.
+
+ For now the gui is for CEGUI 0.4.1
+*/
+
+// TODO: upgrade CEGUI to latest stable branch bitte
+
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -41,8 +52,12 @@
#include "client/network.h"
-#include <OISException.h>
+#include <OIS/OISException.h>
+// Tim: maybe everything should be merged in the GameManager class...
+#include "client/Global.h"
+#include "client/GameManager.h"
+
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
#define DELIMITER = "--"
#else
@@ -52,154 +67,177 @@
using namespace std;
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
-void error_handle(std::string message) {
+ void error_handle(std::string message)
+ {
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
- MessageBox( NULL, message.c_str(), "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+ MessageBox( NULL, message.c_str(), "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
#else
- std::cerr << "An exception has occured: " << message.c_str() << std::endl;
+ std::cerr << "An exception has occured: " << message.c_str() << std::endl;
#endif
-}
+ }
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
#define WIN32_LEAN_AND_MEAN
#include "windows.h"
-INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT) {
+ INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+ {
#else
-int main(int argc, char **argv) {
+ int main(int argc, char **argv)
+ {
#endif
- cout << "-----------" << std::endl;
- cout << "Statring up" << std::endl;
- cout << "-----------" << std::endl;
+ cout << "-----------" << std::endl;
+ cout << "Statring up" << std::endl;
+ cout << "-----------" << std::endl;
- std::string username = "DummyUser";
- std::string password = "DummyPass";
+ std::string username = "DummyUser";
+ std::string password = "DummyPass";
- for (int i = 1; i < argc; i++) {
- std::string argument = argv[i];
- std::string::size_type loc_delim = argument.find("--", 0 );
- if (loc_delim != string::npos) {
- std::string::size_type loc_value = argument.find("=", 0 );
- if (loc_delim != string::npos) {
- std::string param = argument.substr(loc_delim+2, loc_value-(loc_delim+2));
- std::string value = argument.substr(loc_value+1);
+ for (int i = 1; i < argc; i++)
+ {
+ std::string argument = argv[i];
+ std::string::size_type loc_delim = argument.find("--", 0 );
+ if (loc_delim != string::npos)
+ {
+ std::string::size_type loc_value = argument.find("=", 0 );
+ if (loc_delim != string::npos)
+ {
+ std::string param = argument.substr(loc_delim+2, loc_value-(loc_delim+2));
+ std::string value = argument.substr(loc_value+1);
- if (param.compare("user") == 0) {
- username = value;
- } else if (param.compare("password") == 0) {
- password = value;
- } else if (param.compare("help") == 0) {
- std::cout << "Opengate " << VERSION << std::endl;
- std::cout << "---------------" << std::endl;
- std::cout << "Arguments:" << std::endl;
- std::cout << " --user: Define the username for login" << std::endl;
- std::cout << " --password: Define the password for login" << std::endl;
- } else {
- std::cout << "Argument " << param << " is unkown, ignoring it." << std::endl;
+ if (param.compare("user") == 0)
+ {
+ username = value;
+ }
+ else if (param.compare("password") == 0)
+ {
+ password = value;
+ }
+ else if (param.compare("help") == 0)
+ {
+ std::cout << "Opengate " << VERSION << std::endl;
+ std::cout << "---------------" << std::endl;
+ std::cout << "Arguments:" << std::endl;
+ std::cout << " --user: Define the username for login" << std::endl;
+ std::cout << " --password: Define the password for login" << std::endl;
+ }
+ else
+ {
+ std::cout << "Argument " << param << " is unkown, ignoring it." << std::endl;
+ }
}
- } else {
- cout << "Didn't find Value" << endl;
+ else
+ {
+ cout << "Didn't find Value" << endl;
+ }
}
- } else {
- cout << "Didn't find delimiter" << endl;
+ else
+ {
+ cout << "Didn't find delimiter" << endl;
+ }
}
- }
- Network* nw = new Network();
- nw->login(username, password);
+ Network* nw = new Network();
+ nw->login(username, password);
-/* Loader* loader = new Loader();
- loader->parse_file("money.xml");
- cout << loader->get_option("/equipment/name") << std::endl;
- cout << loader->get_option("/equipment/production-center") << std::endl;
- loader->parse_file("ghost.xml");
- cout << loader->get_option("/equipment/name") << std::endl;
- loader->parse_file("conflux_c0.xml");
- cout << loader->get_option("/ship/name") << std::endl;*/
+ /* Loader* loader = new Loader();
+ loader->parse_file("money.xml");
+ cout << loader->get_option("/equipment/name") << std::endl;
+ cout << loader->get_option("/equipment/production-center") << std::endl;
+ loader->parse_file("ghost.xml");
+ cout << loader->get_option("/equipment/name") << std::endl;
+ loader->parse_file("conflux_c0.xml");
+ cout << loader->get_option("/ship/name") << std::endl;*/
- Loader* loader = Loader::get_instance();
-/* FactionStorage* storage = FactionStorage::get_instance();
- Faction* faction = storage->get_faction("Hallo");
- cout << faction->get_name() << std::endl;
- cout << &faction << std::endl;
- faction = storage->get_faction("Hallo");
- cout << faction->get_name() << std::endl;
- cout << &faction << std::endl;
- faction = storage->find_faction("Hallo");
- cout << faction->get_name() << std::endl;
- cout << &faction << std::endl;
- try {
- faction = storage->find_faction("M\xF6p");
- } catch (std::exception& e) {
- cout << e.what() << std::endl;
- } catch (...) {
- cout << "Unkown" << std::endl;
- }
- storage->get_faction("M\xF6p");
- storage->find_faction("M\xF6p");
- delete(storage);*/
- FactionStorage* f_storage = FactionStorage::get_instance();
+ Loader* loader = Loader::get_instance();
+ /* FactionStorage* storage = FactionStorage::get_instance();
+ Faction* faction = storage->get_faction("Hallo");
+ cout << faction->get_name() << std::endl;
+ cout << &faction << std::endl;
+ faction = storage->get_faction("Hallo");
+ cout << faction->get_name() << std::endl;
+ cout << &faction << std::endl;
+ faction = storage->find_faction("Hallo");
+ cout << faction->get_name() << std::endl;
+ cout << &faction << std::endl;
+ try {
+ faction = storage->find_faction("M�");
+ } catch (std::exception& e) {
+ cout << e.what() << std::endl;
+ } catch (...) {
+ cout << "Unkown" << std::endl;
+ }
+ storage->get_faction("M�");
+ storage->find_faction("M�");
+ delete(storage);*/
+ FactionStorage* f_storage = FactionStorage::get_instance();
- /*Engine* engine = new Engine("../../data/Engines/Money/money.xml");
- cout << "Name: " << engine->get_name() << std::endl;
- cout << "Class: " << engine->get_class() << std::endl;
- cout << "Faction: " << engine->get_faction()->get_name() << std::endl;
- cout << "Description: " << engine->get_description() << std::endl;
- cout << "Manufacturer: " << engine->get_manufacturer()->get_name() << std::endl;
- cout << "Efficiency: " << engine->get_efficiency() << std::endl;
- cout << "Max. Thrust: " << engine->get_max_thrust() << std::endl;*/
+ /*Engine* engine = new Engine("../../data/Engines/Money/money.xml");
+ cout << "Name: " << engine->get_name() << std::endl;
+ cout << "Class: " << engine->get_class() << std::endl;
+ cout << "Faction: " << engine->get_faction()->get_name() << std::endl;
+ cout << "Description: " << engine->get_description() << std::endl;
+ cout << "Manufacturer: " << engine->get_manufacturer()->get_name() << std::endl;
+ cout << "Efficiency: " << engine->get_efficiency() << std::endl;
+ cout << "Max. Thrust: " << engine->get_max_thrust() << std::endl;*/
- /*Capacitor* capacitor = new Capacitor("../../data/Capacitors/s_c_15.xml");
- cout << "Name: " << capacitor->get_name() << std::endl;
- cout << "Class: " << capacitor->get_class() << std::endl;
- cout << "Faction: " << capacitor->get_faction()->get_name() << std::endl;
- cout << "Description: " << capacitor->get_description() << std::endl;*/
+ /*Capacitor* capacitor = new Capacitor("../../data/Capacitors/s_c_15.xml");
+ cout << "Name: " << capacitor->get_name() << std::endl;
+ cout << "Class: " << capacitor->get_class() << std::endl;
+ cout << "Faction: " << capacitor->get_faction()->get_name() << std::endl;
+ cout << "Description: " << capacitor->get_description() << std::endl;*/
- /*Ship* ship = new Ship("../../data/Ships/Solrain/Premia/solrain_premia.xml");
- cout << "Name: " << ship->get_name() << std::endl;
- cout << "Guncount: " << ship->get_guncount() << std::endl;
- std::vector<char*> data = ship->get_productioncenters();
- std::vector<char*>::const_iterator iter;
- for (iter = data.begin(); iter != data.end(); iter++) {
- cout << "Production Center: " << ((char*)*iter) << std::endl;
- }
- ship->set_capacitor(capacitor);
- cout << "Name: " << ship->get_capacitor()->get_name() << std::endl;*/
+ /*Ship* ship = new Ship("../../data/Ships/Solrain/Premia/solrain_premia.xml");
+ cout << "Name: " << ship->get_name() << std::endl;
+ cout << "Guncount: " << ship->get_guncount() << std::endl;
+ std::vector<char*> data = ship->get_productioncenters();
+ std::vector<char*>::const_iterator iter;
+ for (iter = data.begin(); iter != data.end(); iter++) {
+ cout << "Production Center: " << ((char*)*iter) << std::endl;
+ }
+ ship->set_capacitor(capacitor);
+ cout << "Name: " << ship->get_capacitor()->get_name() << std::endl;*/
- // Instantiate our subclass
- OpengateApp myApp;
+ // Instantiate our subclass
- try {
- // ExampleApplication provides a go method, which starts the rendering.
+ // Tim: redirecting control to the state manager
+ GameManager myApp;
myApp.go();
- } catch(Ogre::Exception& e) {
- error_handle(e.getFullDescription());
- return EXIT_FAILURE;
- } catch(OIS::Exception &oe) {
- error_handle(oe.eText);
- return EXIT_FAILURE;
- } catch(...) {
- error_handle("Unknown Type! ");
- return EXIT_FAILURE;
- }
- //delete(capacitor);
- //delete(engine);
- //delete(ship);
+ /* OpengateApp myApp;
+
+ try {
+ // ExampleApplication provides a go method, which starts the rendering.
+ myApp.go();
+ } catch(Ogre::Exception& e) {
+ error_handle(e.getFullDescription());
+ return EXIT_FAILURE;
+ } catch(OIS::Exception &oe) {
+ error_handle(oe.eText);
+ return EXIT_FAILURE;
+ } catch(...) {
+ error_handle("Unknown Type! ");
+ return EXIT_FAILURE;
+ }
+
+ //delete(capacitor);
+ //delete(engine);
+ //delete(ship);
+ */
+ delete(f_storage);
+ delete(loader);
+ nw->quit();
+ delete(nw);
- delete(f_storage);
- delete(loader);
- nw->quit();
- delete(nw);
+ cout << "-------------" << std::endl;
+ cout << "Shutting down" << std::endl;
+ cout << "-------------" << std::endl;
+ return EXIT_SUCCESS;
+ }
- cout << "-------------" << std::endl;
- cout << "Shutting down" << std::endl;
- cout << "-------------" << std::endl;
- return EXIT_SUCCESS;
-}
-
#ifdef __cplusplus
}
#endif
Modified: src/server/network.h
===================================================================
--- src/server/network.h 2006-11-26 18:35:35 UTC (rev 211)
+++ src/server/network.h 2006-11-26 21:04:49 UTC (rev 212)
@@ -29,7 +29,7 @@
#include <config.h>
#endif
-#include <grapple.h>
+#include <grapple/grapple.h>
#include "network_meta.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
