nil-cvs Mailing List for NiL Isn't Liero
Status: Alpha
Brought to you by:
e-user
Menu
▾
▴
nil-cvs — List that announces CVS commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(56) |
Oct
(19) |
Nov
(29) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(144) |
Feb
|
Mar
(63) |
Apr
(1) |
May
(12) |
Jun
(3) |
Jul
|
Aug
(40) |
Sep
(83) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2006 |
Jan
(14) |
Feb
(148) |
Mar
(57) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(36) |
Oct
|
Nov
|
Dec
|
|
From: <e-...@us...> - 2007-09-26 00:03:43
|
Revision: 546
http://nil.svn.sourceforge.net/nil/?rev=546&view=rev
Author: e-user
Date: 2007-09-25 17:03:47 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
updated svn:ignore
Property Changed:
----------------
trunk/nil-ng/
Property changes on: trunk/nil-ng
___________________________________________________________________
Name: svn:ignore
- config.cache
config.log
signatures.dblite
nil
nil-ng
.tm_project.cache
nild
.cdtproject
.project
.externalToolBuilders
.sconf_temp
*.sconsign*
callgrind.out.*
+ *.cache
*.log
*.dblite
*.pyc
.sconf_temp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-25 23:57:46
|
Revision: 545
http://nil.svn.sourceforge.net/nil/?rev=545&view=rev
Author: e-user
Date: 2007-09-25 16:57:48 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
* 32/64bit architecture detection
* soname for libnil
* dynamic library name generation
* build scripts cleanup
* cache dir reactivation
* reconfigure option
* compiler flag determination w/ defaults
Modified Paths:
--------------
trunk/nil-ng/SConstruct
trunk/nil-ng/build/SConscript
trunk/nil-ng/configure.py
trunk/nil-ng/settings.py
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-25 22:43:32 UTC (rev 544)
+++ trunk/nil-ng/SConstruct 2007-09-25 23:57:48 UTC (rev 545)
@@ -16,8 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-import platform
import glob
from settings import setup
from configure import autoconf
@@ -28,10 +26,6 @@
cache_dir = '.cache'
###
-### Dynamic definitions
-x86_64 = platform.machine() == 'x86_64'
-###
-
### Generate the environment
env = setup(settings_cache)
###
@@ -43,7 +37,7 @@
### Enhance scons -c with a convenient distclean call
if ARGUMENTS.get('distclean', 0):
- env.Clean(None, [dependencies_cache,
+ env.Clean('all', [dependencies_cache,
cache_dir,
'signatures.dblite',
'.sconsign.dblite',
@@ -52,20 +46,17 @@
glob.glob('*.pyc')])
###
-### Determine compiler flags
-if os.environ.has_key('CXXFLAGS'):
- env.Append(CCFLAGS = os.environ['CXXFLAGS'])
-###
-
+### Configure the build
if autoconf(env, dependencies_cache) != 0:
Exit(1)
+###
-### environment configuration
-#env.CacheDir(cache_dir)
+### Misc environment configuration
+env.CacheDir(cache_dir)
env.SourceSignatures('MD5')
env.SConsignFile('signatures')
-env.Export('env')
###
+env.Export('env')
SConscript('build/SConscript')
env.Command('ChangeLog', None, 'svn2cl --group-by-day --authors=authors.xml -o $TARGET')
Modified: trunk/nil-ng/build/SConscript
===================================================================
--- trunk/nil-ng/build/SConscript 2007-09-25 22:43:32 UTC (rev 544)
+++ trunk/nil-ng/build/SConscript 2007-09-25 23:57:48 UTC (rev 545)
@@ -22,24 +22,15 @@
Import('env')
### Static definitions
-package='nil-ng'
+packagename = 'nil'
+libname = 'lib%s%s' % (packagename, env['SHLIBSUFFIX'])
+appname = 'nil-uv'
version_major = 0
version_minor = 0
version_micro = 1
-libname = 'nil'
-appname = 'nil-uv'
+soname = libname + '.%d' % version_major
###
-### Enhance scons -c with a convenient distclean call
-if ARGUMENTS.get('distclean', 0):
- env.Clean([appname, appname + 'd'], [dependencies_cache,
- 'signatures.dblite',
- '.sconsign.dblite',
- 'config.log',
- '.sconf_temp',
- glob.glob('*.pyc')])
-###
-
def Descend():
list = []
for file in os.listdir('.'):
@@ -62,13 +53,12 @@
###
### libnil
-#env.SharedLibrary('lib%s' % libname, libsource)
-env.SharedLibrary('lib%s' % libname, libsource)
-target_lib = Alias('lib', 'lib%s%s' % (libname, env['SHLIBSUFFIX']))
+env_lib = env.Copy(LINKFLAGS = ['-Wl,-soname=' + soname])
+target_lib = env_lib.SharedLibrary(libname, libsource)
###
### NiL - Ultra Violence
-env_app = env.Copy(LIBS = libname)
+env_app = env.Copy(LIBS = packagename)
env_app.Append(LIBPATH = '.')
target_data = env.Zip('data.nilpkg', '../data')
Modified: trunk/nil-ng/configure.py
===================================================================
--- trunk/nil-ng/configure.py 2007-09-25 22:43:32 UTC (rev 544)
+++ trunk/nil-ng/configure.py 2007-09-25 23:57:48 UTC (rev 545)
@@ -18,9 +18,16 @@
from SCons.Script import *
import dependencies
+import os
+import platform
def autoconf(env, dependencies_cache):
print "autoconf: Starting scons autoconf"
+
+ if ARGUMENTS.get('reconfigure', 0) and os.access(dependencies_cache, os.F_OK):
+ print "autoconf: Explicit reconfiguration requested"
+ os.unlink(dependencies_cache)
+
print "autoconf: Using cache file: " + dependencies_cache
cache = Options(dependencies_cache)
cache.Add('CCFLAGS')
@@ -43,6 +50,8 @@
'CheckVersion' : check_version,
'CheckPKGConfig' : check_pkg_config,
})
+
+ determine_compiler_flags(env)
depend = dependencies.get()
process_versions(env, conf, depend['versions'])
@@ -63,6 +72,23 @@
cache.Save(dependencies_cache, env)
return 0
+def determine_compiler_flags(env):
+ print "autoconf: Determining compiler flags"
+
+ if os.environ.has_key('CXXFLAGS'):
+ env.Append(CCFLAGS = os.environ['CXXFLAGS'])
+ else:
+ env.Append(CCFLAGS = ['-O2', '-pipe', '-mtune=generic'])
+ if platform.machine() == 'x86_64':
+ env.Append(CCFLAGS = ['-m64'])
+ env.Append(CPPDEFINES = ['__64BIT__'])
+ else:
+ env.Append(CCFLAGS = ['-m32'])
+
+ if env['DEBUG'] == True:
+ env.Append(CCFLAGS = ['-g3'])
+ env.Append(CPPDEFINES = ['__DEBUG__'])
+
def process_c_headers(env, conf, items):
for key in items:
if deftrue(env, key):
Modified: trunk/nil-ng/settings.py
===================================================================
--- trunk/nil-ng/settings.py 2007-09-25 22:43:32 UTC (rev 544)
+++ trunk/nil-ng/settings.py 2007-09-25 23:57:48 UTC (rev 545)
@@ -17,12 +17,18 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from SCons.Script import *
+import platform
def setup(settings_cache):
+ if platform.machine() == 'x86_64':
+ arch_bit = '64'
+ else:
+ arch_bit = ''
+
settings = Options(settings_cache, ARGUMENTS)
settings.Add("PREFIX", 'install architecture-independent files in PREFIX', "/usr/local")
settings.Add("BINDIR", 'user executables', "${PREFIX}/bin")
- settings.Add("LIBDIR", 'object code libraries', "${PREFIX}/lib")
+ settings.Add("LIBDIR", 'object code libraries', "${PREFIX}/lib%s" % arch_bit)
settings.Add("SYSCONFDIR", 'read-only single-machine data', "${PREFIX}/etc")
settings.Add("INCLUDEDIR", 'C header files', "${PREFIX}/include")
settings.Add("LOCALSTATEDIR", 'modifiable single-machine data', "${PREFIX}/var/games")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-25 23:33:52
|
Revision: 542
http://nil.svn.sourceforge.net/nil/?rev=542&view=rev
Author: e-user
Date: 2007-09-25 15:41:47 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
introduced autoconf-like options for build configuration
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Added Paths:
-----------
trunk/nil-ng/settings.py
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-25 22:39:55 UTC (rev 541)
+++ trunk/nil-ng/SConstruct 2007-09-25 22:41:47 UTC (rev 542)
@@ -19,25 +19,23 @@
import os
import platform
import glob
+from settings import setup
from configure import autoconf
-Help("""
-Possible options:
- debug: enable debugging
- profile: enable profiling
- distclean: make distclean
-""")
-
### Static definitions
dependencies_cache = 'dependencies.cache'
+settings_cache = 'settings.cache'
cache_dir = '.cache'
###
### Dynamic definitions
-env = Environment(ENV = os.environ)
x86_64 = platform.machine() == 'x86_64'
###
+### Generate the environment
+env = setup(settings_cache)
+###
+
### Prerequisites
env.EnsurePythonVersion(2, 5)
env.EnsureSConsVersion(0, 97)
Added: trunk/nil-ng/settings.py
===================================================================
--- trunk/nil-ng/settings.py (rev 0)
+++ trunk/nil-ng/settings.py 2007-09-25 22:41:47 UTC (rev 542)
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# Python module for SCons build configuration from the command line
+#
+# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@gm...)
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from SCons.Script import *
+
+def setup(settings_cache):
+ settings = Options(settings_cache, ARGUMENTS)
+ settings.Add("PREFIX", 'install architecture-independent files in PREFIX', "/usr/local")
+ settings.Add("BINDIR", 'user executables', "${PREFIX}/bin")
+ settings.Add("LIBDIR", 'object code libraries', "${PREFIX}/lib")
+ settings.Add("SYSCONFDIR", 'read-only single-machine data', "${PREFIX}/etc")
+ settings.Add("INCLUDEDIR", 'C header files', "${PREFIX}/include")
+ settings.Add("LOCALSTATEDIR", 'modifiable single-machine data', "${PREFIX}/var/games")
+ settings.Add("DATADIR", 'read-only arch.-independent data root', "${PREFIX}/share")
+ settings.Add("MANDIR", 'man documentation [DATADIR/man]', "${DATADIR}/man")
+ settings.Add("DOCDIR", 'documentation root [DATADIR/doc]', "${DATADIR}/doc")
+
+ settings.Add("DEBUG", "compile everything in debug mode", True, None, bool_converter)
+ settings.Add("MODOPENGL", "compile the OpenGL module", True, None, bool_converter)
+
+ env = Environment(ENV = os.environ, options = settings)
+ settings.Save(settings_cache, env)
+ Help(settings.GenerateHelpText(env))
+
+ return env
+
+
+def bool_converter(value):
+ value = value.lower()
+ if value in ('true','enabled','on','yes','1'):
+ return True
+ elif value in ('false','disabled','off','no','0'):
+ return False
+ return bool(value)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-25 23:33:49
|
Revision: 543
http://nil.svn.sourceforge.net/nil/?rev=543&view=rev
Author: e-user
Date: 2007-09-25 15:42:52 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
fixed up the font display
Modified Paths:
--------------
trunk/nil-ng/src/client/console/SdlConsole.cc
Modified: trunk/nil-ng/src/client/console/SdlConsole.cc
===================================================================
--- trunk/nil-ng/src/client/console/SdlConsole.cc 2007-09-25 22:41:47 UTC (rev 542)
+++ trunk/nil-ng/src/client/console/SdlConsole.cc 2007-09-25 22:42:52 UTC (rev 543)
@@ -150,7 +150,7 @@
font = this->font_table.at(level);
SDL_Surface* glyph_surface = font->render_glyph(c);
SDL_Rect destination_rect = glyph_surface->clip_rect;
- destination_rect.x = x + font->minimum_x(c);
+ destination_rect.x = x + font->minimum_x(c) + 2;
destination_rect.y = y + (font->advance_y() - font->maximum_y(c));
Graphics::instance().blit(glyph_surface, &destination_rect);
x += font->advance_x(c);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-25 23:33:43
|
Revision: 544
http://nil.svn.sourceforge.net/nil/?rev=544&view=rev
Author: e-user
Date: 2007-09-25 15:43:32 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
use maxfps parameter from configuration
Modified Paths:
--------------
trunk/nil-ng/src/nil-uv/World.cc
Modified: trunk/nil-ng/src/nil-uv/World.cc
===================================================================
--- trunk/nil-ng/src/nil-uv/World.cc 2007-09-25 22:42:52 UTC (rev 543)
+++ trunk/nil-ng/src/nil-uv/World.cc 2007-09-25 22:43:32 UTC (rev 544)
@@ -22,6 +22,7 @@
#include <EventHandler.h>
#include <SDL.h>
+#include <Configuration.h>
#include <client/SdlConsole.h>
World::World()
@@ -63,14 +64,17 @@
unsigned short delta = 0;
unsigned int time = SDL_GetTicks();
- for (int i = 1; i < 100000; i++)
+ unsigned int maxfps = 1000 /
+ Configuration::instance().get_option<unsigned int>("video/maxfps");
+
+ for (int i = 1; i < 10000; i++)
{
*console->cdebug << "Performance test " << i << IConsole::endl;
- if(SDL_GetTicks() - delta >= 33)
+ console->draw();
+
+ if(SDL_GetTicks() - delta >= maxfps)
{
- SDL_Delay(100);
delta = SDL_GetTicks();
- console->draw();
graphics.update();
}
}
@@ -79,7 +83,7 @@
console->draw();
graphics.update();
- //SDL_Delay(5000);
+ SDL_Delay(5000);
}
void World::_handle_keyboard_event(SDL_Event event)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-25 22:39:52
|
Revision: 541
http://nil.svn.sourceforge.net/nil/?rev=541&view=rev
Author: e-user
Date: 2007-09-25 15:39:55 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
reset display options for development
Modified Paths:
--------------
trunk/nil-ng/data/config/client.conf
Modified: trunk/nil-ng/data/config/client.conf
===================================================================
--- trunk/nil-ng/data/config/client.conf 2007-09-24 23:50:13 UTC (rev 540)
+++ trunk/nil-ng/data/config/client.conf 2007-09-25 22:39:55 UTC (rev 541)
@@ -5,8 +5,8 @@
<nilconfig version="0.1">
<video>
- <fullscreen>true</fullscreen>
- <resolution>1280x1024</resolution>
+ <fullscreen>false</fullscreen>
+ <resolution>1024x768</resolution>
<depth>32</depth>
<opengl>false</opengl>
<maxfps>100</maxfps>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:50:09
|
Revision: 540
http://nil.svn.sourceforge.net/nil/?rev=540&view=rev
Author: e-user
Date: 2007-09-24 16:50:13 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
explicit redundant header inclusions for ide lookup
Modified Paths:
--------------
trunk/nil-ng/src/common/graphics/Graphics.cc
Modified: trunk/nil-ng/src/common/graphics/Graphics.cc
===================================================================
--- trunk/nil-ng/src/common/graphics/Graphics.cc 2007-09-24 23:47:57 UTC (rev 539)
+++ trunk/nil-ng/src/common/graphics/Graphics.cc 2007-09-24 23:50:13 UTC (rev 540)
@@ -19,6 +19,7 @@
*
*****************************************************************************/
#include <Graphics.h>
+#include <SDL.h>
#include <sstream>
Graphics* Graphics::_instance = 0;
@@ -96,7 +97,7 @@
void
Graphics::initialize() throw(InitializationFailure)
{
- SDL_WM_SetCaption("NiL isn't Liero", "NiL isn't Liero");
+ SDL_WM_SetCaption("NiL isn't Liero", NULL);
// SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask); TODO
IConsole* console = IConsole::primary();
@@ -130,7 +131,7 @@
if (this->is_opengl)
{
if (SDL_VideoModeOK(this->_width, this->_height, this->_depth,
- this->video_flags | SDL_HWACCEL| SDL_OPENGL))
+ this->video_flags | SDL_HWACCEL | SDL_OPENGL))
{
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
this->video_flags |= SDL_HWACCEL | SDL_OPENGL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:48:00
|
Revision: 539
http://nil.svn.sourceforge.net/nil/?rev=539&view=rev
Author: e-user
Date: 2007-09-24 16:47:57 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
fixed nil-uvd compilation for the new project infrastructure
Modified Paths:
--------------
trunk/nil-ng/src/nil-uvd/main.cc
Modified: trunk/nil-ng/src/nil-uvd/main.cc
===================================================================
--- trunk/nil-ng/src/nil-uvd/main.cc 2007-09-24 23:46:35 UTC (rev 538)
+++ trunk/nil-ng/src/nil-uvd/main.cc 2007-09-24 23:47:57 UTC (rev 539)
@@ -1,17 +1,30 @@
-/***************************************************************************
- * main.cc
+/******************************************************************************
+ * NiL isn't Liero
+ * main.cc - NiL server entry point and facilities initializations
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * Wed Aug 16 ??:??:?? 2005
- * Copyright 2005 e-user
- * e-...@gm...
- ****************************************************************************/
-#include "common/console/text_console.h"
-#include "server/nil_server.h"
-#include "common/graphics/graphics.h"
-#include "common/world.h"
-#include "common/configuration/Configuration.h"
-#include "server/net/network_server.h"
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#include <Configuration.h>
+#include <TextConsole.h>
+#include <Graphics.h>
+#include <server/NetworkServer.h>
+#include "World.h"
+
#include <string>
#include <iostream>
#include <SDL.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:47:00
|
Revision: 537
http://nil.svn.sourceforge.net/nil/?rev=537&view=rev
Author: e-user
Date: 2007-09-24 16:45:08 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
adapted new include paths
Modified Paths:
--------------
trunk/nil-ng/.cproject
Added Paths:
-----------
trunk/nil-ng/.project
Modified: trunk/nil-ng/.cproject
===================================================================
--- trunk/nil-ng/.cproject 2007-09-24 23:44:12 UTC (rev 536)
+++ trunk/nil-ng/.cproject 2007-09-24 23:45:08 UTC (rev 537)
@@ -25,8 +25,9 @@
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.416185474" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.2040419574" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.include.paths.1819514165" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1666911513" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -34,8 +35,9 @@
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1152364372" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.debug.option.debugging.level.866116020" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.452064605" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1850802350" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -49,6 +51,8 @@
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1047357476" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
<option id="gnu.both.asm.option.include.paths.1303045444" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1642246402" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
@@ -63,6 +67,21 @@
+
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+<buildCommand>scons</buildCommand>
+<buildArguments/>
+<buildTarget>client</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+</buildTargets>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+<project-mappings/>
+</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -478,20 +497,6 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-<buildCommand>scons</buildCommand>
-<buildArguments/>
-<buildTarget>client</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>false</useDefaultCommand>
-</target>
-</buildTargets>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-<project-mappings/>
-</storageModule>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.159653668">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.159653668" moduleId="org.eclipse.cdt.core.settings" name="Release">
@@ -517,6 +522,8 @@
<option id="gnu.cpp.compiler.option.include.paths.1642629706" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1962233296" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -526,6 +533,8 @@
<option id="gnu.c.compiler.option.include.paths.1967473520" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1981554174" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -539,6 +548,8 @@
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.464255999" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
<option id="gnu.both.asm.option.include.paths.1725807012" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
+<listOptionValue builtIn="false" value="/usr/include/SDL"/>
+<listOptionValue builtIn="false" value=""${workspace_loc:/includes}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.823968554" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
@@ -553,6 +564,21 @@
+
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+<buildCommand>scons</buildCommand>
+<buildArguments/>
+<buildTarget>client</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+</buildTargets>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+<project-mappings/>
+</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -968,20 +994,6 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-<buildCommand>scons</buildCommand>
-<buildArguments/>
-<buildTarget>client</buildTarget>
-<stopOnError>true</stopOnError>
-<useDefaultCommand>false</useDefaultCommand>
-</target>
-</buildTargets>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-<project-mappings/>
-</storageModule>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
Added: trunk/nil-ng/.project
===================================================================
--- trunk/nil-ng/.project (rev 0)
+++ trunk/nil-ng/.project 2007-09-24 23:45:08 UTC (rev 537)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>nil-ng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.python.pydev.PyDevBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>-c</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>scons</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/nil-ng}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>client</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>client</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.python.pydev.pythonNature</nature>
+ </natures>
+</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:47:00
|
Revision: 538
http://nil.svn.sourceforge.net/nil/?rev=538&view=rev
Author: e-user
Date: 2007-09-24 16:46:35 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
* made distclean available to all clean calls
* properly abort executing upon autoconf failure
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-24 23:45:08 UTC (rev 537)
+++ trunk/nil-ng/SConstruct 2007-09-24 23:46:35 UTC (rev 538)
@@ -45,7 +45,7 @@
### Enhance scons -c with a convenient distclean call
if ARGUMENTS.get('distclean', 0):
- env.Clean('nil', [dependencies_cache,
+ env.Clean(None, [dependencies_cache,
cache_dir,
'signatures.dblite',
'.sconsign.dblite',
@@ -59,7 +59,8 @@
env.Append(CCFLAGS = os.environ['CXXFLAGS'])
###
-autoconf(env, dependencies_cache)
+if autoconf(env, dependencies_cache) != 0:
+ Exit(1)
### environment configuration
#env.CacheDir(cache_dir)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:44:08
|
Revision: 536
http://nil.svn.sourceforge.net/nil/?rev=536&view=rev
Author: e-user
Date: 2007-09-24 16:44:12 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
forward passed parameters from script to binary
Modified Paths:
--------------
trunk/nil-ng/build/nil-uv.sh
Modified: trunk/nil-ng/build/nil-uv.sh
===================================================================
--- trunk/nil-ng/build/nil-uv.sh 2007-09-24 23:43:15 UTC (rev 535)
+++ trunk/nil-ng/build/nil-uv.sh 2007-09-24 23:44:12 UTC (rev 536)
@@ -2,4 +2,5 @@
root=$(dirname "$0")
export LD_LIBRARY_PATH=${root}
-${root}/nil-uv
+echo Excuting nil-uv $* ...
+${root}/nil-uv $*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:43:22
|
Revision: 535
http://nil.svn.sourceforge.net/nil/?rev=535&view=rev
Author: e-user
Date: 2007-09-24 16:43:15 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
raised default resolution for development
Modified Paths:
--------------
trunk/nil-ng/data/config/client.conf
Modified: trunk/nil-ng/data/config/client.conf
===================================================================
--- trunk/nil-ng/data/config/client.conf 2007-09-24 23:42:33 UTC (rev 534)
+++ trunk/nil-ng/data/config/client.conf 2007-09-24 23:43:15 UTC (rev 535)
@@ -1,14 +1,15 @@
<?xml version="1.0"?>
-<!--Default NiL client option file
+<!--Default NiL client options file
This file licensed under the terms of the GNU Free Documentation License 1.2
- (c)2005, 2006 Alexander Kahl-->
+ (C) 2005,2006,2007 Alexander Kahl-->
<nilconfig version="0.1">
<video>
- <fullscreen>false</fullscreen>
- <resolution>1024x768</resolution>
+ <fullscreen>true</fullscreen>
+ <resolution>1280x1024</resolution>
<depth>32</depth>
<opengl>false</opengl>
+ <maxfps>100</maxfps>
</video>
<sound>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-24 23:42:38
|
Revision: 534
http://nil.svn.sourceforge.net/nil/?rev=534&view=rev
Author: e-user
Date: 2007-09-24 16:42:33 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
added new gmodule-2.0 dependency
Modified Paths:
--------------
trunk/nil-ng/dependencies.py
Modified: trunk/nil-ng/dependencies.py
===================================================================
--- trunk/nil-ng/dependencies.py 2007-09-23 22:59:29 UTC (rev 533)
+++ trunk/nil-ng/dependencies.py 2007-09-24 23:42:33 UTC (rev 534)
@@ -32,7 +32,8 @@
'physfs': ['physfs', 'physfs.h', 'c', None, True],
},
'pkgconfig': {
- 'LibXML2': ['libxml-2.0', '2.6', 'atleast'],
+ 'LibXML2': ['libxml-2.0', '2.6', 'atleast'],
+ 'GLib2 gmodule': ['gmodule-2.0', '0.20', 'atleast'],
},
'versions': {
'SDL': ['sdl-config --version', 'sdl-config --cflags --libs', '1.2.10', True],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-23 22:59:27
|
Revision: 533
http://nil.svn.sourceforge.net/nil/?rev=533&view=rev
Author: e-user
Date: 2007-09-23 15:59:29 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
* removed useless (obsoleted) optimization definitions
* removed useless (obsoleted) Makefile
* split up everything into libnil, nil-uv client and nil-uvd server
* split up headers from sources for devel packages
Modified Paths:
--------------
trunk/nil-ng/.cproject
trunk/nil-ng/.pydevproject
trunk/nil-ng/SConstruct
trunk/nil-ng/build/SConscript
trunk/nil-ng/configure.py
trunk/nil-ng/src/client/SConscript
trunk/nil-ng/src/client/audio/SConscript
trunk/nil-ng/src/client/audio/Soundsystem.cc
trunk/nil-ng/src/client/console/SConscript
trunk/nil-ng/src/client/console/SdlConsole.cc
trunk/nil-ng/src/client/graphics/Font.cc
trunk/nil-ng/src/client/graphics/SConscript
trunk/nil-ng/src/client/input/Mouse.cc
trunk/nil-ng/src/client/net/NetworkClient.cc
trunk/nil-ng/src/client/net/SConscript
trunk/nil-ng/src/common/SConscript
trunk/nil-ng/src/common/configuration/CommandlineParser.cc
trunk/nil-ng/src/common/configuration/ConfigFileParser.cc
trunk/nil-ng/src/common/configuration/Configuration.cc
trunk/nil-ng/src/common/configuration/IConfigurationParser.cc
trunk/nil-ng/src/common/configuration/SConscript
trunk/nil-ng/src/common/console/IConsole.cc
trunk/nil-ng/src/common/console/SConscript
trunk/nil-ng/src/common/console/TextConsole.cc
trunk/nil-ng/src/common/exceptions/NilException.cc
trunk/nil-ng/src/common/exceptions/SConscript
trunk/nil-ng/src/common/graphics/Blittable.cc
trunk/nil-ng/src/common/graphics/GraphicItem.cc
trunk/nil-ng/src/common/graphics/Graphics.cc
trunk/nil-ng/src/common/graphics/SConscript
trunk/nil-ng/src/common/input/EventHandler.cc
trunk/nil-ng/src/common/input/Interactive.cc
trunk/nil-ng/src/common/input/Keyboard.cc
trunk/nil-ng/src/common/input/SConscript
trunk/nil-ng/src/common/net/INetwork.cc
trunk/nil-ng/src/common/net/SConscript
trunk/nil-ng/src/common/pattern/ISubject.cc
trunk/nil-ng/src/common/pattern/SConscript
trunk/nil-ng/src/common/physics/Movable.cc
trunk/nil-ng/src/common/physics/SConscript
trunk/nil-ng/src/common/vfs/File.cc
trunk/nil-ng/src/common/vfs/SConscript
trunk/nil-ng/src/common/vfs/VFS.cc
trunk/nil-ng/src/server/SConscript
trunk/nil-ng/src/server/net/SConscript
Added Paths:
-----------
trunk/nil-ng/build/nil-uv.sh
trunk/nil-ng/includes/
trunk/nil-ng/includes/Blittable.h
trunk/nil-ng/includes/CommandlineParser.h
trunk/nil-ng/includes/ConfigFileParser.h
trunk/nil-ng/includes/Configuration.h
trunk/nil-ng/includes/EventHandler.h
trunk/nil-ng/includes/File.h
trunk/nil-ng/includes/GraphicItem.h
trunk/nil-ng/includes/Graphics.h
trunk/nil-ng/includes/IConfigurationParser.h
trunk/nil-ng/includes/IConsole.h
trunk/nil-ng/includes/INetwork.h
trunk/nil-ng/includes/IObserver.h
trunk/nil-ng/includes/ISubject.h
trunk/nil-ng/includes/Interactive.h
trunk/nil-ng/includes/Keyboard.h
trunk/nil-ng/includes/Movable.h
trunk/nil-ng/includes/NilException.h
trunk/nil-ng/includes/TextConsole.h
trunk/nil-ng/includes/VFS.h
trunk/nil-ng/includes/client/
trunk/nil-ng/includes/client/Font.h
trunk/nil-ng/includes/client/Mouse.h
trunk/nil-ng/includes/client/NetworkClient.h
trunk/nil-ng/includes/client/SdlConsole.h
trunk/nil-ng/includes/client/Soundsystem.h
trunk/nil-ng/includes/server/
trunk/nil-ng/includes/server/NetworkServer.h
trunk/nil-ng/src/nil-uv/
trunk/nil-ng/src/nil-uv/SConscript
trunk/nil-ng/src/nil-uv/World.cc
trunk/nil-ng/src/nil-uv/World.h
trunk/nil-ng/src/nil-uv/main.cc
trunk/nil-ng/src/nil-uvd/
trunk/nil-ng/src/nil-uvd/SConscript
trunk/nil-ng/src/nil-uvd/main.cc
trunk/nil-ng/src/server/net/NetworkServer.cc
Removed Paths:
-------------
trunk/nil-ng/Makefile
trunk/nil-ng/src/client/audio/Soundsystem.h
trunk/nil-ng/src/client/console/SdlConsole.h
trunk/nil-ng/src/client/graphics/Font.h
trunk/nil-ng/src/client/input/Mouse.h
trunk/nil-ng/src/client/main.cc
trunk/nil-ng/src/client/net/NetworkClient.h
trunk/nil-ng/src/common/World.cc
trunk/nil-ng/src/common/World.h
trunk/nil-ng/src/common/configuration/CommandlineParser.h
trunk/nil-ng/src/common/configuration/ConfigFileParser.h
trunk/nil-ng/src/common/configuration/Configuration.h
trunk/nil-ng/src/common/configuration/IConfigurationParser.h
trunk/nil-ng/src/common/console/IConsole.h
trunk/nil-ng/src/common/console/TextConsole.h
trunk/nil-ng/src/common/exceptions/NilException.h
trunk/nil-ng/src/common/graphics/Blittable.h
trunk/nil-ng/src/common/graphics/GraphicItem.h
trunk/nil-ng/src/common/graphics/Graphics.h
trunk/nil-ng/src/common/input/EventHandler.h
trunk/nil-ng/src/common/input/Interactive.h
trunk/nil-ng/src/common/input/Keyboard.h
trunk/nil-ng/src/common/net/INetwork.h
trunk/nil-ng/src/common/optimize.h
trunk/nil-ng/src/common/pattern/IObserver.h
trunk/nil-ng/src/common/pattern/ISubject.h
trunk/nil-ng/src/common/physics/Movable.h
trunk/nil-ng/src/common/vfs/File.h
trunk/nil-ng/src/common/vfs/VFS.h
trunk/nil-ng/src/server/main.cc
trunk/nil-ng/src/server/net/network_server.cc
trunk/nil-ng/src/server/net/network_server.h
Modified: trunk/nil-ng/.cproject
===================================================================
--- trunk/nil-ng/.cproject 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/.cproject 2007-09-23 22:59:29 UTC (rev 533)
@@ -19,7 +19,7 @@
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.783902247." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.2137861242" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1419313623" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-<builder arguments="debug=1" autoBuildTarget="nil" buildPath="${workspace_loc:/nil-ng}" cleanBuildTarget="-c" command="scons" enableAutoBuild="true" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.exe.debug.882583814" incrementalBuildTarget="nil" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<builder arguments="" autoBuildTarget="client" buildPath="${workspace_loc:/nil-ng}" cleanBuildTarget="-c" command="scons" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.exe.debug.882583814" incrementalBuildTarget="client" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.708375519" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.725626512" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.416185474" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
@@ -48,7 +48,6 @@
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1047357476" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
<option id="gnu.both.asm.option.include.paths.1303045444" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1642246402" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
@@ -61,9 +60,9 @@
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-<project-mappings/>
-</storageModule>
+
+
+
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -479,7 +478,20 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+<buildCommand>scons</buildCommand>
+<buildArguments/>
+<buildTarget>client</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+</buildTargets>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+<project-mappings/>
+</storageModule>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.159653668">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.159653668" moduleId="org.eclipse.cdt.core.settings" name="Release">
@@ -497,7 +509,7 @@
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.159653668." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1262058434" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.279820743" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-<builder arguments="" autoBuildTarget="nil" buildPath="${workspace_loc:/nil-ng}" cleanBuildTarget="-c" command="scons" enableAutoBuild="true" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.exe.release.1391926582" incrementalBuildTarget="nil" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<builder arguments="" autoBuildTarget="nil" buildPath="${workspace_loc:/nil-ng}" cleanBuildTarget="-c" command="scons" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.exe.release.1391926582" incrementalBuildTarget="client" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="3" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.650034640" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1953235170" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1284600573" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
@@ -526,7 +538,6 @@
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.464255999" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
<option id="gnu.both.asm.option.include.paths.1725807012" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value=""${workspace_loc:/nil-ng/src}""/>
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.823968554" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
@@ -539,9 +550,9 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
-<project-mappings/>
-</storageModule>
+
+
+
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
@@ -957,7 +968,20 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="client" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+<buildCommand>scons</buildCommand>
+<buildArguments/>
+<buildTarget>client</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+</buildTargets>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping">
+<project-mappings/>
+</storageModule>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
Modified: trunk/nil-ng/.pydevproject
===================================================================
--- trunk/nil-ng/.pydevproject 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/.pydevproject 2007-09-23 22:59:29 UTC (rev 533)
@@ -1,5 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
+
<pydev_project>
- <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
-</pydev_project>
\ No newline at end of file
+ <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
+</pydev_project>
Deleted: trunk/nil-ng/Makefile
===================================================================
--- trunk/nil-ng/Makefile 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/Makefile 2007-09-23 22:59:29 UTC (rev 533)
@@ -1,21 +0,0 @@
-all:
- @echo "Using scons to compile sources..."
- @scons optimize=1 nil
-
-profile:
- @echo "Building for profiling..."
- @scons profile=1 nil
-
-debug:
- @echo "Building for debugging..."
- @scons debug=1 nil
-
-clean:
- @echo "Using scons to clean..."
- @scons -c
-
-distclean:
- @echo "Making distclean......"
- @scons -c distclean=1
-
-default: all
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/SConstruct 2007-09-23 22:59:29 UTC (rev 533)
@@ -62,8 +62,7 @@
autoconf(env, dependencies_cache)
### environment configuration
-env.CacheDir(cache_dir)
-env.Append(CPPPATH = "#src") # The hash marks means to treat this directory as an absolute path
+#env.CacheDir(cache_dir)
env.SourceSignatures('MD5')
env.SConsignFile('signatures')
env.Export('env')
Modified: trunk/nil-ng/build/SConscript
===================================================================
--- trunk/nil-ng/build/SConscript 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/build/SConscript 2007-09-23 22:59:29 UTC (rev 533)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# NiL SConstruct script.
#
-# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@gm...)
+# copyright (C) 2007 Alexander Kahl (e-...@gm...)
#
# 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
@@ -23,8 +23,11 @@
### Static definitions
package='nil-ng'
-version='0.0.1'
-appname = 'nil'
+version_major = 0
+version_minor = 0
+version_micro = 1
+libname = 'nil'
+appname = 'nil-uv'
###
### Enhance scons -c with a convenient distclean call
@@ -44,17 +47,42 @@
list.append(file + '/SConscript')
return list
+
+env.Append(CPPPATH = "#includes")
+
### Descend into the src tree, gathering files to build
env.Export('Descend')
-commonsource = SConscript('../src/common/SConscript')
-clientsource = SConscript('../src/client/SConscript')
-serversource = SConscript('../src/server/SConscript')
+
+libsource = {}
+libsource += SConscript('../src/common/SConscript')
+libsource += SConscript('../src/client/SConscript')
+libsource += SConscript('../src/server/SConscript')
+clientsource = SConscript('../src/%s/SConscript' % appname)
+serversource = SConscript('../src/%s/SConscript' % (appname + 'd'))
###
+
+### libnil
+#env.SharedLibrary('lib%s' % libname, libsource)
+env.SharedLibrary('lib%s' % libname, libsource)
+target_lib = Alias('lib', 'lib%s%s' % (libname, env['SHLIBSUFFIX']))
+###
+
+### NiL - Ultra Violence
+env_app = env.Copy(LIBS = libname)
+env_app.Append(LIBPATH = '.')
+
target_data = env.Zip('data.nilpkg', '../data')
-target_client = Alias('client', [appname, target_data])
-target_server = Alias('server', appname + 'd')
+
+target_client = Alias('client', [target_lib, appname, target_data])
+env_app.Program(appname, clientsource)
+
+target_server = Alias('server', [target_lib, appname + 'd', target_data])
+env_app.Program(appname + 'd', serversource)
+###
+
+### All
target_all = Alias('all', [target_client, target_server])
-env.Program(appname, commonsource + clientsource)
-env.Program(appname + 'd', commonsource + serversource)
-# env.AddPreAction(appname, autoconf(env)) Doesn't work right now..
env.Default(target_all)
+###
+
+# env.AddPreAction(appname, autoconf(env)) Doesn't work right now..
\ No newline at end of file
Added: trunk/nil-ng/build/nil-uv.sh
===================================================================
--- trunk/nil-ng/build/nil-uv.sh (rev 0)
+++ trunk/nil-ng/build/nil-uv.sh 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+root=$(dirname "$0")
+export LD_LIBRARY_PATH=${root}
+${root}/nil-uv
Property changes on: trunk/nil-ng/build/nil-uv.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/nil-ng/configure.py
===================================================================
--- trunk/nil-ng/configure.py 2007-09-23 17:59:19 UTC (rev 532)
+++ trunk/nil-ng/configure.py 2007-09-23 22:59:29 UTC (rev 533)
@@ -51,7 +51,6 @@
process_cc_headers(env, conf, depend['ccheaders'])
process_libs(env, conf, depend['libs'])
- #env.ParseConfig("sdl-config --version", function = CheckSDLConfig)
env = conf.Finish()
cache.Save(dependencies_cache, env)
Added: trunk/nil-ng/includes/Blittable.h
===================================================================
--- trunk/nil-ng/includes/Blittable.h (rev 0)
+++ trunk/nil-ng/includes/Blittable.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Blittable.h - Abstract base class for all objects with graphicable
+ * representation (declaration)
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef BLITTABLE_H_
+#define BLITTABLE_H_
+
+#include <SDL.h>
+
+class Blittable
+{
+public:
+ const SDL_Surface* surface() const;
+ const SDL_Rect& source_rect() const;
+ const unsigned short display_level() const;
+
+protected:
+ SDL_Surface* _surface;
+ unsigned short _display_level;
+ SDL_Rect _source_rect;
+
+ Blittable();
+ Blittable(SDL_Surface* _surface);
+ Blittable(SDL_Surface* _surface, const unsigned short __display_level);
+ Blittable(const unsigned short __display_level, const unsigned int width,
+ const unsigned int height, const unsigned short depth);
+ ~Blittable();
+};
+
+#endif // BLITTABLE_H_
Added: trunk/nil-ng/includes/CommandlineParser.h
===================================================================
--- trunk/nil-ng/includes/CommandlineParser.h (rev 0)
+++ trunk/nil-ng/includes/CommandlineParser.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,41 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * CommandlineParser.cc - Parser for command line options (declaration)
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _COMMANDLINEPARSER_H_
+#define _COMMANDLINEPARSER_H_
+
+#include "IConfigurationParser.h"
+#include <string>
+#include <getopt.h>
+
+class CommandlineParser : public IConfigurationParser
+{
+public:
+ CommandlineParser(int argc, char** argv) throw(ConfigurationFailure);
+ ~CommandlineParser()
+ { };
+
+ static std::string usage_table();
+
+private:
+ static const struct option long_options[];
+};
+
+#endif /* _COMMANDLINEPARSER_H_ */
Added: trunk/nil-ng/includes/ConfigFileParser.h
===================================================================
--- trunk/nil-ng/includes/ConfigFileParser.h (rev 0)
+++ trunk/nil-ng/includes/ConfigFileParser.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * ConfigFileParser.cc - Parser for xml-based configuration files
+ * (declaration)
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _CONFIGFILEPARSER_H_
+#define _CONFIGFILEPARSER_H_
+
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include "IConfigurationParser.h"
+
+class ConfigFileParser : public IConfigurationParser
+{
+public:
+ ConfigFileParser(std::string filename) throw(ParserError);
+};
+
+#endif /* _CONFIGFILEPARSER_H_ */
Added: trunk/nil-ng/includes/Configuration.h
===================================================================
--- trunk/nil-ng/includes/Configuration.h (rev 0)
+++ trunk/nil-ng/includes/Configuration.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,127 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Configuration.h - Configuration facility definition
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _CONFIGURATION_H_
+#define _CONFIGURATION_H_
+
+#include "IConsole.h"
+#include "ISubject.h"
+#include "NilException.h"
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <string>
+
+class ConfigurationFailure : public NilException
+{
+public:
+ ConfigurationFailure() throw()
+ : NilException()
+ { };
+ ConfigurationFailure(const std::string& arg) throw()
+ : NilException(arg)
+ { };
+ ConfigurationFailure(const std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+class AmbiguousResult : public ConfigurationFailure
+{
+public:
+ AmbiguousResult(const std::string& arg) throw()
+ : ConfigurationFailure(arg)
+ { };
+};
+
+/*! @author Alexander Kahl
+ * @brief Configuration class
+ *
+ * This class is used to handle the configuration. It can read options from
+ * the commandline and will support file reading later. Commandline has higher
+ * priority than the config file, which still has higher priority than the
+ * default values. You can ask instances of this object for options and will
+ * have the possibility to set options later. Therefore this class needs to
+ * know about immediate changes (simple things like server name) and changes
+ * for the next round (like next map). It also needs to determine if an option
+ * is client sided, server sided or both.
+ */
+class Configuration : public ISubject
+{
+public:
+ static Configuration& instance() throw(ConfigurationFailure);
+ static void instantiate(std::string filename, const int argc,
+ char** const argv) throw(ConfigurationFailure);
+ ~Configuration();
+
+ static const std::string usage();
+
+ template<typename T> T get_option(const char* path) const;
+ template<typename T> void set_option(const char* path, T data);
+
+private:
+ /*! @brief Default constructor
+ * This is the default constructor for the Configuration class. It will
+ * parse commandline, config file and defaults (descending priority).
+ *
+ * @param _console This is a handle to a console the Configuration
+ */
+ Configuration(std::string filename, const int argc,
+ char** const argv) throw(ConfigurationFailure);
+
+ /*! Make copy constructor private to protect the singleton */
+ Configuration(const Configuration&);
+ static Configuration* _instance;
+
+ std::string read_from_xpath(const char* path) const;
+ void write_to_xpath(const char* path, const char* value);
+ xmlNodeSet* evaluate_xpath(const char* path) const throw(
+ ConfigurationFailure);
+
+ xmlDoc* configuration;
+};
+
+template<typename T>
+ T
+ Configuration::get_option(const char* path) const
+ {
+ std::stringstream converter;
+ T value;
+
+ converter << this->read_from_xpath(path);
+ converter >> value;
+ return value;
+ }
+
+template<> bool Configuration::get_option<bool>(const char* path) const;
+template<> std::string Configuration::get_option<std::string>(const char* path) const;
+
+template<typename T>
+ void
+ Configuration::set_option(const char* path, T data)
+ {
+ std::ostringstream converter;
+ converter << data;
+ this->write_to_xpath(path, converter.str().c_str());
+ }
+
+template<> void Configuration::set_option<bool>(const char* path, bool data);
+template<> void Configuration::set_option<const char*>(const char* path, const char* data);
+
+#endif /* _CONFIGURATION_H_ */
Added: trunk/nil-ng/includes/EventHandler.h
===================================================================
--- trunk/nil-ng/includes/EventHandler.h (rev 0)
+++ trunk/nil-ng/includes/EventHandler.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * EventHandler.h - Event handler declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef EVENTHANDLER_H_
+#define EVENTHANDLER_H_
+
+#include "NilException.h"
+#include <SDL.h>
+
+class EventHandler
+{
+public:
+ static EventHandler& instance() throw(InstantiationFailure);
+ static void instantiate();
+ ~EventHandler();
+
+ void handle_events();
+ const SDLMod modifier_keys() const;
+
+private:
+ SDLMod _modifier_keys;
+
+ static EventHandler* _instance;
+ EventHandler();
+ EventHandler(const EventHandler&);
+};
+
+#endif /* EVENTHANDLER_H_ */
Added: trunk/nil-ng/includes/File.h
===================================================================
--- trunk/nil-ng/includes/File.h (rev 0)
+++ trunk/nil-ng/includes/File.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * File.h - File wrapper declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _FILE_H_
+#define _FILE_H_
+
+#include <string>
+#include <physfs.h>
+#include <SDL.h>
+
+class File
+{
+public:
+ File(std::string _filename, PHYSFS_file* _file, PHYSFS_sint64 _size);
+ ~File();
+
+ std::string filename() const;
+ std::string content() const;
+ PHYSFS_sint64 size() const;
+ SDL_RWops* sdl_rwops() const;
+
+private:
+ std::string _filename;
+ PHYSFS_file* file;
+ PHYSFS_sint64 _size;
+};
+
+#endif /* _FILE_H_ */
Added: trunk/nil-ng/includes/GraphicItem.h
===================================================================
--- trunk/nil-ng/includes/GraphicItem.h (rev 0)
+++ trunk/nil-ng/includes/GraphicItem.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,37 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * GraphicItem.cc - Container for graphical items (declaration)
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _GRAPHICITEM_H_
+#define _GRAPHICITEM_H_
+
+#include <string>
+#include <SDL.h>
+
+class GraphicItem
+{
+public:
+ GraphicItem(std::string filename);
+ ~GraphicItem();
+
+ SDL_Surface* image;
+ SDL_Rect destination;
+};
+
+#endif /* _GRAPHICITEM_H_ */
Added: trunk/nil-ng/includes/Graphics.h
===================================================================
--- trunk/nil-ng/includes/Graphics.h (rev 0)
+++ trunk/nil-ng/includes/Graphics.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,87 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Graphics.h - Graphics subengine
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _GRAPHICS_H_
+#define _GRAPHICS_H_
+
+#include "IObserver.h"
+#include "IConsole.h"
+#include "Configuration.h"
+#include "NilException.h"
+#include <SDL.h>
+#include <GL/gl.h>
+
+class Graphics : private IObserver
+{
+public:
+ static Graphics& instance() throw(InstantiationFailure);
+ static void instantiate();
+ ~Graphics();
+
+ void configure() throw(ConfigurationFailure);
+ void initialize() throw(InitializationFailure);
+ void update();
+ void blit(SDL_Surface* surface);
+ void blit(SDL_Surface* surface, SDL_Rect* dest);
+ void blit(SDL_Surface* surface, SDL_Rect* source, SDL_Rect* dest);
+ void clear();
+ const unsigned short width() const;
+ const unsigned short height() const;
+ const unsigned short depth() const;
+ SDL_Surface* create_surface(const unsigned int width,
+ const unsigned int height,
+ const unsigned short depth) const;
+
+ static SDL_Rect create_rect(int x, int y, int w, int h);
+ static SDL_Color create_color(int red, int green, int blue,
+ int alpha = 0x00);
+
+private:
+ Graphics();
+ // Make copy constructor private to protect the singleton
+ Graphics(const Graphics&);
+ static Graphics* _instance;
+
+ SDL_Surface* screen;
+ Uint32 video_flags;
+ unsigned short _width;
+ unsigned short _height;
+ unsigned short _depth;
+ bool is_opengl;
+ const SDL_VideoInfo* video_info;
+ enum
+ {
+ LILENDIAN,
+ BIGENDIAN
+ } byte_order;
+ struct
+ {
+ Uint8 rmask;
+ Uint8 gmask;
+ Uint8 bmask;
+ Uint8 amask;
+ } color_mask;
+
+ void update(const ISubject& source);
+ void initialize_gl() throw(InitializationFailure);
+ void update_gl();
+};
+
+#endif /* _GRAPHICS_H_ */
Added: trunk/nil-ng/includes/IConfigurationParser.h
===================================================================
--- trunk/nil-ng/includes/IConfigurationParser.h (rev 0)
+++ trunk/nil-ng/includes/IConfigurationParser.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,54 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * IConfigurationParser.h - Configuration parser interface definition
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _ICONFIGURATIONPARSER_H_
+#define _ICONFIGURATIONPARSER_H_
+
+#include "Configuration.h"
+#include "IConsole.h"
+
+class ParserError : public NilException
+{
+public:
+ ParserError() throw()
+ : NilException()
+ { };
+ ParserError(const std::string& arg) throw()
+ : NilException(arg)
+ { };
+ ParserError(const std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+class IConfigurationParser
+{
+public:
+ IConfigurationParser();
+ virtual ~IConfigurationParser();
+
+ xmlNode* get_config();
+ void dump(xmlNode* current);
+
+protected:
+ xmlNode* conf_node;
+};
+
+#endif /* _ICONFIGURATIONPARSER_H_ */
Added: trunk/nil-ng/includes/IConsole.h
===================================================================
--- trunk/nil-ng/includes/IConsole.h (rev 0)
+++ trunk/nil-ng/includes/IConsole.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,259 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * IConsole.h - Console interface definition
+ *
+ * Copyright (C) 2005 Christoph Brill (eg...@gm...)
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _ICONSOLE_H_
+#define _ICONSOLE_H_
+
+#include "NilException.h"
+#include <string>
+#include <set>
+#include <iostream>
+#include <sstream>
+
+/*! Thrown when console to be slaved is already a slave. */
+class AlreadySlave : public NilException
+{
+public:
+ AlreadySlave() throw()
+ : NilException()
+ { };
+ AlreadySlave(const std::string& arg) throw()
+ : NilException(arg)
+ { };
+ AlreadySlave(const std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+/*! Thrown when console that is expected to be slave is not a slave. */
+class NotSlave : public NilException
+{
+public:
+ NotSlave() throw()
+ : NilException()
+ { };
+ NotSlave(const std::string& arg) throw()
+ : NilException(arg)
+ { };
+ NotSlave(const std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+/*! Thrown when slaveness relations would form a loop after adding slave. */
+class SlaveLoop : public NilException
+{
+public:
+ SlaveLoop() throw()
+ : NilException()
+ { };
+ SlaveLoop(const std::string& arg) throw()
+ : NilException(arg)
+ { };
+ SlaveLoop(const std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+/*!
+ * @author Alexander Kahl
+ * @brief ostream style interface for Console
+ *
+ * This template permits the creation of binary operator << accessible objects
+ * inside classes derived from Console. Performing << on flexostream calls
+ * put_output on class S. Class X is the type for a second parameter
+ * transmitted to put_output, in the implementation below it is
+ * Console::Severity.
+ * @ingroup console
+ */
+template<class ClassT, typename SeverityT>
+ class flexostream : public std::ios
+ {
+ public:
+ flexostream(ClassT _console, const SeverityT _severity)
+ : std::ios(), console(_console), severity(_severity)
+ { };
+
+ template<class T> flexostream<ClassT, SeverityT>
+ & operator<<(const T& value);
+
+ private:
+ ClassT console;
+ const SeverityT severity;
+ };
+
+template<class ClassT, class SeverityT>
+ template<class T>
+ flexostream<ClassT, SeverityT>&
+ flexostream<ClassT, SeverityT>::operator<<(const T& value)
+ {
+ std::ostringstream x;
+ x << value;
+ this->console->_put_output(x.str(), this->severity);
+ return *this;
+ }
+
+/*!
+ * @author H. Ilari Liusvaara
+ * @author Alexander Kahl
+ * @brief The base class for consoles
+ *
+ * This class is the father for all consoles. The term "consoles" reffers
+ * to those things in NiL, that can put out messages and also read input
+ * from these consoles. Every console should implement the methods
+ * put_output (necessary), send_command, get_command and forward output.
+ * @ingroup console
+ */
+class IConsole
+{
+public:
+ /*! @enum Severity The severity levels a console supports */
+ enum Severity
+ {
+ DEBUG = 0,
+ MESSAGE = 1,
+ WARNING = 2,
+ ERROR = 3,
+ FATAL = 4
+ };
+
+ flexostream<IConsole*, IConsole::Severity>* cdebug;
+ flexostream<IConsole*, IConsole::Severity>* cmessage;
+ flexostream<IConsole*, IConsole::Severity>* cwarning;
+ flexostream<IConsole*, IConsole::Severity>* cerror;
+ flexostream<IConsole*, IConsole::Severity>* cfatal;
+
+ static const char endl;
+
+ /*! @brief Constructor
+ This constructor takes care that by default there is no master
+ console and sets the chattiness to the given value.
+ @param minimum The severity level this console has. */
+ IConsole(IConsole::Severity minimum = IConsole::MESSAGE);
+ /*! @brief Destructor
+ The console detaches itself from its parent and notifies all
+ slaves that it will be gone and that they will have to talk to
+ the master of this console. */
+ virtual ~IConsole();
+
+ /*! @brief Add new slave.
+ This method is called (mostly by a console itself) to attach a
+ console to this one. That effectively means that the called
+ console will become the master and the console in the argument
+ will become the slave.
+ @param Console The slave console to be attached
+ @throws Already_slave This is thrown when the console already is
+ a slave of this one
+ @throws Save_loop This is thrown when attaching it would cause that
+ the consoles would be in a circular master-slave
+ relationship, which is not allowed. */
+ void add_slave(IConsole* slave) throw(AlreadySlave, SlaveLoop);
+
+ /*! @brief Remove slave.
+ @param slave The slave-console that should be removed
+ @throws Not_slave This is thrown when you try to remove a slave that
+ is not a slave of this console. */
+ void remove_slave(IConsole* slave) throw(NotSlave);
+
+ /*! @brief Print out a message
+ This method is called to print out a message. It is completely abstract
+ and therefore a deriving console needs to implement it. By default
+ this console cannot put out anything (nor be instanciated).
+ @param severity The severity of the message we want to print out
+ @param message The message we want to print out */
+ virtual void put_output(std::string message) = 0;
+
+ /*! @brief TODO
+ TODO
+ @param severity TODO
+ @param command TODO
+ @throws TODO */
+ virtual int send_command(Severity severity, std::string command) const;
+
+ /*! @brief Change the chattiness
+ This method is called to adjust the severity of this console. The
+ value is simply stored in an internal variable that we compare to
+ if we call put_output
+ @param minimum The severity this console should run on */
+ void set_chattiness(IConsole::Severity minimum);
+
+ /*! @brief Clear output text */
+ virtual void clear() = 0;
+
+ static IConsole* primary();
+
+ void crown();
+
+protected:
+ /*! Handle to the master of this console */
+ IConsole* master;
+
+ /*! This defines the minimum level at which we forward messages and/or
+ print them out. */
+ IConsole::Severity chattiness;
+
+ /*! List of our slaves */
+ std::set<IConsole*> slaves;
+
+ /*! @brief Traceback ultimate master.
+ This method is used to find the master of all consoles (the one that
+ has no master) */
+ IConsole* trace_master();
+
+ /*! @brief Notify about new slave relationship.
+ This method is used to inform the clients about a new master. This is
+ interesting if the console is going down and that the clients will not
+ run without a master. Also this method takes care that a console becomes
+ new ultimate master if the ultimate master is the console going down right now.
+ @param newmaster The new master for the slave
+ @throws Already_slave This is thrown when the console already is
+ a slave of this one
+ @throws Save_loop This is thrown when attaching it would cause that
+ the consoles would be in a circular master-slave
+ relationship, which is not allowed. */
+ void notify_slave(IConsole* newmaster) throw(AlreadySlave, SlaveLoop);
+
+ /*! @brief Get command.
+ TODO */
+ virtual void get_command();
+
+private:
+ /*! @brief Forward a message to the clients
+ This method is used to inform its slaves about a new message. The clients can
+ decide for themselves if the severity was high enough to do something with
+ the message.
+ @param severity The severity of the message we forward to our slaves
+ @param message The message we forward */
+ virtual void forward_output(Severity severity, std::string message) const;
+
+ /*! @brief Internal output handler
+ Attaches escape control sequences according to severity and forwards the modified
+ message to put_output
+ @param severity The severity of the message we want to print out
+ @param message The message we want to print out */
+ void _put_output(std::string message, IConsole::Severity severity);
+
+ static IConsole* _primary;
+
+ friend class flexostream<IConsole*, IConsole::Severity>;
+};
+
+#endif // _ICONSOLE_H_
Added: trunk/nil-ng/includes/INetwork.h
===================================================================
--- trunk/nil-ng/includes/INetwork.h (rev 0)
+++ trunk/nil-ng/includes/INetwork.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * INetwork.h - Networking interface (definition)
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _INETWORK_H_
+#define _INETWORK_H_
+
+#include "IConsole.h"
+#include "Configuration.h"
+#include "NilException.h"
+
+/* ATTENTION! SDL_net.h is broken for c++ .. remove the ';' at line 416
+ * we need to tell the hacker(s) of SDL net to fix it
+ */
+#include <SDL_net.h>
+#include <SDL_thread.h>
+
+class NetworkingException : public NilException
+{
+ NetworkingException() throw()
+ : NilException()
+ { };
+ NetworkingException(std::string& arg) throw()
+ : NilException(arg)
+ { };
+ NetworkingException(std::string& arg, unsigned long address) throw()
+ : NilException(arg, address)
+ { };
+};
+
+class INetwork
+{
+public:
+ INetwork(IConsole* _console, Configuration* _config);
+ virtual ~INetwork();
+ /*! Socket descriptor */
+ UDPsocket sd;
+ /*! Pointer to packet memory */
+ UDPpacket *p;
+ /*! Flag to quit the network loop */
+ bool quit;
+
+protected:
+ IConsole* console;
+ Configuration* config;
+ SDL_Thread *thread;
+
+ unsigned int port;
+ unsigned int buffer_size;
+ virtual void configure() throw(ConfigurationFailure) = 0;
+ virtual void initialize() throw(InitializationFailure) = 0;
+};
+
+#endif /* _INETWORK_H_ */
Added: trunk/nil-ng/includes/IObserver.h
===================================================================
--- trunk/nil-ng/includes/IObserver.h (rev 0)
+++ trunk/nil-ng/includes/IObserver.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,36 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * IObserver.h - Observer pattern interface declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _IOBSERVER_H_
+#define _IOBSERVER_H_
+
+class ISubject;
+
+class IObserver
+{
+protected:
+ IObserver() {};
+ virtual ~IObserver() {};
+ virtual void update(const ISubject& source) = 0;
+
+ friend class ISubject;
+};
+
+#endif /* _IOBSERVER_H_ */
Added: trunk/nil-ng/includes/ISubject.h
===================================================================
--- trunk/nil-ng/includes/ISubject.h (rev 0)
+++ trunk/nil-ng/includes/ISubject.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * ISubject.h - Observer pattern subject interface declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _ISUBJECT_H_
+#define _ISUBJECT_H_
+
+#include "IObserver.h"
+#include <vector>
+
+class ISubject
+{
+public:
+ void attach(IObserver* target);
+ void detach(const IObserver* target);
+
+protected:
+ std::vector<IObserver*> observers;
+ ISubject() {};
+ virtual ~ISubject() {};
+ void notify();
+};
+
+#endif /* _ISUBJECT_H_ */
Added: trunk/nil-ng/includes/Interactive.h
===================================================================
--- trunk/nil-ng/includes/Interactive.h (rev 0)
+++ trunk/nil-ng/includes/Interactive.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Interactive.h - Pattern for interactive objects declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _INTERACTIVE_H_
+#define _INTERACTIVE_H_
+
+#include <SDL.h>
+#include <list>
+
+class Interactive
+{
+public:
+ static void handle_keyboard_event(const SDL_Event event);
+ static void handle_mouse_event(const SDL_Event event);
+
+protected:
+ static Interactive* active_instance;
+
+ Interactive();
+ virtual ~Interactive();
+
+ virtual void _handle_keyboard_event(SDL_Event event) = 0;
+ virtual void _handle_mouse_event(SDL_Event event) = 0;
+
+private:
+ static std::list<Interactive*> instances;
+};
+
+#endif // _INTERACTIVE_H_
Added: trunk/nil-ng/includes/Keyboard.h
===================================================================
--- trunk/nil-ng/includes/Keyboard.h (rev 0)
+++ trunk/nil-ng/includes/Keyboard.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Keyboard.h - Keyboard input handler declaration
+ *
+ * Copyright (C) 2005 Christoph Brill (eg...@gm...)
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _KEYBOARD_H_
+#define _KEYBOARD_H_
+
+#include "NilException.h"
+#include "IConsole.h"
+#include "Configuration.h"
+
+#include <SDL.h>
+
+class Keyboard
+{
+public:
+ Keyboard(IConsole* _console, Configuration* _config);
+ ~Keyboard();
+
+ void update_state();
+
+private:
+ IConsole* console;
+ Configuration* config;
+};
+
+#endif /* _KEYBOARD_H_ */
Added: trunk/nil-ng/includes/Movable.h
===================================================================
--- trunk/nil-ng/includes/Movable.h (rev 0)
+++ trunk/nil-ng/includes/Movable.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * Movable.h - Abstract base class for objects capable of movement declaration
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef MOVABLE_H_
+#define MOVABLE_H_
+
+#include <utility>
+
+typedef std::pair<float, float> movement_vector;
+
+class Movable
+{
+public:
+ float get_movement_x() const;
+ float get_movement_y() const;
+ movement_vector get_movement() const;
+ float get_speed() const;
+
+ void set_movement_x(float speed_x);
+ void set_movement_y(float speed_y);
+ void set_movement(movement_vector _movement);
+
+protected:
+ movement_vector movement;
+
+ Movable();
+ virtual ~Movable();
+};
+
+#endif /* MOVABLE_H_ */
Added: trunk/nil-ng/includes/NilException.h
===================================================================
--- trunk/nil-ng/includes/NilException.h (rev 0)
+++ trunk/nil-ng/includes/NilException.h 2007-09-23 22:59:29 UTC (rev 533)
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * NilException.h - NiL exception definition
+ *
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
+#ifndef _NILEXCEPTION_H_
+#define _NILEXCEPTION_H_
+
+#include <exception>
+#include <string>
+
+/*!
+ * @author Alexander Kahl
+ * @brief An implementation of an exception
+ *
+ * This class contains the basic functionality for exception handling. It will
+ * provide you with things like a string to let the exception tell what
+ * excatly happend. Eventhough giving a string is optional, it is highly
+ * recommend to use it. This string can be print out to console or to a file
+ * for example, and can help finding bugs faster. All exceptions you will
+ * use in NiL will have to be children of this class.
+ * @ingroup exceptions
+ */
+class NilException : public std::exception
+{
+public:
+ /*!
+ * @brief Default constructor
+ * This is the default constructor for an exception without any
+ * additional info.
+ */
+ NilException() throw();
+ ...
[truncated message content] |
|
From: <e-...@us...> - 2007-09-23 17:59:16
|
Revision: 532
http://nil.svn.sourceforge.net/nil/?rev=532&view=rev
Author: e-user
Date: 2007-09-23 10:59:19 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
* updated missing license information
* fixed license header indentation
Modified Paths:
--------------
trunk/nil-ng/src/client/console/SdlConsole.cc
trunk/nil-ng/src/client/console/SdlConsole.h
trunk/nil-ng/src/client/graphics/Font.cc
trunk/nil-ng/src/client/graphics/Font.h
trunk/nil-ng/src/client/input/Mouse.cc
trunk/nil-ng/src/client/input/Mouse.h
trunk/nil-ng/src/client/main.cc
trunk/nil-ng/src/client/net/NetworkClient.cc
trunk/nil-ng/src/client/net/NetworkClient.h
trunk/nil-ng/src/common/configuration/CommandlineParser.cc
trunk/nil-ng/src/common/configuration/CommandlineParser.h
trunk/nil-ng/src/common/configuration/ConfigFileParser.cc
trunk/nil-ng/src/common/configuration/ConfigFileParser.h
trunk/nil-ng/src/common/configuration/Configuration.cc
trunk/nil-ng/src/common/configuration/Configuration.h
trunk/nil-ng/src/common/configuration/IConfigurationParser.cc
trunk/nil-ng/src/common/configuration/IConfigurationParser.h
trunk/nil-ng/src/common/console/IConsole.cc
trunk/nil-ng/src/common/console/IConsole.h
trunk/nil-ng/src/common/console/TextConsole.cc
trunk/nil-ng/src/common/console/TextConsole.h
trunk/nil-ng/src/common/exceptions/NilException.cc
trunk/nil-ng/src/common/exceptions/NilException.h
trunk/nil-ng/src/common/graphics/Blittable.cc
trunk/nil-ng/src/common/graphics/Blittable.h
trunk/nil-ng/src/common/graphics/GraphicItem.cc
trunk/nil-ng/src/common/graphics/GraphicItem.h
trunk/nil-ng/src/common/graphics/Graphics.cc
trunk/nil-ng/src/common/graphics/Graphics.h
trunk/nil-ng/src/common/input/EventHandler.cc
trunk/nil-ng/src/common/input/EventHandler.h
trunk/nil-ng/src/common/input/Interactive.cc
trunk/nil-ng/src/common/input/Interactive.h
trunk/nil-ng/src/common/input/Keyboard.cc
trunk/nil-ng/src/common/input/Keyboard.h
trunk/nil-ng/src/common/net/INetwork.cc
trunk/nil-ng/src/common/net/INetwork.h
trunk/nil-ng/src/common/pattern/IObserver.h
trunk/nil-ng/src/common/pattern/ISubject.cc
trunk/nil-ng/src/common/pattern/ISubject.h
trunk/nil-ng/src/common/physics/Movable.cc
trunk/nil-ng/src/common/physics/Movable.h
trunk/nil-ng/src/common/vfs/File.cc
trunk/nil-ng/src/common/vfs/File.h
trunk/nil-ng/src/common/vfs/VFS.cc
trunk/nil-ng/src/common/vfs/VFS.h
Modified: trunk/nil-ng/src/client/console/SdlConsole.cc
===================================================================
--- trunk/nil-ng/src/client/console/SdlConsole.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/console/SdlConsole.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "SdlConsole.h"
Modified: trunk/nil-ng/src/client/console/SdlConsole.h
===================================================================
--- trunk/nil-ng/src/client/console/SdlConsole.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/console/SdlConsole.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _SDLCONSOLE_H_
Modified: trunk/nil-ng/src/client/graphics/Font.cc
===================================================================
--- trunk/nil-ng/src/client/graphics/Font.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/graphics/Font.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Font.h"
Modified: trunk/nil-ng/src/client/graphics/Font.h
===================================================================
--- trunk/nil-ng/src/client/graphics/Font.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/graphics/Font.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _FONT_H_
Modified: trunk/nil-ng/src/client/input/Mouse.cc
===================================================================
--- trunk/nil-ng/src/client/input/Mouse.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/input/Mouse.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,12 +1,12 @@
-/********************************************************************************
+/******************************************************************************
* NiL isn't Liero
- * Mouse.cc - Implementation of Mouse
+ * Mouse.cc - Represents the mouse cursor and state information (implementation)
*
- * Copyright (C) 2006 Alexander Kahl <e-...@us...>
+ * Copyright (C) 2006 Alexander Kahl <e-...@gm...>
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,10 +15,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- ********************************************************************************/
+ *****************************************************************************/
#include "Mouse.h"
Mouse::Mouse()
Modified: trunk/nil-ng/src/client/input/Mouse.h
===================================================================
--- trunk/nil-ng/src/client/input/Mouse.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/input/Mouse.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,12 +1,12 @@
-/********************************************************************************
+/******************************************************************************
* NiL isn't Liero
- * Mouse.h - Represents the mouse cursor and its state information
+ * Mouse.h - Represents the mouse cursor and state information (definition)
*
- * Copyright (C) 2006 Alexander Kahl <e-...@us...>
+ * Copyright (C) 2006 Alexander Kahl <e-...@gm...>
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,10 +15,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- ********************************************************************************/
+ *****************************************************************************/
#ifndef MOUSE_H_
#define MOUSE_H_
Modified: trunk/nil-ng/src/client/main.cc
===================================================================
--- trunk/nil-ng/src/client/main.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/main.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "common/vfs/VFS.h"
Modified: trunk/nil-ng/src/client/net/NetworkClient.cc
===================================================================
--- trunk/nil-ng/src/client/net/NetworkClient.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/net/NetworkClient.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * NetworkClient.cc - Networking client (implementation)
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
#include "client/net/NetworkClient.h"
int client_net_loop(void* _this);
Modified: trunk/nil-ng/src/client/net/NetworkClient.h
===================================================================
--- trunk/nil-ng/src/client/net/NetworkClient.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/client/net/NetworkClient.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * NetworkClient.h - Networking client (definition)
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
#ifndef _NETWORKCLIENT_H_
#define _NETWORKCLIENT_H_
Modified: trunk/nil-ng/src/common/configuration/CommandlineParser.cc
===================================================================
--- trunk/nil-ng/src/common/configuration/CommandlineParser.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/CommandlineParser.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "CommandlineParser.h"
Modified: trunk/nil-ng/src/common/configuration/CommandlineParser.h
===================================================================
--- trunk/nil-ng/src/common/configuration/CommandlineParser.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/CommandlineParser.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _COMMANDLINEPARSER_H_
Modified: trunk/nil-ng/src/common/configuration/ConfigFileParser.cc
===================================================================
--- trunk/nil-ng/src/common/configuration/ConfigFileParser.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/ConfigFileParser.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "ConfigFileParser.h"
Modified: trunk/nil-ng/src/common/configuration/ConfigFileParser.h
===================================================================
--- trunk/nil-ng/src/common/configuration/ConfigFileParser.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/ConfigFileParser.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _CONFIGFILEPARSER_H_
Modified: trunk/nil-ng/src/common/configuration/Configuration.cc
===================================================================
--- trunk/nil-ng/src/common/configuration/Configuration.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/Configuration.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Configuration.h"
Modified: trunk/nil-ng/src/common/configuration/Configuration.h
===================================================================
--- trunk/nil-ng/src/common/configuration/Configuration.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/Configuration.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _CONFIGURATION_H_
Modified: trunk/nil-ng/src/common/configuration/IConfigurationParser.cc
===================================================================
--- trunk/nil-ng/src/common/configuration/IConfigurationParser.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/IConfigurationParser.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "IConfigurationParser.h"
Modified: trunk/nil-ng/src/common/configuration/IConfigurationParser.h
===================================================================
--- trunk/nil-ng/src/common/configuration/IConfigurationParser.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/configuration/IConfigurationParser.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _ICONFIGURATIONPARSER_H_
Modified: trunk/nil-ng/src/common/console/IConsole.cc
===================================================================
--- trunk/nil-ng/src/common/console/IConsole.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/console/IConsole.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "IConsole.h"
Modified: trunk/nil-ng/src/common/console/IConsole.h
===================================================================
--- trunk/nil-ng/src/common/console/IConsole.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/console/IConsole.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -2,7 +2,6 @@
* NiL isn't Liero
* IConsole.h - Console interface definition
*
- * Copyright (C) 2004 H. Ilari Liusvaara (hli...@cc...)
* Copyright (C) 2005 Christoph Brill (eg...@gm...)
* Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
*
@@ -11,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _ICONSOLE_H_
Modified: trunk/nil-ng/src/common/console/TextConsole.cc
===================================================================
--- trunk/nil-ng/src/common/console/TextConsole.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/console/TextConsole.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "TextConsole.h"
Modified: trunk/nil-ng/src/common/console/TextConsole.h
===================================================================
--- trunk/nil-ng/src/common/console/TextConsole.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/console/TextConsole.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _TEXTCONSOLE_H_
Modified: trunk/nil-ng/src/common/exceptions/NilException.cc
===================================================================
--- trunk/nil-ng/src/common/exceptions/NilException.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/exceptions/NilException.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "NilException.h"
Modified: trunk/nil-ng/src/common/exceptions/NilException.h
===================================================================
--- trunk/nil-ng/src/common/exceptions/NilException.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/exceptions/NilException.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _NILEXCEPTION_H_
Modified: trunk/nil-ng/src/common/graphics/Blittable.cc
===================================================================
--- trunk/nil-ng/src/common/graphics/Blittable.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/Blittable.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Blittable.h"
Modified: trunk/nil-ng/src/common/graphics/Blittable.h
===================================================================
--- trunk/nil-ng/src/common/graphics/Blittable.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/Blittable.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef BLITTABLE_H_
Modified: trunk/nil-ng/src/common/graphics/GraphicItem.cc
===================================================================
--- trunk/nil-ng/src/common/graphics/GraphicItem.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/GraphicItem.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "GraphicItem.h"
Modified: trunk/nil-ng/src/common/graphics/GraphicItem.h
===================================================================
--- trunk/nil-ng/src/common/graphics/GraphicItem.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/GraphicItem.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _GRAPHICITEM_H_
Modified: trunk/nil-ng/src/common/graphics/Graphics.cc
===================================================================
--- trunk/nil-ng/src/common/graphics/Graphics.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/Graphics.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Graphics.h"
Modified: trunk/nil-ng/src/common/graphics/Graphics.h
===================================================================
--- trunk/nil-ng/src/common/graphics/Graphics.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/graphics/Graphics.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _GRAPHICS_H_
Modified: trunk/nil-ng/src/common/input/EventHandler.cc
===================================================================
--- trunk/nil-ng/src/common/input/EventHandler.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/EventHandler.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "EventHandler.h"
Modified: trunk/nil-ng/src/common/input/EventHandler.h
===================================================================
--- trunk/nil-ng/src/common/input/EventHandler.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/EventHandler.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef EVENTHANDLER_H_
Modified: trunk/nil-ng/src/common/input/Interactive.cc
===================================================================
--- trunk/nil-ng/src/common/input/Interactive.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/Interactive.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Interactive.h"
Modified: trunk/nil-ng/src/common/input/Interactive.h
===================================================================
--- trunk/nil-ng/src/common/input/Interactive.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/Interactive.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _INTERACTIVE_H_
Modified: trunk/nil-ng/src/common/input/Keyboard.cc
===================================================================
--- trunk/nil-ng/src/common/input/Keyboard.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/Keyboard.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -2,21 +2,20 @@
* NiL isn't Liero
* Keyboard.cc - Keyboard input handler implementation
*
- * Copyright (C) 2005 Christoph Brill (eg...@gm...)
- * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
+ * Copyright (C) 2005,2006,2007 Alexander Kahl <e-...@gm...>
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Keyboard.h"
Modified: trunk/nil-ng/src/common/input/Keyboard.h
===================================================================
--- trunk/nil-ng/src/common/input/Keyboard.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/input/Keyboard.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -10,13 +10,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _KEYBOARD_H_
Modified: trunk/nil-ng/src/common/net/INetwork.cc
===================================================================
--- trunk/nil-ng/src/common/net/INetwork.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/net/INetwork.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * INetwork.cc - Networking interface (implementation)
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
#include "common/net/INetwork.h"
INetwork::INetwork(IConsole* _console, Configuration* _config) :
Modified: trunk/nil-ng/src/common/net/INetwork.h
===================================================================
--- trunk/nil-ng/src/common/net/INetwork.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/net/INetwork.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * NiL isn't Liero
+ * INetwork.h - Networking interface (definition)
+ *
+ * Copyright (C) 2006,2007 Alexander Kahl <e-...@gm...>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
#ifndef _INETWORK_H_
#define _INETWORK_H_
Modified: trunk/nil-ng/src/common/pattern/IObserver.h
===================================================================
--- trunk/nil-ng/src/common/pattern/IObserver.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/pattern/IObserver.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _IOBSERVER_H_
Modified: trunk/nil-ng/src/common/pattern/ISubject.cc
===================================================================
--- trunk/nil-ng/src/common/pattern/ISubject.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/pattern/ISubject.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "ISubject.h"
Modified: trunk/nil-ng/src/common/pattern/ISubject.h
===================================================================
--- trunk/nil-ng/src/common/pattern/ISubject.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/pattern/ISubject.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef _ISUBJECT_H_
Modified: trunk/nil-ng/src/common/physics/Movable.cc
===================================================================
--- trunk/nil-ng/src/common/physics/Movable.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/physics/Movable.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#include "Movable.h"
Modified: trunk/nil-ng/src/common/physics/Movable.h
===================================================================
--- trunk/nil-ng/src/common/physics/Movable.h 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/physics/Movable.h 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
#ifndef MOVABLE_H_
Modified: trunk/nil-ng/src/common/vfs/File.cc
===================================================================
--- trunk/nil-ng/src/common/vfs/File.cc 2007-09-23 00:34:44 UTC (rev 531)
+++ trunk/nil-ng/src/common/vfs/File.cc 2007-09-23 17:59:19 UTC (rev 532)
@@ -9,13 +9,13 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your o...
[truncated message content] |
|
From: <e-...@us...> - 2007-09-23 00:34:41
|
Revision: 531
http://nil.svn.sourceforge.net/nil/?rev=531&view=rev
Author: e-user
Date: 2007-09-22 17:34:44 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
* new data target to package the media files
* applied new data package at vfs facility loading
Modified Paths:
--------------
trunk/nil-ng/build/SConscript
trunk/nil-ng/src/client/main.cc
Modified: trunk/nil-ng/build/SConscript
===================================================================
--- trunk/nil-ng/build/SConscript 2007-09-23 00:01:46 UTC (rev 530)
+++ trunk/nil-ng/build/SConscript 2007-09-23 00:34:44 UTC (rev 531)
@@ -50,8 +50,8 @@
clientsource = SConscript('../src/client/SConscript')
serversource = SConscript('../src/server/SConscript')
###
-
-target_client = Alias('client', appname)
+target_data = env.Zip('data.nilpkg', '../data')
+target_client = Alias('client', [appname, target_data])
target_server = Alias('server', appname + 'd')
target_all = Alias('all', [target_client, target_server])
env.Program(appname, commonsource + clientsource)
Modified: trunk/nil-ng/src/client/main.cc
===================================================================
--- trunk/nil-ng/src/client/main.cc 2007-09-23 00:01:46 UTC (rev 530)
+++ trunk/nil-ng/src/client/main.cc 2007-09-23 00:34:44 UTC (rev 531)
@@ -58,8 +58,9 @@
}
VFS::instantiate(argv[0]);
+ VFS::instance().add_resource(std::string(PHYSFS_getBaseDir()) + "/data.nilpkg");
VFS::instance().add_resource(PHYSFS_getBaseDir());
-
+
// Create text console, make it standard.
TextConsole* text_console = new TextConsole(IConsole::DEBUG);
text_console->crown();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-23 00:01:42
|
Revision: 530
http://nil.svn.sourceforge.net/nil/?rev=530&view=rev
Author: e-user
Date: 2007-09-22 17:01:46 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
* updated authors
Modified Paths:
--------------
trunk/nil-ng/AUTHORS
Modified: trunk/nil-ng/AUTHORS
===================================================================
--- trunk/nil-ng/AUTHORS 2007-09-22 23:56:29 UTC (rev 529)
+++ trunk/nil-ng/AUTHORS 2007-09-23 00:01:46 UTC (rev 530)
@@ -1,18 +1,17 @@
Cast (alphabetical)
=============================
-e-user Alexander Kahl (Main Developer) <e-...@us...>
-egore Christoph Brill (Team Leader) <eg...@us...>
-fijal Maciek Fijalkowski (Developer) <fi...@us...>
-pghowlett Phil Howlett (Win32 Porter) <pgh...@us...>
-ilari Harri Ilari Tapio Liusvaara (Developer) <hli...@cc...>
+e-user Alexander Kahl (One Man Army) <e-...@gm...>
-
Old Staff (alphabetical)
=============================
dion Flemming Frandsen (Founder and Main Developer) <di...@sw...>
- Tamminen Eero (Developer) <t1...@st...>
+egore Christoph Brill (Team Leader) <eg...@us...>
+fijal Maciek Fijalkowski (Developer) <fi...@us...>
+ilari Harri Ilari Tapio Liusvaara (Developer) <hli...@cc...>
NT Nils Thuerey (Developer) <n_...@gm...>
+pghowlett Phil Howlett (Win32 Porter) <pgh...@us...>
qute Anders Rosendal (Developer) <qu...@kl...>
samnmax Sam N. Max (Developer) <sa...@ho...>
+ Tamminen Eero (Developer) <t1...@st...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 23:56:28
|
Revision: 529
http://nil.svn.sourceforge.net/nil/?rev=529&view=rev
Author: e-user
Date: 2007-09-22 16:56:29 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
* fixed and pimped svn2cl ChangeLog creation
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Added Paths:
-----------
trunk/nil-ng/ChangeLog
trunk/nil-ng/authors.xml
Added: trunk/nil-ng/ChangeLog
===================================================================
--- trunk/nil-ng/ChangeLog (rev 0)
+++ trunk/nil-ng/ChangeLog 2007-09-22 23:56:29 UTC (rev 529)
@@ -0,0 +1,1032 @@
+2007-09-22 Alexander Kahl <e-...@gm...>
+
+ * config.conf: removed obsoleted config.conf
+ * SConstruct: removed obsoleted builder for autoconf
+ * dependencies.py: fixed indentation
+ * SConstruct, configure.py, dependencies.py: deeply improved and
+ abstracted autoconfiguration process
+ * src/common/World.cc: improved performance test simulation
+ * data/fonts/DejaVu LGC Sans Mono.ttf, data/fonts/VeraMono.ttf,
+ src/client/console/SdlConsole.cc: modified standard font
+
+2007-09-19 Alexander Kahl <e-...@gm...>
+
+ * .cproject, src/client/audio/Soundsystem.cc,
+ src/client/audio/Soundsystem.h, src/client/console/SdlConsole.cc,
+ src/client/console/SdlConsole.h, src/client/main.cc,
+ src/common/World.cc, src/common/World.h,
+ src/common/configuration/CommandlineParser.cc,
+ src/common/configuration/CommandlineParser.h,
+ src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h,
+ src/common/configuration/Configuration.cc,
+ src/common/configuration/Configuration.h,
+ src/common/configuration/IConfigurationParser.cc,
+ src/common/configuration/IConfigurationParser.h,
+ src/common/console/IConsole.cc, src/common/console/IConsole.h,
+ src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h:
+ total makeover: all facilities are strictly used as singletons
+ now
+
+2007-09-17 Alexander Kahl <e-...@gm...>
+
+ * .: updated ignores
+ * .cproject, .pydevproject: eclipsification
+ * src/common/vfs/physfsrwops.cc, src/common/vfs/physfsrwops.h: -
+ * src/common/net/INetwork.cc: -
+
+2007-09-16 Alexander Kahl <e-...@gm...>
+
+ * docs, docs/doxygen: update ignore
+ * .sconsign.dblite: -
+ * .pydevproject: -
+ * .cproject: -
+ * ., .cproject, .pydevproject, .sconsign.dblite, COPYING,
+ ChangeLog, SConstruct, config.conf, data/config/client.conf,
+ docs/Doxyfile, docs/doxygen, docs/doxygen/html,
+ docs/doxygen/html/CommandlineParser_8h-source.html,
+ docs/doxygen/html/ConfigFileParser_8h-source.html,
+ docs/doxygen/html/Configuration_8h-source.html,
+ docs/doxygen/html/File_8h-source.html,
+ docs/doxygen/html/Font_8h-source.html,
+ docs/doxygen/html/GraphicItem_8h-source.html,
+ docs/doxygen/html/Graphics_8h-source.html,
+ docs/doxygen/html/IConfigurationParser_8h-source.html,
+ docs/doxygen/html/IConsole_8h-source.html,
+ docs/doxygen/html/INetwork_8h-source.html,
+ docs/doxygen/html/IObserver_8h-source.html,
+ docs/doxygen/html/ISubject_8h-source.html,
+ docs/doxygen/html/NetworkClient_8h-source.html,
+ docs/doxygen/html/SdlConsole_8h-source.html,
+ docs/doxygen/html/Soundsystem_8h-source.html,
+ docs/doxygen/html/TextConsole_8h-source.html,
+ docs/doxygen/html/Vfs_8h-source.html,
+ docs/doxygen/html/World_8h-source.html,
+ docs/doxygen/html/annotated.html,
+ docs/doxygen/html/classAlreadySlave-members.html,
+ docs/doxygen/html/classAlreadySlave.html,
+ docs/doxygen/html/classAlreadySlave__coll__graph.map,
+ docs/doxygen/html/classAlreadySlave__coll__graph.md5,
+ docs/doxygen/html/classAlreadySlave__coll__graph.png,
+ docs/doxygen/html/classAlreadySlave__inherit__graph.map,
+ docs/doxygen/html/classAlreadySlave__inherit__graph.md5,
+ docs/doxygen/html/classAlreadySlave__inherit__graph.png,
+ docs/doxygen/html/classConfiguration-members.html,
+ docs/doxygen/html/classConfiguration.html,
+ docs/doxygen/html/classConfiguration__coll__graph.map,
+ docs/doxygen/html/classConfiguration__coll__graph.md5,
+ docs/doxygen/html/classConfiguration__coll__graph.png,
+ docs/doxygen/html/classFont-members.html,
+ docs/doxygen/html/classFont.html,
+ docs/doxygen/html/classFont__coll__graph.map,
+ docs/doxygen/html/classFont__coll__graph.md5,
+ docs/doxygen/html/classFont__coll__graph.png,
+ docs/doxygen/html/classIConsole-members.html,
+ docs/doxygen/html/classIConsole.html,
+ docs/doxygen/html/classIConsole__coll__graph.map,
+ docs/doxygen/html/classIConsole__coll__graph.md5,
+ docs/doxygen/html/classIConsole__coll__graph.png,
+ docs/doxygen/html/classIConsole__inherit__graph.map,
+ docs/doxygen/html/classIConsole__inherit__graph.md5,
+ docs/doxygen/html/classIConsole__inherit__graph.png,
+ docs/doxygen/html/classNotSlave-members.html,
+ docs/doxygen/html/classNotSlave.html,
+ docs/doxygen/html/classNotSlave__coll__graph.map,
+ docs/doxygen/html/classNotSlave__coll__graph.md5,
+ docs/doxygen/html/classNotSlave__coll__graph.png,
+ docs/doxygen/html/classNotSlave__inherit__graph.map,
+ docs/doxygen/html/classNotSlave__inherit__graph.md5,
+ docs/doxygen/html/classNotSlave__inherit__graph.png,
+ docs/doxygen/html/classSlaveLoop-members.html,
+ docs/doxygen/html/classSlaveLoop.html,
+ docs/doxygen/html/classSlaveLoop__coll__graph.map,
+ docs/doxygen/html/classSlaveLoop__coll__graph.md5,
+ docs/doxygen/html/classSlaveLoop__coll__graph.png,
+ docs/doxygen/html/classSlaveLoop__inherit__graph.map,
+ docs/doxygen/html/classSlaveLoop__inherit__graph.md5,
+ docs/doxygen/html/classSlaveLoop__inherit__graph.png,
+ docs/doxygen/html/classTextConsole-members.html,
+ docs/doxygen/html/classTextConsole.html,
+ docs/doxygen/html/classTextConsole__coll__graph.map,
+ docs/doxygen/html/classTextConsole__coll__graph.md5,
+ docs/doxygen/html/classTextConsole__coll__graph.png,
+ docs/doxygen/html/classTextConsole__inherit__graph.map,
+ docs/doxygen/html/classTextConsole__inherit__graph.md5,
+ docs/doxygen/html/classTextConsole__inherit__graph.png,
+ docs/doxygen/html/classWorld-members.html,
+ docs/doxygen/html/classWorld.html,
+ docs/doxygen/html/classWorld__coll__graph.map,
+ docs/doxygen/html/classWorld__coll__graph.md5,
+ docs/doxygen/html/classWorld__coll__graph.png,
+ docs/doxygen/html/classes.html,
+ docs/doxygen/html/classflexostream-members.html,
+ docs/doxygen/html/classflexostream.html,
+ docs/doxygen/html/classflexostream__coll__graph.map,
+ docs/doxygen/html/classflexostream__coll__graph.md5,
+ docs/doxygen/html/classflexostream__coll__graph.png,
+ docs/doxygen/html/classflexostream__inherit__graph.map,
+ docs/doxygen/html/classflexostream__inherit__graph.md5,
+ docs/doxygen/html/classflexostream__inherit__graph.png,
+ docs/doxygen/html/classnil__exception-members.html,
+ docs/doxygen/html/classnil__exception.html,
+ docs/doxygen/html/classnil__exception__coll__graph.map,
+ docs/doxygen/html/classnil__exception__coll__graph.md5,
+ docs/doxygen/html/classnil__exception__coll__graph.png,
+ docs/doxygen/html/classnil__exception__inherit__graph.map,
+ docs/doxygen/html/classnil__exception__inherit__graph.md5,
+ docs/doxygen/html/classnil__exception__inherit__graph.png,
+ docs/doxygen/html/doxygen.css, docs/doxygen/html/doxygen.png,
+ docs/doxygen/html/files.html, docs/doxygen/html/functions.html,
+ docs/doxygen/html/functions_enum.html,
+ docs/doxygen/html/functions_func.html,
+ docs/doxygen/html/functions_vars.html,
+ docs/doxygen/html/graph_legend.dot,
+ docs/doxygen/html/graph_legend.html,
+ docs/doxygen/html/graph_legend.png,
+ docs/doxygen/html/hierarchy.html, docs/doxygen/html/index.html,
+ docs/doxygen/html/inherit__graph__0.map,
+ docs/doxygen/html/inherit__graph__0.md5,
+ docs/doxygen/html/inherit__graph__0.png,
+ docs/doxygen/html/inherit__graph__1.map,
+ docs/doxygen/html/inherit__graph__1.md5,
+ docs/doxygen/html/inherit__graph__1.png,
+ docs/doxygen/html/inherit__graph__2.map,
+ docs/doxygen/html/inherit__graph__2.md5,
+ docs/doxygen/html/inherit__graph__2.png,
+ docs/doxygen/html/inherit__graph__3.map,
+ docs/doxygen/html/inherit__graph__3.md5,
+ docs/doxygen/html/inherit__graph__3.png,
+ docs/doxygen/html/inherit__graph__4.map,
+ docs/doxygen/html/inherit__graph__4.md5,
+ docs/doxygen/html/inherit__graph__4.png,
+ docs/doxygen/html/inherit__graph__5.map,
+ docs/doxygen/html/inherit__graph__5.md5,
+ docs/doxygen/html/inherit__graph__5.png,
+ docs/doxygen/html/inherit__graph__6.map,
+ docs/doxygen/html/inherit__graph__6.md5,
+ docs/doxygen/html/inherit__graph__6.png,
+ docs/doxygen/html/inherits.html,
+ docs/doxygen/html/keyboard_8h-source.html,
+ docs/doxygen/html/network__server_8h-source.html,
+ docs/doxygen/html/nil__exception_8h-source.html,
+ docs/doxygen/html/optimize_8h-source.html,
+ docs/doxygen/html/physfsrwops_8h-source.html,
+ docs/doxygen/html/structFont_1_1metrics-members.html,
+ docs/doxygen/html/structFont_1_1metrics.html,
+ docs/doxygen/html/tab_b.gif, docs/doxygen/html/tab_l.gif,
+ docs/doxygen/html/tab_r.gif, docs/doxygen/html/tabs.css,
+ docs/nil.Doxyfile, src/client/audio/Soundsystem.cc,
+ src/client/audio/Soundsystem.h, src/client/console/SdlConsole.cc,
+ src/client/console/SdlConsole.h, src/client/graphics/Font.cc,
+ src/client/graphics/Font.h, src/client/input,
+ src/client/input/Mouse.cc, src/client/input/Mouse.h,
+ src/client/main.cc, src/common/World.cc, src/common/World.h,
+ src/common/configuration/CommandlineParser.cc,
+ src/common/configuration/CommandlineParser.h,
+ src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h,
+ src/common/configuration/Configuration.cc,
+ src/common/configuration/Configuration.h,
+ src/common/configuration/IConfigurationParser.cc,
+ src/common/configuration/IConfigurationParser.h,
+ src/common/console/IConsole.cc, src/common/console/IConsole.h,
+ src/common/console/TextConsole.cc,
+ src/common/console/TextConsole.h,
+ src/common/exceptions/NilException.cc,
+ src/common/exceptions/NilException.h,
+ src/common/exceptions/nil_exception.cc,
+ src/common/exceptions/nil_exception.h,
+ src/common/graphics/Blittable.cc,
+ src/common/graphics/Blittable.h,
+ src/common/graphics/GraphicItem.cc,
+ src/common/graphics/GraphicItem.h,
+ src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h,
+ src/common/input/EventHandler.cc,
+ src/common/input/EventHandler.h, src/common/input/Interactive.cc,
+ src/common/input/Interactive.h, src/common/input/Keyboard.cc,
+ src/common/input/Keyboard.h, src/common/input/keyboard.cc,
+ src/common/input/keyboard.h, src/common/net/INetwork.h,
+ src/common/optimize.h, src/common/pattern/IObserver.h,
+ src/common/pattern/ISubject.cc, src/common/pattern/ISubject.h,
+ src/common/physics, src/common/physics/Movable.cc,
+ src/common/physics/Movable.h, src/common/physics/SConscript,
+ src/common/vfs/File.cc, src/common/vfs/File.h,
+ src/common/vfs/VFS.cc, src/common/vfs/VFS.h,
+ src/common/vfs/Vfs.cc, src/common/vfs/Vfs.h: first commit again
+ after AGES
+ updated everything to GPLv3 wherever feasible
+ massive refactoring applied
+ GNU style c++
+
+2006-03-18 Alexander Kahl <e-...@gm...>
+
+ * src/common/configuration/Configuration.h: * forward declarate
+ template specialisations
+ * src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h: * adapted
+ ParserError
+ * src/common/configuration/IConfigurationParser.cc,
+ src/common/configuration/IConfigurationParser.h: * implemented
+ ParserError
+ * SConstruct: * re-added '-ansi' to compiler flags, SDL_net needs
+ long long
+ * re-added sconsign file option
+ * SConstruct: * added custom builder to create ChangeLog file from
+ svn repository messages
+ * added comments for better intelligibility
+ * removed redundant binary file checks
+ * ChangeLog: * recreated ChangeLog from svn2cl script / new custom
+ scons build option
+ * data/config/server.conf: * once more changed standard server port
+ to 0xDEAD
+ * SConstruct, src/SConscript, src/client/SConscript,
+ src/client/audio/SConscript, src/client/console/SConscript,
+ src/client/graphics/SConscript, src/client/net/SConscript,
+ src/common/SConscript, src/common/configuration/SConscript,
+ src/common/console/SConscript, src/common/exceptions/SConscript,
+ src/common/graphics/SConscript, src/common/input/SConscript,
+ src/common/net/SConscript, src/common/pattern/SConscript,
+ src/common/vfs/SConscript, src/server/SConscript,
+ src/server/net/SConscript: * refactored all scons scripts:
+ * removed Glob()
+ * removed redundant imports
+ * added function Descend() for walking down subdir scripts
+ * changed all SConscript files to adapt Descend()
+
+2006-03-15 Alexander Kahl <e-...@gm...>
+
+ * src/client/console/SdlConsole.cc, src/client/graphics/Font.cc,
+ src/client/graphics/Font.h,
+ src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h,
+ src/common/configuration/Configuration.cc,
+ src/common/graphics/GraphicItem.cc,
+ src/common/graphics/GraphicItem.h: * adapt new way of file
+ loading (Vfs) -> massive modifications
+ * src/common/input/keyboard.cc, src/common/input/keyboard.h: *
+ style unification
+ * src/client/main.cc: * simplified Vfs instanciation
+ * src/common/vfs/File.cc, src/common/vfs/File.h,
+ src/common/vfs/Vfs.cc, src/common/vfs/Vfs.h: * files renamed
+ * massive refactoring
+ * src/common/vfs/physfsrwops.h: * modified includes to use global
+ search path, not local
+ * src/common/vfs/file.cc, src/common/vfs/file.h,
+ src/common/vfs/vfs.cc, src/common/vfs/vfs.h: * files renamed
+
+2006-03-14 Alexander Kahl <e-...@gm...>
+
+ * src/common/configuration/Configuration.cc: * removed redundant
+ ternary operator (thanks Chris! me so dumb :>)
+
+2006-03-11 Alexander Kahl <e-...@gm...>
+
+ * src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h:
+ * derive Graphics from IObserver (apply for observer design
+ pattern)
+ * modified correspondingly (update() implementation, attach() and
+ detach())
+ * src/common/configuration/Configuration.cc: * notify observers on
+ state change
+ * src/common/pattern/IObserver.h: * moved update() to protected
+ * added ISubject as friend class (for update() access)
+ * src/common/pattern/ISubject.cc: * fixed vector iterating overflow
+ * src/client/console/SdlConsole.cc: * fixed vector iterating
+ overflow
+ * src/client/audio/Soundsystem.cc: * fixed vector iterating
+ overflow
+ * src/common/configuration/Configuration.h: * derive Configuration
+ from ISubject (apply for observer design pattern)
+ * src/common/SConscript, src/common/pattern,
+ src/common/pattern/IObserver.h, src/common/pattern/ISubject.cc,
+ src/common/pattern/ISubject.h, src/common/pattern/SConscript: *
+ added observer design pattern classes IObserver / ISubject
+ * updated SConscript to build them
+ * src/common/console/IConsole.h: * update copyright
+ * minor refactoring of flexostream
+ * src/client/main.cc: * disable fullscreen in case of sdl console
+ init failure (still need observer pattern to take effect though)
+ * src/common/configuration/Configuration.cc: * ternaryfied return
+ evalutation of template specialization :)
+ * src/common/configuration/Configuration.cc,
+ src/common/configuration/Configuration.h: * added AmbiguousResult
+ exception
+ * split up evaluate_xpath into two functions
+ * added method to write config values (will test later)
+ * src/client/audio/Soundsystem.cc, src/client/audio/Soundsystem.h,
+ src/client/console/SdlConsole.cc,
+ src/client/console/SdlConsole.h, src/client/graphics/Font.cc,
+ src/client/graphics/Font.h, src/client/main.cc,
+ src/client/net/NetworkClient.cc, src/client/net/NetworkClient.h,
+ src/common/World.cc, src/common/World.h,
+ src/common/configuration/CommandlineParser.cc,
+ src/common/configuration/CommandlineParser.h,
+ src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h,
+ src/common/configuration/Configuration.cc,
+ src/common/configuration/Configuration.h,
+ src/common/configuration/IConfigurationParser.cc,
+ src/common/configuration/IConfigurationParser.h,
+ src/common/console/Console.cc, src/common/console/Console.h,
+ src/common/console/IConsole.cc, src/common/console/IConsole.h,
+ src/common/console/TextConsole.cc,
+ src/common/console/TextConsole.h,
+ src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h,
+ src/common/input/keyboard.cc, src/common/input/keyboard.h,
+ src/common/net/INetwork.cc, src/common/net/INetwork.h,
+ src/server/main.cc, src/server/net/network_server.cc,
+ src/server/net/network_server.h: * again, massive refactoring
+ (console)
+ * removed redundant calls for cleanup in derived consoles
+ * integrated IConsole.cleanup() into ~IConsole
+ * src/client/main.cc, src/common/net/INetwork.cc: * commented out
+ crashing code (SDL_net memory free'ing)
+ * src/client/main.cc, src/client/net/NetworkClient.cc,
+ src/client/net/NetworkClient.h, src/client/net/network_client.cc,
+ src/client/net/network_client.h, src/common/net/INetwork.cc,
+ src/common/net/INetwork.h, src/common/net/network.cc,
+ src/common/net/network.h: * heavy refactoring (network)
+ * src/server/nil_server.cc, src/server/nil_server.h: * removed
+ redundant files
+
+2006-03-10 Alexander Kahl <e-...@gm...>
+
+ * src/client/audio/Soundsystem.cc: * fixed sound item free'ing
+ * src/client/audio/Soundsystem.cc, src/client/audio/Soundsystem.h,
+ src/client/audio/soundsystem.cc, src/client/audio/soundsystem.h,
+ src/client/main.cc, src/common/World.h: * heavy refactoring
+ (sound)
+ * src/client/main.cc, src/common/World.cc, src/common/World.h,
+ src/common/world.cc, src/common/world.h: * heavy refactoring
+ (world)
+ * src/client/console/SdlConsole.cc,
+ src/client/net/network_client.cc,
+ src/client/net/network_client.h,
+ src/common/exceptions/nil_exception.cc,
+ src/common/exceptions/nil_exception.h,
+ src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h,
+ src/common/input/keyboard.cc, src/common/input/keyboard.h,
+ src/common/net/network.h, src/common/vfs/vfs.cc,
+ src/common/vfs/vfs.h: * heavy refactoring (exceptions)
+ * .:
+ * .sconf_temp:
+ * .sconf_temp:
+ * .sconf_temp:
+ * src/client/graphics/Font.cc, src/client/graphics/Font.h,
+ src/common/graphics/GraphicItem.cc,
+ src/common/graphics/GraphicItem.h,
+ src/common/graphics/Graphics.cc, src/common/graphics/Graphics.h:
+ * heavy refactoring (graphics)
+ * src/common/graphics/graphic_item.cc: * heavy refactoring
+ (graphics)
+ * src/client/console/SdlConsole.cc,
+ src/client/console/SdlConsole.h, src/client/graphics/font.cc,
+ src/client/graphics/font.h, src/client/main.cc,
+ src/common/graphics/graphic_item.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/common/world.h: * heavy refactoring (graphics)
+
+2006-03-09 Alexander Kahl <e-...@gm...>
+
+ * docs/Doxyfile: * use relative paths for doxygenification
+ * COPYING: * add our much beloved GPL-2 - long live the GNU!!
+ * src/client/audio/soundsystem.h, src/client/graphics/font.h,
+ src/client/main.cc, src/common/configuration/Configuration.h,
+ src/common/configuration/IConfigurationParser.h,
+ src/common/graphics/graphics.h, src/common/input/keyboard.h,
+ src/common/net/network.h, src/common/world.h: * heavy refactoring
+ (consoles)
+ * src/client/console/SdlConsole.cc,
+ src/client/console/SdlConsole.h, src/common/console/Console.cc,
+ src/common/console/Console.h, src/common/console/TextConsole.cc,
+ src/common/console/TextConsole.h: * heavy refactoring (consoles)
+ * src/client/console/sdl_console.cc,
+ src/client/console/sdl_console.h, src/common/console/console.cc,
+ src/common/console/console.h, src/common/console/text_console.cc,
+ src/common/console/text_console.h: * heavy refactoring (consoles)
+ * Makefile: * make client compile only (since I'm workin on it)
+ * remove .sconf_temp recreation since we've changed to svn
+ * src/client/audio/soundsystem.h, src/client/main.cc,
+ src/client/net/network_client.cc,
+ src/client/net/network_client.h,
+ src/common/exceptions/nil_exception.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/common/input/keyboard.h, src/common/net/network.h,
+ src/server/main.cc, src/server/net/network_server.cc,
+ src/server/net/network_server.h: * heavy refactoring
+ (configuration)
+ * src/common/configuration/CommandlineParser.cc,
+ src/common/configuration/CommandlineParser.h,
+ src/common/configuration/ConfigFileParser.cc,
+ src/common/configuration/ConfigFileParser.h,
+ src/common/configuration/Configuration.cc,
+ src/common/configuration/Configuration.h,
+ src/common/configuration/IConfigurationParser.cc,
+ src/common/configuration/IConfigurationParser.h: * heavy
+ refactoring (configuration)
+ * src/common/configuration/commandline_parser.cc,
+ src/common/configuration/commandline_parser.h,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/configuration/configuration_parser.cc,
+ src/common/configuration/configuration_parser.h: * heavy
+ refactoring (configuration)
+ * src/client/audio/soundsystem.cc, src/client/main.cc,
+ src/common/world.h: * moved audio to client
+ * src/client/audio, src/client/audio/SConscript,
+ src/client/audio/soundsystem.cc, src/client/audio/soundsystem.h:
+ * moved audio to client
+ * src/common/audio: * moved audio to client
+ * src/client/SConscript, src/common/SConscript: * moved audio to
+ client
+ * .sconf_temp:
+ * .sconf_temp:
+
+2006-02-24 Alexander Kahl <e-...@gm...>
+
+ * data/gfx/logos/nil.png, data/gfx/logos/nil_small.png: * re-add
+ after corrupting migration
+ * data/gfx/logos/nil.png, data/gfx/logos/nil_small.png: * prepare
+ for re-add after corrupting migration
+ * .cvsignore: * removed due to svn migration
+
+2006-02-19 Alexander Kahl <e-...@gm...>
+
+ * src/client/console/sdl_console.cc: * try/catch vfs
+ * src/client/main.cc: * try/catch SDL_Console init
+ * allow execution to continue after SDL_Console init failure but
+ warn instead
+ * src/common/exceptions/nil_exception.cc,
+ src/common/exceptions/nil_exception.h: * new method for appending
+ to exception reason
+ * src/common/vfs/vfs.cc: * reset singleton pointer in dtor
+ * src/common/input/keyboard.cc, src/common/input/keyboard.h: *
+ sanitized
+ * src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ * declared getter style member functions as const
+ * src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h: * beautify
+ * exception in case of unknown option now includes its name
+ * src/client/main.cc, src/common/world.cc, src/common/world.h: *
+ pass sound to world
+ * src/client/net/network_client.cc,
+ src/client/net/network_client.h, src/common/net/network.cc,
+ src/common/net/network.h, src/server/net/network_server.cc,
+ src/server/net/network_server.h: * replaced meaningless network
+ init exception by common one
+ * added base exception for future networking errors
+ * src/common/exceptions/nil_exception.h,
+ src/common/input/keyboard.h: * move Thread_failure since it
+ belongs to all threaded classes
+ * refactor appropriately
+
+2006-02-15 Alexander Kahl <e-...@gm...>
+
+ * SConstruct: * updated copyright
+ * src/client/main.cc, src/common/optimize.h: * add poison traps for
+ some unpopular rodents
+ * include them together with the optimization macros we defined a
+ while ago
+ * src/client/console/sdl_console.cc: * fixed to use new SDL_Color
+ creator
+ * src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ * added handy SDL_Color creator
+ * src/client/console/sdl_console.cc,
+ src/client/console/sdl_console.h: * removed redundant ctor
+ * default value added to new default ctor
+ * src/common/console/text_console.cc,
+ src/common/console/text_console.h: * added missing dtor which
+ calls cleanup()
+ * src/common/console/text_console.cc,
+ src/common/console/text_console.h: * removed redundant ctor
+ * default value added to new default ctor
+ * src/common/console/console.cc, src/common/console/console.h: *
+ removed redundant ctor
+ * default value added to new default ctor
+ * src/client/main.cc: * removed forsaken prototype
+
+2006-02-13 Alexander Kahl <e-...@gm...>
+
+ * src/client/main.cc, src/common/configuration/configuration.cc,
+ src/common/console/console.cc, src/common/graphics/graphics.cc,
+ src/common/vfs/file.cc, src/common/vfs/vfs.cc: * "throw by value,
+ catch by reference":
+ http://www.informit.com/articles/article.asp?p=373339&rl=1
+ * src/common/vfs/vfs.cc: * s/return/throw/
+ * src/common/vfs/file.cc, src/common/vfs/file.h: * sanitized
+ * src/common/graphics/graphics.h: * removed obsolete comment
+ * src/common/vfs/vfs.cc, src/common/vfs/vfs.h: * exceptions
+ * src/common/configuration/configuration.h,
+ src/common/exceptions/nil_exception.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/common/vfs/vfs.cc, src/common/vfs/vfs.h: * began sanitizing
+ exceptions
+ * data/config/client.conf: * c++ style type conversion does not
+ seem to like hexadecimal values
+ * src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configuration_parser.cc: * fucking
+ libxml2 gives me headaches.. watch out, xmlCopyNode possibly
+ overwrites the old node.. further investigation needed
+ * data/config/client.conf, src/client/net/network_client.cc: *
+ changed port (finally)
+ * renamed options
+ * src/common/vfs/file.cc: * beautify ;)
+ * src/client/nil_client.cc, src/client/nil_client.h: * replaced by
+ new code in /network
+ * src/common/net/network.h: * added comment about broken SDL_net.h
+ * src/client/main.cc: * removed missed references to old client
+ code
+ * src/client/console/sdl_console.cc: * ugly fix for now
+ * src/client/net/network_client.cc,
+ src/client/net/network_client.h: * sanitized
+ * src/client/main.cc: * removed references to old client class
+ * read and fix comment, please
+ * src/client/main.cc: * replaced return 1 with return EXIT_SUCCESS
+ * src/client/console/sdl_console.cc: * sanitize
+ * read comments and fix vfs, please
+ * src/common/net/network.cc, src/common/net/network.h: * sanitized
+ (not fixed yet)
+
+2006-02-12 egore
+
+ * src/common/graphics/graphics.cc: add a better window caption
+ * SConstruct, data/config/client.conf, data/config/server.conf,
+ src/client/SConscript, src/client/main.cc, src/client/net,
+ src/client/net/SConscript, src/client/net/network_client.cc,
+ src/client/net/network_client.h, src/common/SConscript,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/graphics/graphics.h, src/common/input/keyboard.cc,
+ src/common/net/network.cc, src/common/net/network.h,
+ src/server/SConscript, src/server/main.cc, src/server/net,
+ src/server/net/SConscript, src/server/net/network_server.cc,
+ src/server/net/network_server.h: try to get networking up and
+ runnning. currently fails on client side instatiation. ALEX!!!
+ *g*
+ * src/client/console/sdl_console.cc, src/client/main.cc,
+ src/common/vfs/vfs.cc, src/common/vfs/vfs.h: extend vfs for write
+ and append access of files
+
+2006-02-10 Alexander Kahl <e-...@gm...>
+
+ * src/server/main.cc: * re-added graphics (read comment please)
+ * src/common/exceptions/nil_exception.h: * removed FIXME comment:
+ we need what() because it is already standard in std::exception
+ and needs override
+
+2006-02-09 egore
+
+ * config.conf, src/client/console/sdl_console.cc,
+ src/client/main.cc, src/common/vfs/file.cc,
+ src/common/vfs/file.h, src/common/vfs/physfsrwops.cc,
+ src/common/vfs/physfsrwops.h, src/common/vfs/vfs.cc,
+ src/common/vfs/vfs.h, src/server/main.cc: finish vfs
+ implementation
+
+2006-02-09 Alexander Kahl <e-...@gm...>
+
+ * src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ * transformed Graphics into singleton
+
+2006-02-08 egore
+
+ * data/config/client.conf: add ip and real port
+ * data/config/server.conf, src/common/net/network.cc: network
+ rewrite (WIP)
+
+2006-02-08 Alexander Kahl <e-...@gm...>
+
+ * src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ * began extending / sanitizing
+ * src/client/console/sdl_console.cc: * adapted changes to Graphics
+ and Configuration
+ * src/common/console/console.cc, src/common/console/console.h: *
+ changed type of Console::endl to const char
+ * src/common/configuration/configuration.cc: * changed order of
+ conf reading
+ * src/common/configuration/configfile_parser.cc: * removed
+ redundant include <stdarg.h>
+ * data/config/client.conf: * changed to opengl bool
+ * serverport 0xBABE is already claimed by 'ALC Protocol' -
+ changed to 0xDEAD for now which lies in the dynamic range
+
+2006-02-06 Alexander Kahl <e-...@gm...>
+
+ * data/fonts/VeraMono.ttf, src/client/console/sdl_console.cc: *
+ changed to Vera Mono console font
+ * src/common/configuration/configuration.cc: * fixed check for
+ option availability
+ * src/common/configuration/configuration.cc: * warn of additional
+ hits on option evaluation
+ * data/config/client.conf, src/common/graphics/graphics.cc,
+ src/common/graphics/graphics.h: * read desired bit depth from
+ config
+ * warn of additional hits on option evaluation
+ * made sdl doublebuffering standard
+ * changed back to sw_surface; use hw_surface later in case of
+ real opengl
+ * src/client/main.cc, src/common/configuration/configuration.cc: *
+ corrected comments
+ * fixed late deletion of objects still having reference to
+ deleted console
+ * src/common/configuration/commandline_parser.cc,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/configuration/configuration_parser.cc,
+ src/common/configuration/configuration_parser.h,
+ src/common/graphics/graphics.cc: * implemented option reading
+ from xml tree
+ * src/common/world.cc: * again, please use same syntax/indentation
+ style
+ * src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h: * xml based options
+ * src/common/graphics/graphics.cc: * bring back option reading
+
+2006-02-05 egore
+
+ * data/config/client.conf, src/common/net/network.h,
+ src/common/net/network_ringbuffer.cc,
+ src/common/net/network_ringbuffer.h, src/common/vfs/file.cc,
+ src/common/vfs/file.h: restart writing networking on SDL_net
+ * data/config/client.conf: make it parseable
+ * config.conf: add necessary libraries
+ * src/client/nil_client.h: add comment on how I understand that
+ class
+ * src/common/vfs/file.cc, src/common/vfs/file.h,
+ src/common/vfs/vfs.cc, src/common/vfs/vfs.h: add vfs
+ * src/common/SConscript, src/common/input/SConscript,
+ src/common/vfs, src/common/vfs/SConscript, src/common/vfs/vfs.cc,
+ src/common/vfs/vfs.h: start work on vfs
+
+2006-02-05 Alexander Kahl <e-...@gm...>
+
+ * src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h: * merged xml
+ parsing
+
+2006-02-05 egore
+
+ * data/config/client.conf, src/client/main.cc,
+ src/common/graphics/graphics.cc, src/common/input/keyboard.cc,
+ src/common/world.cc, src/common/world.h: integrate keyboard
+ * data/fonts/one8seven.ttf: add font from NiL logo
+
+2006-02-05 Alexander Kahl <e-...@gm...>
+
+ * src/common/SConscript: * added audio
+ * src/common/audio/SConscript: * file was missing
+ * ., .cvsignore: * .sconf_temp in .cvsignore is effectless (need *
+ > .sconf_temp/.cvsignore for wanted effect)
+
+2006-02-05 egore
+
+ * src/common/audio/soundsystem.cc, src/common/audio/soundsystem.h,
+ src/common/input/keyboard.cc: fix warning
+ * data/config/client.conf: add option for colored output
+ * src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h: add node
+ * ., .cvsignore: add externalbuildertools
+
+2006-02-05 Alexander Kahl <e-...@gm...>
+
+ * src/common/world.cc: * performance test
+ * data/config/client.conf: * new libxml2 config file
+
+2006-02-05 egore
+
+ * data/config/client.conf, src/client/main.cc, src/common/audio,
+ src/common/audio/soundsystem.cc, src/common/audio/soundsystem.h,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h,
+ src/common/graphics/graphics.cc,
+ src/common/net/network_ringbuffer.cc,
+ src/common/net/network_ringbuffer.h, src/server/main.cc: * add
+ soundsystem
+ * start work on libxml2 based configfileparsing
+ * src/common/input, src/common/input/keyboard.cc,
+ src/common/input/keyboard.h: add broken(!) input handling
+
+2006-02-04 egore
+
+ * src/client/console/sdl_console.cc, src/common/net/network.h,
+ src/common/net/network_ringbuffer.cc,
+ src/common/net/network_ringbuffer.h, src/server/main.cc: get
+ everything to compile
+ * src/client/main.cc: minor reodering
+
+2006-02-04 Alexander Kahl <e-...@gm...>
+
+ * SConstruct, src/client/main.cc,
+ src/common/configuration/commandline_parser.cc,
+ src/common/configuration/commandline_parser.h,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/configuration/configuration_parser.cc,
+ src/common/configuration/configuration_parser.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ * removed references to dotconf++ completely
+ * disabled configuration parsing for now
+
+2006-01-25 Alexander Kahl <e-...@gm...>
+
+ * src/common/configuration/configfile_parser.h,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/configuration/configuration_parser.h: * removed
+ references to dotconf++
+ * transformed Configuration into singleton
+ * removed configuration_table and added reference to libxml2
+ document ptr
+ * Makefile: * make distclean recreates .cvsignore in .sconf_temp
+ now
+
+2006-01-24 Alexander Kahl <e-...@gm...>
+
+ * Makefile, SConstruct: * make scons -c distclean=1 work properly
+ * SConstruct, config.conf: * added generic pkg-config checking
+ * replaced dotconf++ dependency by libxml-2.0
+ * ., .cvsignore: Added * > .cvsignore in .sconf_temp instead
+ * TODO.tasks: file was empty and belonged to anjuta
+ * .sconf_temp: scons temporary files don't belong into cvs
+
+2006-01-16 Alexander Kahl <e-...@gm...>
+
+ * nil-ng.anjuta, nil-ng.prj, nil-ng.pws: Obsolete project
+ configuration files
+ * ., .cvsignore, .sconf_temp, .sconf_temp/.cache,
+ .sconf_temp/.cvsignore, .sconf_temp/.sconsign, Makefile,
+ SConstruct, config.conf, src/client/console/sdl_console.cc,
+ src/client/graphics/font.cc, src/client/graphics/font.h,
+ src/common/configuration, src/common/configuration/.cvsignore,
+ src/common/console/console.h: Some minor fixes
+
+2005-12-05 egore
+
+ * src/common/exceptions/nil_exception.h: GCC 4.1 fixes
+
+2005-10-26 egore
+
+ * src/common/optimize.h: add Robert Love's macros for optimization
+ of compilation
+
+2005-09-15 Alexander Kahl <e-...@gm...>
+
+ * config.conf, data/config/client.conf,
+ data/config/mods/classic.conf,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration_parser.cc,
+ src/common/configuration/configuration_parser.h,
+ src/server/main.cc: Working on configuration file parsing
+
+2005-09-13 Alexander Kahl <e-...@gm...>
+
+ * src/common/SConscript,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h: Test version of
+ configfile_parser (fails to build, please test why!)
+ * src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration_parser.h: Bla
+
+2005-09-08 egore
+
+ * src/common/SConscript, src/common/net, src/common/net/SConscript,
+ src/common/net/network.h, src/common/net/network_ringbuffer.cc,
+ src/common/net/network_ringbuffer.h: add network interface for
+ discussion (untested)
+ * src/common/configuration/configfile_parser.h: include
+ configuration_parser
+ * src/common/configuration/configfile_parser.cc: remove hardcoded
+ path
+
+2005-09-07 Alexander Kahl <e-...@gm...>
+
+ * src/common/configuration/commandline_parser.cc,
+ src/common/configuration/commandline_parser.h,
+ src/common/configuration/configfile_parser.cc,
+ src/common/configuration/configfile_parser.h,
+ src/common/configuration/configuration_parser.cc,
+ src/common/configuration/configuration_parser.h: Working on
+ configuration parsing
+ * src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/graphics/graphics.cc, src/common/world.cc: Splitting
+ configuration handling into broker/parser/observer.
+
+2005-09-07 egore
+
+ * src/common/console/console.h,
+ src/common/exceptions/nil_exception.h: fix compilation process a
+ bit ...
+ * src/common/console/console.h: extend nil_exception
+
+2005-09-07 Alexander Kahl <e-...@gm...>
+
+ * data/config, data/config/client.conf, data/config/mods,
+ data/config/mods/classic.conf: Initial import of default
+ configuration files
+ * SConstruct, config.conf: Added dotconf++ as a dependency; changed
+ section name "libs" to "clibs" in
+ config.conf and added "ccheaders" and "cclibs". Modified
+ SConstruct
+ accordingly. To get a clean, working version from dotconf++,
+ visit
+ http://bugs.gentoo.org/show_bug.cgi?id=105079
+ * SConstruct: Added config.cache, signatures.dblite and config.log
+ to scons "distclean"
+ variable (call scons distclean=1 to use it). Furthermore use
+ CXXFLAGS
+ environment variable from the calling environment if neither one
+ of
+ "debug", "optimize" or "profile" is set when calling scons.
+
+2005-09-06 Alexander Kahl <e-...@gm...>
+
+ * TODO.tasks, nil-ng.anjuta: These files are used by new Anjuta 2.x
+ * SConstruct: Regenerated raped SConstruct.. never do that again :P
+ Please ask me first
+ concerning such changes.. :)
+ * SConstruct, src/client/console/sdl_console.cc,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/console/console.h,
+ src/common/exceptions/nil_exception.cc,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/common/world.cc: Merged differences (doxygen and new code).
+
+2005-09-05 egore
+
+ * src/common/graphics/graphics.cc: urgs, emacs :D
+ * ., .cvsignore, SConstruct: play with SConstruct
+ * ChangeLog, src/common/exceptions/nil_exception.h: doxygenify the
+ exception
+
+2005-09-05 Alexander Kahl <e-...@gm...>
+
+ * src/common/exceptions/SConscript,
+ src/common/graphics/graphics.cc: Also forgot this one. Sorry.
+
+2005-09-05 egore
+
+ * ., .cvsignore: add another one
+ * .tm_project.cache, signatures.dblite: remove temp stuff
+
+2005-09-05 Alexander Kahl <e-...@gm...>
+
+ * src/common/exceptions, src/common/exceptions/nil_exception.cc,
+ src/common/exceptions/nil_exception.h: Sorry, forgot to add them
+ during last checkin (refer to that logmessage) ;)
+ * .tm_project.cache, nil-ng.prj, signatures.dblite,
+ src/client/main.cc, src/common/SConscript,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/graphics/graphics.cc: Began work on exceptions. First
+ example implemented into graphics.cc.
+
+2005-09-04 egore
+
+ * ., .cvsignore: add nil to cvsignore
+ * config.log: remove log file
+
+2005-09-04 Alexander Kahl <e-...@gm...>
+
+ * config.conf, signatures.dblite, src/common/graphics/graphics.cc:
+ Corrected error so that graphics.cc compiles again (for now;)
+
+2005-09-04 egore
+
+ * ., .cvsignore: update cvsignore
+ * ., .cvsignore: add cvs ingore file
+
+2005-09-04 Alexander Kahl <e-...@gm...>
+
+ * signatures.dblite, src/client/main.cc,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/server/main.cc: Continued work on configuration handling.
+ Setting resolution on command line
+ is mandatory right now.
+
+2005-09-04 egore
+
+ * ChangeLog: start using ChangeLog
+ * src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h: - doxygen the
+ configuration class
+ - add some notes about what needs to be done
+ * config.conf: add check for libconfuse
+ * .sconf_temp: remove crap
+ * .sconf_temp/conftest_0, .sconf_temp/conftest_0.c,
+ .sconf_temp/conftest_1, .sconf_temp/conftest_1.c,
+ .sconf_temp/conftest_10, .sconf_temp/conftest_10.c,
+ .sconf_temp/conftest_11, .sconf_temp/conftest_11.c,
+ .sconf_temp/conftest_12, .sconf_temp/conftest_12.c,
+ .sconf_temp/conftest_2, .sconf_temp/conftest_2.c: remove cache
+ crap
+ * .sconf_temp/conftest_3, .sconf_temp/conftest_3.c,
+ .sconf_temp/conftest_4, .sconf_temp/conftest_4.c,
+ .sconf_temp/conftest_5, .sconf_temp/conftest_5.c,
+ .sconf_temp/conftest_6, .sconf_temp/conftest_6.c,
+ .sconf_temp/conftest_7, .sconf_temp/conftest_7.c,
+ .sconf_temp/conftest_8, .sconf_temp/conftest_8.c,
+ .sconf_temp/conftest_9, .sconf_temp/conftest_9.c: remove temp
+ crap
+
+2005-09-03 Alexander Kahl <e-...@gm...>
+
+ * .sconf_temp/.sconsign, .sconf_temp/conftest_0.c,
+ .sconf_temp/conftest_1.c, .sconf_temp/conftest_10,
+ .sconf_temp/conftest_11, .sconf_temp/conftest_12,
+ .sconf_temp/conftest_2.c, .sconf_temp/conftest_3.c,
+ .sconf_temp/conftest_4.c, .sconf_temp/conftest_5.c,
+ .sconf_temp/conftest_7, .sconf_temp/conftest_8,
+ .sconf_temp/conftest_9, config.conf, signatures.dblite,
+ src/client/main.cc, src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h:
+ Continued work on command line parsing and option handling.
+ * config.cache, config.conf: Removed config.cache from cvs; added
+ libconfuse dependency to scons.
+ * .tm_project.cache, nil-ng.prj, nil-ng.pws, signatures.dblite,
+ src/client/console/sdl_console.cc,
+ src/client/console/sdl_console.h,
+ src/common/configuration/configuration.cc,
+ src/common/graphics/graphic_item.cc,
+ src/common/graphics/graphics.cc, src/common/world.cc: Improved
+ SDL Console so that performance is decent now.
+
+2005-09-01 Alexander Kahl <e-...@gm...>
+
+ * .sconf_temp/.sconsign, config.cache, nil, nil-ng.pws, nild,
+ signatures.dblite, src/client/console/sdl_console.cc,
+ src/client/console/sdl_console.h, src/client/main.cc,
+ src/common/console/console.cc, src/common/console/console.h,
+ src/common/graphics/graphic_item.cc,
+ src/common/graphics/graphic_item.h,
+ src/common/graphics/graphics.cc: Significantly improved
+ SDL_console performance.
+ Line breaks now work on SDL_console.. but !please! don't send
+ strings
+ like "foo\nbar" at the moment, this won't work!
+
+2005-08-31 Alexander Kahl <e-...@gm...>
+
+ * config.cache, nil, nil-ng.pws, nild, signatures.dblite,
+ src/client/console/sdl_console.cc, src/client/graphics/font.cc,
+ src/client/main.cc, src/client/nil_client.cc,
+ src/common/configuration/configuration.cc,
+ src/common/console/console.cc, src/common/console/console.h,
+ src/common/console/text_console.cc,
+ src/common/graphics/graphics.cc, src/common/world.cc: Implemented
+ ostream style interfaces to the console system. w00t
+
+2005-08-29 Alexander Kahl <e-...@gm...>
+
+ * ., .sconf_temp, .sconf_temp/.cache, .sconf_temp/.sconsign,
+ .sconf_temp/conftest_0, .sconf_temp/conftest_0.c,
+ .sconf_temp/conftest_1, .sconf_temp/conftest_1.c,
+ .sconf_temp/conftest_10, .sconf_temp/conftest_10.c,
+ .sconf_temp/conftest_11, .sconf_temp/conftest_11.c,
+ .sconf_temp/conftest_12, .sconf_temp/conftest_12.c,
+ .sconf_temp/conftest_2, .sconf_temp/conftest_2.c,
+ .sconf_temp/conftest_3, .sconf_temp/conftest_3.c,
+ .sconf_temp/conftest_4, .sconf_temp/conftest_4.c,
+ .sconf_temp/conftest_5, .sconf_temp/conftest_5.c,
+ .sconf_temp/conftest_6, .sconf_temp/conftest_6.c,
+ .sconf_temp/conftest_7, .sconf_temp/conftest_7.c,
+ .sconf_temp/conftest_8, .sconf_temp/conftest_8.c,
+ .sconf_temp/conftest_9, .sconf_temp/conftest_9.c,
+ .tm_project.cache, AUTHORS, ChangeLog, INSTALL, Makefile, NEWS,
+ README, SConstruct, TODO, config.cache, config.conf, config.log,
+ data, data/fonts, data/fonts/Dissatis.ttf, data/fonts/Vera.ttf,
+ data/gfx, data/gfx/logos, data/gfx/logos/nil.png,
+ data/gfx/logos/nil_small.png, docs, docs/Doxyfile,
+ docs/new-concept-client.dia, nil, nil-ng.prj, nil-ng.pws, nild,
+ signatures.dblite, src, src/SConscript, src/client,
+ src/client/SConscript, src/client/console,
+ src/client/console/SConscript, src/client/console/sdl_console.cc,
+ src/client/console/sdl_console.h, src/client/graphics,
+ src/client/graphics/SConscript, src/client/graphics/font.cc,
+ src/client/graphics/font.h, src/client/main.cc,
+ src/client/nil_client.cc, src/client/nil_client.h, src/common,
+ src/common/SConscript, src/common/configuration,
+ src/common/configuration/SConscript,
+ src/common/configuration/configuration.cc,
+ src/common/configuration/configuration.h, src/common/console,
+ src/common/console/SConscript, src/common/console/console.cc,
+ src/common/console/console.h, src/common/console/text_console.cc,
+ src/common/console/text_console.h, src/common/graphics,
+ src/common/graphics/SConscript,
+ src/common/graphics/graphic_item.cc,
+ src/common/graphics/graphic_item.h,
+ src/common/graphics/graphics.cc, src/common/graphics/graphics.h,
+ src/common/world.cc, src/common/world.h, src/server,
+ src/server/SConscript, src/server/main.cc,
+ src/server/nil_server.cc, src/server/nil_server.h: Initial
+ revision
+
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-22 23:40:11 UTC (rev 528)
+++ trunk/nil-ng/SConstruct 2007-09-22 23:56:29 UTC (rev 529)
@@ -54,11 +54,6 @@
glob.glob('*.pyc')])
###
-### Custom builder to create ChangeLog file from svn repository messages
-changelog_builder = Builder(action = 'svn2cl --break-before-msg --strip-prefix=trunk/nil-ng/ -o $TARGET')
-env.Append(BUILDERS = {'ChangeLog' : changelog_builder})
-###
-
### Determine compiler flags
if os.environ.has_key('CXXFLAGS'):
env.Append(CCFLAGS = os.environ['CXXFLAGS'])
@@ -75,5 +70,4 @@
###
SConscript('build/SConscript')
-#env.ChangeLog('ChangeLog', '')
-
+env.Command('ChangeLog', None, 'svn2cl --group-by-day --authors=authors.xml -o $TARGET')
Added: trunk/nil-ng/authors.xml
===================================================================
--- trunk/nil-ng/authors.xml (rev 0)
+++ trunk/nil-ng/authors.xml 2007-09-22 23:56:29 UTC (rev 529)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<authors>
+ <author uid="e-user">
+ Alexander Kahl <e-...@gm...>
+ </author>
+</authors>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 23:40:09
|
Revision: 528
http://nil.svn.sourceforge.net/nil/?rev=528&view=rev
Author: e-user
Date: 2007-09-22 16:40:11 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
externalized build
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Added Paths:
-----------
trunk/nil-ng/build/
trunk/nil-ng/build/SConscript
Removed Paths:
-------------
trunk/nil-ng/src/SConscript
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-22 22:13:44 UTC (rev 527)
+++ trunk/nil-ng/SConstruct 2007-09-22 23:40:11 UTC (rev 528)
@@ -29,10 +29,8 @@
""")
### Static definitions
-package='nil-ng'
-version='0.0.1'
-appname = 'nil'
dependencies_cache = 'dependencies.cache'
+cache_dir = '.cache'
###
### Dynamic definitions
@@ -45,68 +43,37 @@
env.EnsureSConsVersion(0, 97)
###
+### Enhance scons -c with a convenient distclean call
+if ARGUMENTS.get('distclean', 0):
+ env.Clean('nil', [dependencies_cache,
+ cache_dir,
+ 'signatures.dblite',
+ '.sconsign.dblite',
+ 'config.log',
+ '.sconf_temp',
+ glob.glob('*.pyc')])
+###
+
### Custom builder to create ChangeLog file from svn repository messages
changelog_builder = Builder(action = 'svn2cl --break-before-msg --strip-prefix=trunk/nil-ng/ -o $TARGET')
env.Append(BUILDERS = {'ChangeLog' : changelog_builder})
###
-### Enhance scons -c with a convenient distclean call
-if ARGUMENTS.get('distclean', 0):
- env.Clean([appname, appname + 'd'], [dependencies_cache,
- 'signatures.dblite',
- '.sconsign.dblite',
- 'config.log',
- '.sconf_temp',
- glob.glob('*.pyc')])
-###
-
### Determine compiler flags
-ccflags = os.environ['CXXFLAGS']
-
-if ARGUMENTS.get('profile', 0):
- ccflags += ' -pg'
-if ARGUMENTS.get('debug', 0):
- ccflags += ' -g3'
-
-env.Append(CCFLAGS = ccflags)
+if os.environ.has_key('CXXFLAGS'):
+ env.Append(CCFLAGS = os.environ['CXXFLAGS'])
###
autoconf(env, dependencies_cache)
-def Descend():
- list = []
- for file in os.listdir('.'):
- if os.path.isfile(file + '/SConscript'):
- list.append(file + '/SConscript')
- return list
-
### environment configuration
-env['APPNAME'] = package
+env.CacheDir(cache_dir)
env.Append(CPPPATH = "#src") # The hash marks means to treat this directory as an absolute path
env.SourceSignatures('MD5')
env.SConsignFile('signatures')
-env.Export(["env", "Descend"])
+env.Export('env')
###
-### Descend into the src tree, gathering files to build
-mode = 'common'
-env.Export('mode')
-commonsource = SConscript('src/SConscript')
-mode = 'client'
-env.Export('mode')
-clientsource = SConscript('src/SConscript')
-mode = 'server'
-env.Export('mode')
-serversource = SConscript('src/SConscript')
-###
-
+SConscript('build/SConscript')
#env.ChangeLog('ChangeLog', '')
-#target_autoconf = create_autoconf_target()
-target_client = Alias('client', appname)
-target_server = Alias('server', appname + 'd')
-target_all = Alias('all', [target_client, target_server])
-env.Program(appname, commonsource + clientsource)
-env.Program(appname + 'd', commonsource + serversource)
-# env.AddPreAction(appname, autoconf(env)) Doesn't work right now..
-env.Default(target_all)
-###
+
Added: trunk/nil-ng/build/SConscript
===================================================================
--- trunk/nil-ng/build/SConscript (rev 0)
+++ trunk/nil-ng/build/SConscript 2007-09-22 23:40:11 UTC (rev 528)
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# NiL SConstruct script.
+#
+# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@gm...)
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import glob
+
+Import('env')
+
+### Static definitions
+package='nil-ng'
+version='0.0.1'
+appname = 'nil'
+###
+
+### Enhance scons -c with a convenient distclean call
+if ARGUMENTS.get('distclean', 0):
+ env.Clean([appname, appname + 'd'], [dependencies_cache,
+ 'signatures.dblite',
+ '.sconsign.dblite',
+ 'config.log',
+ '.sconf_temp',
+ glob.glob('*.pyc')])
+###
+
+def Descend():
+ list = []
+ for file in os.listdir('.'):
+ if os.path.isfile(file + '/SConscript'):
+ list.append(file + '/SConscript')
+ return list
+
+### Descend into the src tree, gathering files to build
+env.Export('Descend')
+commonsource = SConscript('../src/common/SConscript')
+clientsource = SConscript('../src/client/SConscript')
+serversource = SConscript('../src/server/SConscript')
+###
+
+target_client = Alias('client', appname)
+target_server = Alias('server', appname + 'd')
+target_all = Alias('all', [target_client, target_server])
+env.Program(appname, commonsource + clientsource)
+env.Program(appname + 'd', commonsource + serversource)
+# env.AddPreAction(appname, autoconf(env)) Doesn't work right now..
+env.Default(target_all)
Deleted: trunk/nil-ng/src/SConscript
===================================================================
--- trunk/nil-ng/src/SConscript 2007-09-22 22:13:44 UTC (rev 527)
+++ trunk/nil-ng/src/SConscript 2007-09-22 23:40:11 UTC (rev 528)
@@ -1,5 +0,0 @@
-Import('env', 'mode')
-
-objs = SConscript('%s/SConscript' % mode)
-
-Return('objs')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 22:13:40
|
Revision: 527
http://nil.svn.sourceforge.net/nil/?rev=527&view=rev
Author: e-user
Date: 2007-09-22 15:13:44 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
removed redundant function loading from configure
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-22 22:05:55 UTC (rev 526)
+++ trunk/nil-ng/SConstruct 2007-09-22 22:13:44 UTC (rev 527)
@@ -19,7 +19,7 @@
import os
import platform
import glob
-from configure import *
+from configure import autoconf
Help("""
Possible options:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 22:05:51
|
Revision: 526
http://nil.svn.sourceforge.net/nil/?rev=526&view=rev
Author: e-user
Date: 2007-09-22 15:05:55 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
removed obsoleted config.conf
Removed Paths:
-------------
trunk/nil-ng/config.conf
Deleted: trunk/nil-ng/config.conf
===================================================================
--- trunk/nil-ng/config.conf 2007-09-22 22:05:20 UTC (rev 525)
+++ trunk/nil-ng/config.conf 2007-09-22 22:05:55 UTC (rev 526)
@@ -1,24 +0,0 @@
-[cheaders]
-pthread = pthread.h
-SDL_mixer = SDL/SDL_mixer.h
-SDL_image = SDL/SDL_image.h
-SDL_ttf = SDL/SDL_ttf.h
-SDL_net = SDL/SDL_net.h
-OpenGL = GL/gl.h
-physfs = physfs.h
-
-[ccheaders]
-
-[clibs]
-pthread = pthread
-SDL_mixer = SDL_mixer
-SDL_image = SDL_image
-SDL_ttf = SDL_ttf
-SDL_net = SDL_net
-OpenGL = GL
-physfs = physfs
-
-[cclibs]
-
-[pkgconfig]
-libxml-2.0 = 2.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 22:05:16
|
Revision: 525
http://nil.svn.sourceforge.net/nil/?rev=525&view=rev
Author: e-user
Date: 2007-09-22 15:05:20 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
removed obsoleted builder for autoconf
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-22 21:25:56 UTC (rev 524)
+++ trunk/nil-ng/SConstruct 2007-09-22 22:05:20 UTC (rev 525)
@@ -47,9 +47,7 @@
### Custom builder to create ChangeLog file from svn repository messages
changelog_builder = Builder(action = 'svn2cl --break-before-msg --strip-prefix=trunk/nil-ng/ -o $TARGET')
-configuration_builder = Builder(action = autoconf)
-env.Append(BUILDERS = {'ChangeLog' : changelog_builder,
- 'Autoconf' : configuration_builder})
+env.Append(BUILDERS = {'ChangeLog' : changelog_builder})
###
### Enhance scons -c with a convenient distclean call
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 21:25:52
|
Revision: 524
http://nil.svn.sourceforge.net/nil/?rev=524&view=rev
Author: e-user
Date: 2007-09-22 14:25:56 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
fixed indentation
Modified Paths:
--------------
trunk/nil-ng/dependencies.py
Modified: trunk/nil-ng/dependencies.py
===================================================================
--- trunk/nil-ng/dependencies.py 2007-09-22 21:12:28 UTC (rev 523)
+++ trunk/nil-ng/dependencies.py 2007-09-22 21:25:56 UTC (rev 524)
@@ -23,13 +23,13 @@
'ccheaders': {
},
'libs': {
- 'pthread': ['pthread', 'pthread.h', 'c', None, True],
+ 'pthread': ['pthread', 'pthread.h', 'c', None, True],
'SDL mixer': ['SDL_mixer', 'SDL_mixer.h', 'c', None, True],
'SDL image': ['SDL_image', 'SDL_image.h', 'c', None, True],
'SDL ttf': ['SDL_ttf', 'SDL_ttf.h', 'c', None, True],
'SDL net': ['SDL_net', 'SDL_net.h', 'c', None, True],
- 'Open GL': ['GL', 'GL/gl.h', 'c', None, True],
- 'physfs': ['physfs', 'physfs.h', 'c', None, True],
+ 'Open GL': ['GL', 'GL/gl.h', 'c', None, True],
+ 'physfs': ['physfs', 'physfs.h', 'c', None, True],
},
'pkgconfig': {
'LibXML2': ['libxml-2.0', '2.6', 'atleast'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 21:12:28
|
Revision: 523
http://nil.svn.sourceforge.net/nil/?rev=523&view=rev
Author: e-user
Date: 2007-09-22 14:12:28 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
deeply improved and abstracted autoconfiguration process
Modified Paths:
--------------
trunk/nil-ng/SConstruct
Added Paths:
-----------
trunk/nil-ng/configure.py
trunk/nil-ng/dependencies.py
Modified: trunk/nil-ng/SConstruct
===================================================================
--- trunk/nil-ng/SConstruct 2007-09-22 21:11:23 UTC (rev 522)
+++ trunk/nil-ng/SConstruct 2007-09-22 21:12:28 UTC (rev 523)
@@ -1,18 +1,11 @@
#!/usr/bin/env python
# NiL SConstruct script.
#
-# Original version by:
-# H. Ilari Liusvaara (hli...@cc...)
+# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@gm...)
#
-# Adapted and optimized at 2005-08-25 19:07:40 by:
-# Alexander Kahl (e-...@us...)
-#
-# copyright (C) 2004 H. Ilari Liusvaara (hli...@cc...)
-# 2005,2006,2007 Alexander Kahl (e-...@us...)
-#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -21,42 +14,52 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
-import ConfigParser
+import platform
+import glob
+from configure import *
-### Name and version
+Help("""
+Possible options:
+ debug: enable debugging
+ profile: enable profiling
+ distclean: make distclean
+""")
+
+### Static definitions
package='nil-ng'
-version='0.1'
-config_conf='config.conf'
-config_cache='config.cache'
+version='0.0.1'
appname = 'nil'
+dependencies_cache = 'dependencies.cache'
###
-### Import the environment from the shell
+### Dynamic definitions
env = Environment(ENV = os.environ)
+x86_64 = platform.machine() == 'x86_64'
###
+### Prerequisites
env.EnsurePythonVersion(2, 5)
-env.EnsureSConsVersion(0, 96)
+env.EnsureSConsVersion(0, 97)
+###
-Help("""
-Possible options:
- debug: enable debugging
- profile: enable profiling
- distclean: make distclean
-""")
-
### Custom builder to create ChangeLog file from svn repository messages
-logbld = Builder(action = 'svn2cl --break-before-msg --strip-prefix=trunk/nil-ng/ -o $TARGET')
-env.Append(BUILDERS = {'ChangeLog' : logbld})
+changelog_builder = Builder(action = 'svn2cl --break-before-msg --strip-prefix=trunk/nil-ng/ -o $TARGET')
+configuration_builder = Builder(action = autoconf)
+env.Append(BUILDERS = {'ChangeLog' : changelog_builder,
+ 'Autoconf' : configuration_builder})
###
-### Enhance scons -c with convenient distclean call
+### Enhance scons -c with a convenient distclean call
if ARGUMENTS.get('distclean', 0):
- env.Clean([appname, appname + 'd'], ['config.cache', 'signatures.dblite', 'config.log', '.sconf_temp'])
+ env.Clean([appname, appname + 'd'], [dependencies_cache,
+ 'signatures.dblite',
+ '.sconsign.dblite',
+ 'config.log',
+ '.sconf_temp',
+ glob.glob('*.pyc')])
###
### Determine compiler flags
@@ -70,51 +73,8 @@
env.Append(CCFLAGS = ccflags)
###
+autoconf(env, dependencies_cache)
-
-def CheckSDLConfig(context, minVersion):
- context.Message('Checking for SDL >= %s... ' % minVersion)
- from popen2 import Popen3
- p = Popen3(['sdl-config', '--version'])
- ret = p.wait()
- out = p.fromchild.readlines()
- if ret != 0:
- context.Result(False)
- return False
- if len(out) != 1:
- # unable to parse output!
- context.Result(False)
- return False
- version = map(int, out[0].strip().split('.'))
- minVersion = map(int, minVersion.split('.'))
- ret = (version >= minVersion)
- if ret == False:
- context.Display('Expected at least version %s, found %s.'
- % (minVersion, version))
- context.Result(False)
- return False
-
- context.Result(True)
- return True
-
-def CheckPKGConfig(context, package, minVersion):
- context.Message('Checking for %s >= %s... ' % (package, minVersion))
- from popen2 import Popen3
- p = Popen3(['pkg-config', '--atleast-version=' + minVersion, package])
- ret = p.wait()
- if ret != 0:
- context.Result(False)
- p = Popen3(['pkg-config', '--modversion', package])
- ret = p.wait()
- out = p.fromchild.readlines()
- context.Display('Expected at least version %s, found %s.'
- % (minVersion, out))
- return False
-
- # read flags...
- context.Result(True)
- return True
-
def Descend():
list = []
for file in os.listdir('.'):
@@ -122,118 +82,7 @@
list.append(file + '/SConscript')
return list
-### Configure our environment
-conf=Configure(env, custom_tests = {
- 'CheckSDLConfig' : CheckSDLConfig,
- 'CheckPKGConfig' : CheckPKGConfig
- })
-
-config = ConfigParser.ConfigParser()
-config.read(config_conf)
-
-cache = ConfigParser.ConfigParser()
-
-if os.path.exists(config_cache):
- print "Using cache file: "+config_cache
- cache.read(config_cache)
-else:
- print "Creating cache file: "+config_cache
- cache.add_section("cheaders")
- cache.add_section("ccheaders")
- cache.add_section("clibs")
- cache.add_section("cclibs")
- cache.add_section("pkgconfig")
-
-file = open(config_cache, 'w')
-
-for option in config.options("cheaders"):
- if (cache.has_option("cheaders", option) and cache.get("cheaders", option) == "True") or config.has_option("clibs", option):
- continue
-
- if not conf.CheckCHeader(config.get("cheaders", option)):
- print option + " must be installed!"
- cache.set("cheaders", option, False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("cheaders", option, True)
-
-for option in config.options("ccheaders"):
- if (cache.has_option("ccheaders", option) and cache.get("ccheaders", option) == "True") or config.has_option("cclibs", option):
- continue
-
- if not conf.CheckCXXHeader(config.get("ccheaders", option)):
- print option + " must be installed!"
- cache.set("ccheaders", option, False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("ccheaders", option, True)
-
-for option in config.options("clibs"):
- if cache.has_option("clibs", option) and cache.get("clibs", option) == "True":
- env.Append(LIBS = [config.get("clibs", option)])
- continue
-
- if not conf.CheckLibWithHeader(config.get("clibs", option), config.get("cheaders", option), 'c', '', "True"):
- print "Couldn't find " + option + " library!"
- cache.set("clibs", option, False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("clibs", option, True)
- env.Append(LIBS = [config.get("clibs", option)])
-
-for option in config.options("cclibs"):
- if cache.has_option("cclibs", option) and cache.get("cclibs", option) == "True":
- env.Append(LIBS = [config.get("cclibs", option)])
- continue
-
- if not conf.CheckLibWithHeader(config.get("cclibs", option), config.get("ccheaders", option), 'c++', '', "True"):
- print "Couldn't find " + option + " library!"
- cache.set("cclibs", option, False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("cclibs", option, True)
- env.Append(LIBS = [config.get("cclibs", option)])
-
-for option in config.options("pkgconfig"):
- if cache.has_option("pkgconfig", option) and cache.get("pkgconfig", option) == "True":
- env.ParseConfig('pkg-config --cflags --libs %s' % option)
- continue
-
- if not conf.CheckPKGConfig(option, config.get("pkgconfig", option)):
- cache.set("pkgconfig", option, False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("pkgconfig", option, True)
- env.ParseConfig('pkg-config --cflags --libs %s' % option)
-
-
-if not (cache.has_option("clibs", "SDL") and cache.get("clibs", "SDL") == "True"):
- if not conf.CheckSDLConfig('1.2.4'):
- cache.set("clibs", "SDL", False)
- cache.write(file)
- file.close()
- Exit(1)
- else:
- cache.set("clibs", "SDL", True)
-env.ParseConfig('sdl-config --cflags --libs')
-
-cache.write(file)
-file.close()
-
-env = conf.Finish()
-###
-
-### Finish the environment configuration
+### environment configuration
env['APPNAME'] = package
env.Append(CPPPATH = "#src") # The hash marks means to treat this directory as an absolute path
env.SourceSignatures('MD5')
@@ -253,8 +102,13 @@
serversource = SConscript('src/SConscript')
###
-### These are the targets: nil, nild, ChangeLog
#env.ChangeLog('ChangeLog', '')
-env.Program(target = appname, source = commonsource + clientsource)
-env.Program(target = appname + 'd', source = commonsource + serversource)
+#target_autoconf = create_autoconf_target()
+target_client = Alias('client', appname)
+target_server = Alias('server', appname + 'd')
+target_all = Alias('all', [target_client, target_server])
+env.Program(appname, commonsource + clientsource)
+env.Program(appname + 'd', commonsource + serversource)
+# env.AddPreAction(appname, autoconf(env)) Doesn't work right now..
+env.Default(target_all)
###
Added: trunk/nil-ng/configure.py
===================================================================
--- trunk/nil-ng/configure.py (rev 0)
+++ trunk/nil-ng/configure.py 2007-09-22 21:12:28 UTC (rev 523)
@@ -0,0 +1,175 @@
+#!/usr/bin/env python
+# Python module to make SCons more autoconf-like
+#
+# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@gm...)
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from SCons.Script import *
+import dependencies
+
+def autoconf(env, dependencies_cache):
+ print "autoconf: Starting scons autoconf"
+ print "autoconf: Using cache file: " + dependencies_cache
+ cache = Options(dependencies_cache)
+ cache.Add('CCFLAGS')
+ cache.Add('LINKFLAGS')
+ cache.Add('CPPPATH')
+ cache.Add('CPPDEFINES')
+ cache.Add('LIBS')
+ cache.Add('LIBPATH')
+ cache.Add('autoconf')
+ cache.Update(env)
+
+ if not env.has_key('autoconf'):
+ env['autoconf'] = {}
+
+ if deftrue(env, 'configured'):
+ print "autoconf: Already configured."
+ return 0
+
+ conf = Configure(env, custom_tests = {
+ 'CheckVersion' : check_version,
+ 'CheckPKGConfig' : check_pkg_config,
+ })
+
+ depend = dependencies.get()
+ process_versions(env, conf, depend['versions'])
+ process_pkg_config(env, conf, depend['pkgconfig'])
+ process_c_headers(env, conf, depend['cheaders'])
+ process_cc_headers(env, conf, depend['ccheaders'])
+ process_libs(env, conf, depend['libs'])
+
+ #env.ParseConfig("sdl-config --version", function = CheckSDLConfig)
+ env = conf.Finish()
+ cache.Save(dependencies_cache, env)
+
+ if env.has_key('error') and env['error'] == True:
+ print "autoconf: Autoconf was not successful."
+ return 1
+ else:
+ print "autoconf: Autoconf was successful."
+ validate(env, 'configured')
+ cache.Save(dependencies_cache, env)
+ return 0
+
+def process_c_headers(env, conf, items):
+ for key in items:
+ if deftrue(env, key):
+ continue
+
+ if conf.CheckCHeader(items[key][0]):
+ validate(env, key)
+ else:
+ env['error'] = True
+
+def process_cc_headers(env, conf, items):
+ for key in items:
+ if deftrue(env, key):
+ continue
+
+ if conf.CheckCXXHeader(items[key][0]):
+ validate(env, key)
+ else:
+ env['error'] = True
+
+def process_libs(env, conf, items):
+ for key in items:
+ if deftrue(env, key):
+ continue
+
+ if conf.CheckLibWithHeader(items[key][0], items[key][1], items[key][2], items[key][3], items[key][4]):
+ validate(env, key)
+ else:
+ env['error'] = True
+
+def process_versions(env, conf, items):
+ for key in items:
+ if deftrue(env, key):
+ continue
+
+ if conf.CheckVersion(key, items[key][0], items[key][1], items[key][2], items[key][3]):
+ validate(env, key)
+ else:
+ env['error'] = True
+
+def process_pkg_config(env, conf, items):
+ for key in items:
+ if deftrue(env, key):
+ continue
+
+ if conf.CheckPKGConfig(key, items[key][0], items[key][1], items[key][2]):
+ validate(env, key)
+ else:
+ env['error'] = True
+
+def deftrue(env, key):
+ return env['autoconf'].has_key(key) and env['autoconf'][key] == True
+
+def validate(env, key):
+ env['autoconf'][key] = True
+
+def check_version(context, package, version_command, add_command, min_version, greater_allowed):
+ context.Message('Checking for %s >= %s... ' % (package, min_version))
+ from popen2 import Popen3
+ p = Popen3(version_command)
+ ret = p.wait()
+ out = p.fromchild.readlines()
+ if ret != 0:
+ context.Result(False)
+ return False
+ if len(out) != 1:
+ # unable to parse output!
+ context.Result(False)
+ return False
+
+ version = out[0]
+ version_split = map(int, version.strip().split('.'))
+ min_version_split = map(int, min_version.split('.'))
+
+ if greater_allowed:
+ ret = (version_split >= min_version_split)
+ else:
+ ret = (version_split == min_version_split)
+
+ context.Result(ret)
+
+ if ret == False:
+ if greater_allowed:
+ context.Display('Expected at least version %s, found %s. ' % (min_version, version))
+ else:
+ context.Display('Expected version %s, found %s. ' % (min_version, version))
+ else:
+ context.env.ParseConfig(add_command)
+
+ return ret
+
+
+def check_pkg_config(context, name, package, min_version, modifier):
+ context.Message('Checking for %s >= %s... ' % (name, min_version))
+ from popen2 import Popen3
+
+ p = Popen3(['pkg-config', ('--%s-version=' % modifier) + min_version, package])
+ ret = p.wait()
+ if ret != 0:
+ context.Result(False)
+ p = Popen3(['pkg-config', '--modversion', package])
+ ret = p.wait()
+ out = p.fromchild.readlines()
+ context.Display('Expected %s version %s, found %s.' % (modifier, min_version, out))
+ return False
+
+ context.env.ParseConfig('pkg-config --cflags --libs ' + package)
+ context.Result(True)
+ return True
Added: trunk/nil-ng/dependencies.py
===================================================================
--- trunk/nil-ng/dependencies.py (rev 0)
+++ trunk/nil-ng/dependencies.py 2007-09-22 21:12:28 UTC (rev 523)
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# NiL Dependencies
+#
+# copyright (C) 2005,2006,2007 Alexander Kahl (e-...@us...)
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+def get():
+ return {
+ 'cheaders': {
+ },
+ 'ccheaders': {
+ },
+ 'libs': {
+ 'pthread': ['pthread', 'pthread.h', 'c', None, True],
+ 'SDL mixer': ['SDL_mixer', 'SDL_mixer.h', 'c', None, True],
+ 'SDL image': ['SDL_image', 'SDL_image.h', 'c', None, True],
+ 'SDL ttf': ['SDL_ttf', 'SDL_ttf.h', 'c', None, True],
+ 'SDL net': ['SDL_net', 'SDL_net.h', 'c', None, True],
+ 'Open GL': ['GL', 'GL/gl.h', 'c', None, True],
+ 'physfs': ['physfs', 'physfs.h', 'c', None, True],
+ },
+ 'pkgconfig': {
+ 'LibXML2': ['libxml-2.0', '2.6', 'atleast'],
+ },
+ 'versions': {
+ 'SDL': ['sdl-config --version', 'sdl-config --cflags --libs', '1.2.10', True],
+ }
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <e-...@us...> - 2007-09-22 21:11:20
|
Revision: 522
http://nil.svn.sourceforge.net/nil/?rev=522&view=rev
Author: e-user
Date: 2007-09-22 14:11:23 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
improved performance test simulation
Modified Paths:
--------------
trunk/nil-ng/src/common/World.cc
Modified: trunk/nil-ng/src/common/World.cc
===================================================================
--- trunk/nil-ng/src/common/World.cc 2007-09-22 21:05:06 UTC (rev 521)
+++ trunk/nil-ng/src/common/World.cc 2007-09-22 21:11:23 UTC (rev 522)
@@ -60,9 +60,19 @@
console->set_mode(SdlConsole::FULLSCREEN);
+ unsigned short delta = 0;
unsigned int time = SDL_GetTicks();
- for (int i = 1; i < 100; i++)
- *console->cdebug << "Performance test " << i << IConsole::endl;
+ for (int i = 1; i < 100000; i++)
+ {
+ *console->cdebug << "Performance test " << i << IConsole::endl;
+ if(SDL_GetTicks() - delta >= 33)
+ {
+ SDL_Delay(100);
+ delta = SDL_GetTicks();
+ console->draw();
+ graphics.update();
+ }
+ }
*console->cmessage << "Done in "
<< (float) (SDL_GetTicks() - time) / 1000 << "s" << IConsole::endl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.
