diff --git a/src/common/attributes/alliance.c b/src/common/attributes/alliance.c index a88cc9e5a..7b19e4e44 100644 --- a/src/common/attributes/alliance.c +++ b/src/common/attributes/alliance.c @@ -9,7 +9,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "alliance.h" diff --git a/src/common/attributes/attributes.c b/src/common/attributes/attributes.c index db4572797..539a487ea 100644 --- a/src/common/attributes/attributes.c +++ b/src/common/attributes/attributes.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "attributes.h" diff --git a/src/common/attributes/fleechance.c b/src/common/attributes/fleechance.c index 5101af05c..b85dfdd0a 100644 --- a/src/common/attributes/fleechance.c +++ b/src/common/attributes/fleechance.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "fleechance.h" #include diff --git a/src/common/attributes/follow.c b/src/common/attributes/follow.c index 814c7e2c4..5b56c6e68 100644 --- a/src/common/attributes/follow.c +++ b/src/common/attributes/follow.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "follow.h" #include diff --git a/src/common/attributes/giveitem.c b/src/common/attributes/giveitem.c index 04f980d31..b8dfe2950 100644 --- a/src/common/attributes/giveitem.c +++ b/src/common/attributes/giveitem.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "giveitem.h" #include diff --git a/src/common/attributes/gm.c b/src/common/attributes/gm.c index e3bec9010..4c0f8b86b 100644 --- a/src/common/attributes/gm.c +++ b/src/common/attributes/gm.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "gm.h" diff --git a/src/common/attributes/hate.c b/src/common/attributes/hate.c index 67c517fe5..3eed4331b 100644 --- a/src/common/attributes/hate.c +++ b/src/common/attributes/hate.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "hate.h" diff --git a/src/common/attributes/iceberg.c b/src/common/attributes/iceberg.c index dd19b1e1c..d0e3b5588 100644 --- a/src/common/attributes/iceberg.c +++ b/src/common/attributes/iceberg.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "iceberg.h" diff --git a/src/common/attributes/key.c b/src/common/attributes/key.c index 62180f279..8bd1b1b2c 100644 --- a/src/common/attributes/key.c +++ b/src/common/attributes/key.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "key.h" diff --git a/src/common/attributes/matmod.c b/src/common/attributes/matmod.c index af236818e..3c81e7a42 100644 --- a/src/common/attributes/matmod.c +++ b/src/common/attributes/matmod.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "matmod.h" #include diff --git a/src/common/attributes/moved.c b/src/common/attributes/moved.c index 635af4992..90454c607 100644 --- a/src/common/attributes/moved.c +++ b/src/common/attributes/moved.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "moved.h" diff --git a/src/common/attributes/movement.c b/src/common/attributes/movement.c index 23d968c37..f809b8431 100644 --- a/src/common/attributes/movement.c +++ b/src/common/attributes/movement.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "movement.h" diff --git a/src/common/attributes/object.c b/src/common/attributes/object.c index aa5eef22e..9cf099b01 100644 --- a/src/common/attributes/object.c +++ b/src/common/attributes/object.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "object.h" diff --git a/src/common/attributes/option.c b/src/common/attributes/option.c index 30f9bc820..90aeeef58 100644 --- a/src/common/attributes/option.c +++ b/src/common/attributes/option.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "option.h" diff --git a/src/common/attributes/orcification.c b/src/common/attributes/orcification.c index a74d787c7..0130b7655 100644 --- a/src/common/attributes/orcification.c +++ b/src/common/attributes/orcification.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "orcification.h" diff --git a/src/common/attributes/otherfaction.c b/src/common/attributes/otherfaction.c index dd7ef4e2c..bf1694324 100644 --- a/src/common/attributes/otherfaction.c +++ b/src/common/attributes/otherfaction.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "otherfaction.h" diff --git a/src/common/attributes/overrideroads.c b/src/common/attributes/overrideroads.c index ef8c230ed..30534c848 100644 --- a/src/common/attributes/overrideroads.c +++ b/src/common/attributes/overrideroads.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "overrideroads.h" diff --git a/src/common/attributes/racename.c b/src/common/attributes/racename.c index f0ea212f7..2680c0488 100644 --- a/src/common/attributes/racename.c +++ b/src/common/attributes/racename.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "racename.h" diff --git a/src/common/attributes/raceprefix.c b/src/common/attributes/raceprefix.c index 8b47f29b5..2dd24d88b 100644 --- a/src/common/attributes/raceprefix.c +++ b/src/common/attributes/raceprefix.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "raceprefix.h" #include diff --git a/src/common/attributes/reduceproduction.c b/src/common/attributes/reduceproduction.c index 38d64948d..9e1852494 100644 --- a/src/common/attributes/reduceproduction.c +++ b/src/common/attributes/reduceproduction.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "reduceproduction.h" #include diff --git a/src/common/attributes/targetregion.c b/src/common/attributes/targetregion.c index 1f8eea157..4ae8d65d5 100644 --- a/src/common/attributes/targetregion.c +++ b/src/common/attributes/targetregion.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "targetregion.h" #include diff --git a/src/common/attributes/variable.c b/src/common/attributes/variable.c index 32ee7dcad..5563e403d 100644 --- a/src/common/attributes/variable.c +++ b/src/common/attributes/variable.c @@ -10,7 +10,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "variable.h" diff --git a/src/common/attributes/viewrange.c b/src/common/attributes/viewrange.c index 7bee132bd..a988be6ca 100644 --- a/src/common/attributes/viewrange.c +++ b/src/common/attributes/viewrange.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "viewrange.h" /* util includes */ diff --git a/src/common/bindings/bind_attrib.c b/src/common/bindings/bind_attrib.c index e72ce2dc6..038563dd9 100644 --- a/src/common/bindings/bind_attrib.c +++ b/src/common/bindings/bind_attrib.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_attrib.h" #include diff --git a/src/common/bindings/bind_building.c b/src/common/bindings/bind_building.c index da0f4b704..f34dfb3b0 100644 --- a/src/common/bindings/bind_building.c +++ b/src/common/bindings/bind_building.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_building.h" #include "bind_unit.h" diff --git a/src/common/bindings/bind_faction.c b/src/common/bindings/bind_faction.c index 5bb69b59b..6870eaea6 100644 --- a/src/common/bindings/bind_faction.c +++ b/src/common/bindings/bind_faction.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_faction.h" #include "bind_unit.h" #include "bindings.h" diff --git a/src/common/bindings/bind_gmtool.c b/src/common/bindings/bind_gmtool.c index f85199087..3385b66c7 100644 --- a/src/common/bindings/bind_gmtool.c +++ b/src/common/bindings/bind_gmtool.c @@ -1,10 +1,10 @@ -#include +#include #include #include "bind_gmtool.h" #include "../gmtool.h" #include "../gmtool_structs.h" -#include "../editing.h" +#include #include #include diff --git a/src/common/bindings/bind_hashtable.c b/src/common/bindings/bind_hashtable.c index c82d874f9..be00fe0ad 100644 --- a/src/common/bindings/bind_hashtable.c +++ b/src/common/bindings/bind_hashtable.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_hashtable.h" #include diff --git a/src/common/bindings/bind_message.c b/src/common/bindings/bind_message.c index cc63ee5aa..93577ad99 100644 --- a/src/common/bindings/bind_message.c +++ b/src/common/bindings/bind_message.c @@ -1,4 +1,4 @@ -#include +#include #include // kernel includes diff --git a/src/common/bindings/bind_region.c b/src/common/bindings/bind_region.c index 0333b7608..97ac77d14 100644 --- a/src/common/bindings/bind_region.c +++ b/src/common/bindings/bind_region.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_region.h" #include "bind_unit.h" #include "bind_ship.h" diff --git a/src/common/bindings/bind_ship.c b/src/common/bindings/bind_ship.c index 862f026f2..17c03be82 100644 --- a/src/common/bindings/bind_ship.c +++ b/src/common/bindings/bind_ship.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_ship.h" #include "bind_unit.h" diff --git a/src/common/bindings/bind_sqlite.c b/src/common/bindings/bind_sqlite.c index 11f3cf2b0..ce7f1aed4 100644 --- a/src/common/bindings/bind_sqlite.c +++ b/src/common/bindings/bind_sqlite.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_unit.h" #include "bindings.h" diff --git a/src/common/bindings/bind_storage.c b/src/common/bindings/bind_storage.c index 9e341f073..23b9a0a5a 100644 --- a/src/common/bindings/bind_storage.c +++ b/src/common/bindings/bind_storage.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "bind_storage.h" diff --git a/src/common/bindings/bind_unit.c b/src/common/bindings/bind_unit.c index 8adfbaa9c..37344a080 100644 --- a/src/common/bindings/bind_unit.c +++ b/src/common/bindings/bind_unit.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bind_unit.h" #include "bind_attrib.h" diff --git a/src/common/bindings/bindings.c b/src/common/bindings/bindings.c index c780b48f0..9c43d821e 100644 --- a/src/common/bindings/bindings.c +++ b/src/common/bindings/bindings.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "bindings.h" #include "bind_unit.h" #include "bind_faction.h" @@ -52,6 +52,7 @@ without prior permission by the authors of Eressea. #include #include +#include #include #include #include @@ -1005,11 +1006,13 @@ static void args_free(void * udata) } static void event_cb(void * sender, const char * event, void * udata) { + lua_State * L = (lua_State *)global.vm_state; event_args * args = (event_args *)udata; int nargs = 2; + lua_rawgeti(L, LUA_REGISTRYINDEX, args->hfunction); if (sender && args->sendertype) { - tolua_pushusertype(L, sender, args->sendertype); + tolua_pushusertype(L, sender, TOLUA_CAST args->sendertype); } else { lua_pushnil(L); } @@ -1052,7 +1055,8 @@ tolua_eventbus_fire(lua_State * L) { void * sender = tolua_tousertype(L, 1, 0); const char * event = tolua_tostring(L, 2, 0); - eventbus_fire(sender, event, args); +/* eventbus_fire(sender, event, args); */ + return 0; } static void diff --git a/src/common/bindings/helpers.c b/src/common/bindings/helpers.c index 91c472ad2..37a85c2e1 100644 --- a/src/common/bindings/helpers.c +++ b/src/common/bindings/helpers.c @@ -11,7 +11,7 @@ without prior permission by the authors of Eressea. */ #include "helpers.h" -#include +#include #include #include diff --git a/src/common/build/Jamfile b/src/common/build/Jamfile index ad206f4c0..1263d230b 100644 --- a/src/common/build/Jamfile +++ b/src/common/build/Jamfile @@ -32,7 +32,7 @@ SERVER_SOURCES = kernel.c stdafx.c util.c - main.c + external.c ; CCFLAGS += -DSQLITE_THREADSAFE=0 ; diff --git a/src/common/build/curses.c b/src/common/build/curses.c index e9c8622f4..588e24944 100644 --- a/src/common/build/curses.c +++ b/src/common/build/curses.c @@ -1,6 +1,7 @@ #include "common/settings.h" -#include "common/config.h" +#include #include "stdafx.h" -#include "eressea/curses/listbox.c" -#include "eressea/gmtool.c" +#include +#include +#include diff --git a/src/common/build/main.c b/src/common/build/external.c similarity index 75% rename from src/common/build/main.c rename to src/common/build/external.c index 7649ff68b..25fb2428d 100644 --- a/src/common/build/main.c +++ b/src/common/build/external.c @@ -1,8 +1,7 @@ #include "common/settings.h" -#include "common/config.h" +#include #include "stdafx.h" -#include #include #include #include diff --git a/src/common/build/gamecode.c b/src/common/build/gamecode.c index eb05d7396..d2f5ed94b 100644 --- a/src/common/build/gamecode.c +++ b/src/common/build/gamecode.c @@ -1,100 +1,97 @@ -#include "common/settings.h" -#include "common/config.h" +#include +#include #include "stdafx.h" #ifdef BINDINGS_TOLUA -#include "eressea/tolua/bindings.c" -#include "eressea/tolua/bind_attrib.c" -#include "eressea/tolua/bind_sqlite.c" -#include "eressea/tolua/bind_unit.c" -#include "eressea/tolua/bind_ship.c" -#include "eressea/tolua/bind_building.c" -#include "eressea/tolua/bind_region.c" -#include "eressea/tolua/bind_faction.c" -#include "eressea/tolua/bind_message.c" -#include "eressea/tolua/bind_hashtable.c" -#include "eressea/tolua/bind_gmtool.c" -#include "eressea/tolua/bind_storage.c" -#include "eressea/tolua/helpers.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif -#include "eressea/console.c" -#include "eressea/editing.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "common/gamecode/archetype.c" -#include "common/gamecode/creation.c" -#include "common/gamecode/creport.c" -#include "common/gamecode/economy.c" -#include "common/gamecode/give.c" -#include "common/gamecode/items.c" -#include "common/gamecode/laws.c" -#include "common/gamecode/luck.c" -#include "common/gamecode/market.c" -#include "common/gamecode/monster.c" -#include "common/gamecode/randenc.c" -#include "common/gamecode/report.c" -#include "common/gamecode/spells.c" -#include "common/gamecode/spy.c" -#include "common/gamecode/study.c" -#include "common/gamecode/summary.c" -#include "common/gamecode/xmlreport.c" +#include +#include +#include +#include -#include "common/races/dragons.c" -#include "common/races/illusion.c" -#include "common/races/races.c" -#include "common/races/zombies.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "common/attributes/alliance.c" -#include "common/attributes/attributes.c" -#include "common/attributes/fleechance.c" -#include "common/attributes/follow.c" -#include "common/attributes/giveitem.c" -#include "common/attributes/gm.c" -#include "common/attributes/hate.c" -#include "common/attributes/iceberg.c" -#include "common/attributes/key.c" -#include "common/attributes/matmod.c" -#include "common/attributes/movement.c" -#include "common/attributes/moved.c" -#include "common/attributes/object.c" -#include "common/attributes/option.c" -#include "common/attributes/orcification.c" -#include "common/attributes/otherfaction.c" -#include "common/attributes/overrideroads.c" -#include "common/attributes/racename.c" -#include "common/attributes/raceprefix.c" -#include "common/attributes/reduceproduction.c" -#include "common/attributes/targetregion.c" -#include "common/attributes/viewrange.c" -#include "common/attributes/variable.c" +#include +#include +#include +#include +#include +#include +#include -#include "common/items/artrewards.c" -#include "common/items/demonseye.c" -#include "common/items/itemtypes.c" -#include "common/items/phoenixcompass.c" -#include "common/items/seed.c" -#include "common/items/weapons.c" -#include "common/items/xerewards.c" +#include +#include +#include +#include +#include +#include +#include -#include "common/spells/alp.c" -#include "common/spells/buildingcurse.c" -#include "common/spells/combatspells.c" -#include "common/spells/regioncurse.c" -#include "common/spells/shipcurse.c" -#include "common/spells/spells.c" -#include "common/spells/unitcurse.c" - -#include "common/triggers/changefaction.c" -#include "common/triggers/changerace.c" -#include "common/triggers/clonedied.c" -#include "common/triggers/createcurse.c" -#include "common/triggers/createunit.c" -#include "common/triggers/gate.c" -#include "common/triggers/giveitem.c" -#include "common/triggers/killunit.c" -#include "common/triggers/removecurse.c" -#include "common/triggers/shock.c" -#include "common/triggers/timeout.c" -#include "common/triggers/triggers.c" -#include "common/triggers/unguard.c" -#include "common/triggers/unitmessage.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/common/build/kernel.c b/src/common/build/kernel.c index 6921841e0..5da321951 100644 --- a/src/common/build/kernel.c +++ b/src/common/build/kernel.c @@ -1,55 +1,55 @@ -#include "common/settings.h" -#include "common/config.h" +#include +#include #include "stdafx.h" -#include "common/kernel/alchemy.c" -#include "common/kernel/alliance.c" -#include "common/kernel/battle.c" -#include "common/kernel/binarystore.c" -#include "common/kernel/connection.c" -#include "common/kernel/build.c" -#include "common/kernel/building.c" -#include "common/kernel/calendar.c" -#include "common/kernel/command.c" -#include "common/kernel/curse.c" -#include "common/kernel/equipment.c" -#include "common/kernel/eressea.c" -#include "common/kernel/faction.c" -#include "common/kernel/group.c" -#include "common/kernel/item.c" -#include "common/kernel/karma.c" -#include "common/kernel/magic.c" -#include "common/kernel/message.c" -#include "common/kernel/move.c" -#include "common/kernel/names.c" -#include "common/kernel/order.c" -#include "common/kernel/pathfinder.c" -#include "common/kernel/plane.c" -#include "common/kernel/player.c" -#include "common/kernel/pool.c" -#include "common/kernel/race.c" -#include "common/kernel/region.c" -#include "common/kernel/reports.c" -#include "common/kernel/resources.c" -#include "common/kernel/save.c" -#include "common/kernel/ship.c" -#include "common/kernel/skill.c" -#include "common/kernel/spell.c" -#include "common/kernel/teleport.c" -#include "common/kernel/terrain.c" -#include "common/kernel/textstore.c" -#include "common/kernel/unit.c" -#include "common/kernel/xmlreader.c" -#include "common/kernel/sqlite.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "common/modules/arena.c" -#include "common/modules/autoseed.c" -#include "common/modules/dungeon.c" -#include "common/modules/gmcmd.c" -#include "common/modules/infocmd.c" -#include "common/modules/museum.c" -#include "common/modules/score.c" -#include "common/modules/weather.c" -#include "common/modules/wormhole.c" -#include "common/modules/xecmd.c" -#include "common/modules/xmas.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/common/build/stdafx.h b/src/common/build/stdafx.h index 360bf55a4..27a78105e 100644 --- a/src/common/build/stdafx.h +++ b/src/common/build/stdafx.h @@ -1,2 +1,2 @@ #include "common/settings.h" -#include "common/config.h" +#include diff --git a/src/common/build/util.c b/src/common/build/util.c index 899f85524..ca2413114 100644 --- a/src/common/build/util.c +++ b/src/common/build/util.c @@ -1,38 +1,40 @@ -#include "common/settings.h" -#include "common/config.h" +#include +#include #include "stdafx.h" -#include "common/iniparser/iniparser.c" -#include "common/util/attrib.c" -#include "common/util/argstack.c" -#include "common/util/base36.c" -#include "common/util/crmessage.c" -#include "common/util/cvector.c" -#include "common/util/dice.c" -#include "common/util/event.c" -#include "common/util/eventbus.c" -#include "common/util/filereader.c" -#include "common/util/functions.c" -#include "common/util/goodies.c" -#include "common/util/language.c" -#include "common/util/lists.c" -#include "common/util/log.c" -#include "common/util/message.c" -#include "common/util/mt19937ar.c" -#include "common/util/nrmessage.c" -#include "common/util/parser.c" -#include "common/util/rand.c" -#include "common/util/resolve.c" -#include "common/util/sql.c" -#include "common/util/translation.c" -#include "common/util/umlaut.c" -#include "common/util/unicode.c" -#include "common/util/xml.c" +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef HAVE_INLINE -#include "common/util/bsdstring.c" +#include #endif #ifdef __GNUC__ -#include "common/util/strncpy.c" +#include #endif diff --git a/src/common/editing.c b/src/common/editing.c index 15dfe7107..0ffc33ab2 100644 --- a/src/common/editing.c +++ b/src/common/editing.c @@ -8,7 +8,7 @@ * */ -#include +#include #include #include "editing.h" diff --git a/src/common/gamecode.vcproj b/src/common/gamecode.vcproj index fcc9f7dc2..17e7570fb 100644 --- a/src/common/gamecode.vcproj +++ b/src/common/gamecode.vcproj @@ -84,73 +84,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - +#include #include #include "archetype.h" diff --git a/src/common/gamecode/creation.c b/src/common/gamecode/creation.c index 19388be40..9ca399b7d 100644 --- a/src/common/gamecode/creation.c +++ b/src/common/gamecode/creation.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "creation.h" #include "monster.h" diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index dc4a748f5..7e133d568 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -7,7 +7,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "creport.h" diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index cd9bf8a12..4b6be56df 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -21,7 +21,7 @@ #pragma region includes -#include +#include #include #include "economy.h" diff --git a/src/common/gamecode/give.c b/src/common/gamecode/give.c index e82f5e455..87c47845b 100644 --- a/src/common/gamecode/give.c +++ b/src/common/gamecode/give.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "give.h" diff --git a/src/common/gamecode/items.c b/src/common/gamecode/items.c index 8a5402d39..dd022765d 100644 --- a/src/common/gamecode/items.c +++ b/src/common/gamecode/items.c @@ -1,4 +1,4 @@ -#include +#include #include #include "items.h" diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index de4497c1d..c5b0602dd 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -21,7 +21,7 @@ #pragma region includes -#include +#include #include #include "laws.h" diff --git a/src/common/gamecode/luck.c b/src/common/gamecode/luck.c index 56c4b9046..eb2affab1 100644 --- a/src/common/gamecode/luck.c +++ b/src/common/gamecode/luck.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "luck.h" diff --git a/src/common/gamecode/market.c b/src/common/gamecode/market.c index 49382e537..6668606f8 100644 --- a/src/common/gamecode/market.c +++ b/src/common/gamecode/market.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "market.h" diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c index ad8049945..b2d54f448 100644 --- a/src/common/gamecode/monster.c +++ b/src/common/gamecode/monster.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "monster.h" diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index e4d281c9e..a09344bd6 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "randenc.h" diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index f80975460..69150c927 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -14,7 +14,7 @@ #define ECHECK_VERSION "4.01" -#include +#include #include /* modules includes */ diff --git a/src/common/gamecode/spells.c b/src/common/gamecode/spells.c index ecb289361..3d283d65f 100644 --- a/src/common/gamecode/spells.c +++ b/src/common/gamecode/spells.c @@ -11,7 +11,7 @@ * because it's so much work to get them out of the big array. */ -#include +#include #include #include "spy.h" diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c index c488d0a6b..0891ebd12 100644 --- a/src/common/gamecode/spy.c +++ b/src/common/gamecode/spy.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "spy.h" diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c index d006a66e2..8213c5e04 100644 --- a/src/common/gamecode/study.c +++ b/src/common/gamecode/study.c @@ -22,7 +22,7 @@ #define TEACH_ALL 1 #define TEACH_FRIENDS -#include +#include #include #include "study.h" diff --git a/src/common/gamecode/summary.c b/src/common/gamecode/summary.c index 498a57f6a..1542a77f2 100644 --- a/src/common/gamecode/summary.c +++ b/src/common/gamecode/summary.c @@ -8,8 +8,8 @@ * */ -/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ -#include +/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */ +#include #include #include "summary.h" diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c index 5cef7feb0..a4333601e 100644 --- a/src/common/gamecode/xmlreport.c +++ b/src/common/gamecode/xmlreport.c @@ -7,7 +7,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "xmlreport.h" diff --git a/src/common/gmtool.c b/src/common/gmtool.c index 654972e15..7f4c9f523 100644 --- a/src/common/gmtool.c +++ b/src/common/gmtool.c @@ -8,16 +8,14 @@ * */ -/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ -#include +/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */ +#include #include #include #include "gmtool.h" #include "gmtool_structs.h" #include "editing.h" -#include "console.h" -#include "curses/listbox.h" #include #include @@ -59,6 +57,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/common/items/artrewards.c b/src/common/items/artrewards.c index e73f99933..37d32c490 100644 --- a/src/common/items/artrewards.c +++ b/src/common/items/artrewards.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "artrewards.h" diff --git a/src/common/items/demonseye.c b/src/common/items/demonseye.c index 76c00a9df..7cca80ba9 100644 --- a/src/common/items/demonseye.c +++ b/src/common/items/demonseye.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "demonseye.h" diff --git a/src/common/items/itemtypes.c b/src/common/items/itemtypes.c index 2c197bcba..8239ccd5f 100644 --- a/src/common/items/itemtypes.c +++ b/src/common/items/itemtypes.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "itemtypes.h" diff --git a/src/common/items/phoenixcompass.c b/src/common/items/phoenixcompass.c index d06ef91f5..5cdaf6a91 100644 --- a/src/common/items/phoenixcompass.c +++ b/src/common/items/phoenixcompass.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "phoenixcompass.h" diff --git a/src/common/items/seed.c b/src/common/items/seed.c index 2ad1f13b7..3ca40ca74 100644 --- a/src/common/items/seed.c +++ b/src/common/items/seed.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "seed.h" diff --git a/src/common/items/speedsail.c b/src/common/items/speedsail.c index bd2ddd9ba..c62d0e2cf 100644 --- a/src/common/items/speedsail.c +++ b/src/common/items/speedsail.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "speedsail.h" diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c index 9effbda18..57ea38654 100644 --- a/src/common/items/weapons.c +++ b/src/common/items/weapons.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "weapons.h" diff --git a/src/common/items/xerewards.c b/src/common/items/xerewards.c index 6daee1163..7719d7394 100644 --- a/src/common/items/xerewards.c +++ b/src/common/items/xerewards.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "xerewards.h" diff --git a/src/common/kernel.vcproj b/src/common/kernel.vcproj index 93e7d2ea8..46d28d9f5 100644 --- a/src/common/kernel.vcproj +++ b/src/common/kernel.vcproj @@ -84,73 +84,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - +#include #include #include "alchemy.h" diff --git a/src/common/kernel/alliance.c b/src/common/kernel/alliance.c index 53aedbb8d..de2694381 100644 --- a/src/common/kernel/alliance.c +++ b/src/common/kernel/alliance.c @@ -12,7 +12,7 @@ without prior permission by the authors of Eressea. #pragma region includes -#include +#include #include #include "alliance.h" diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 9ecad26f3..2a5a877f7 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -14,7 +14,7 @@ #pragma region includes -#include +#include #include #include "battle.h" diff --git a/src/common/kernel/binarystore.c b/src/common/kernel/binarystore.c index cf6653421..4f9f0a2d7 100644 --- a/src/common/kernel/binarystore.c +++ b/src/common/kernel/binarystore.c @@ -6,7 +6,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "eressea.h" #include "textstore.h" diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 23dd95eb1..f103e1e06 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include #include "build.h" diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c index 7a98ca48e..f19b3ec06 100644 --- a/src/common/kernel/building.c +++ b/src/common/kernel/building.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "building.h" diff --git a/src/common/kernel/calendar.c b/src/common/kernel/calendar.c index 3587c3131..8a4efccca 100644 --- a/src/common/kernel/calendar.c +++ b/src/common/kernel/calendar.c @@ -1,4 +1,4 @@ -#include +#include #include "calendar.h" #include diff --git a/src/common/kernel/command.c b/src/common/kernel/command.c index c4ef84527..31d35e812 100644 --- a/src/common/kernel/command.c +++ b/src/common/kernel/command.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "command.h" diff --git a/src/common/kernel/connection.c b/src/common/kernel/connection.c index 9b4b2c7f4..f1d7c2b1d 100644 --- a/src/common/kernel/connection.c +++ b/src/common/kernel/connection.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "connection.h" diff --git a/src/common/kernel/curse.c b/src/common/kernel/curse.c index ecca96adf..718a48bbb 100644 --- a/src/common/kernel/curse.c +++ b/src/common/kernel/curse.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "curse.h" diff --git a/src/common/kernel/equipment.c b/src/common/kernel/equipment.c index ca5edca83..c03b20ef2 100644 --- a/src/common/kernel/equipment.c +++ b/src/common/kernel/equipment.c @@ -17,7 +17,7 @@ * This program may not be sold or used commercially without prior written * permission from the authors. */ -#include +#include #include #include "equipment.h" diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index ab00c5fde..d53fa0c5b 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include /* attributes includes */ diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index 6d362257f..c3cc02c39 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -25,7 +25,7 @@ extern "C" { #endif - /* this should always be the first thing included after config.h */ + /* this should always be the first thing included after platform.h */ #include "types.h" /* experimental gameplay features (that don't affect the savefile) */ diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c index a335f98ea..b9559ebe6 100644 --- a/src/common/kernel/faction.c +++ b/src/common/kernel/faction.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "faction.h" diff --git a/src/common/kernel/group.c b/src/common/kernel/group.c index 15c6eddc7..16efd1b99 100644 --- a/src/common/kernel/group.c +++ b/src/common/kernel/group.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "group.h" diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index cc987510b..f6da5d8cd 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "item.h" diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c index 9ef4cb5a4..f3c853bcb 100644 --- a/src/common/kernel/karma.c +++ b/src/common/kernel/karma.c @@ -12,7 +12,7 @@ */ /* TODO: enum auf fst_ umstellen. Pointer auf Display-Routine */ -#include +#include #include #include "karma.h" diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index 109ece8aa..63cab24a1 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include #include "magic.h" diff --git a/src/common/kernel/message.c b/src/common/kernel/message.c index 4296581ab..65f796d69 100644 --- a/src/common/kernel/message.c +++ b/src/common/kernel/message.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include #include "message.h" diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c index 9f0f20d7c..d80f1b993 100644 --- a/src/common/kernel/move.c +++ b/src/common/kernel/move.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include #include "move.h" diff --git a/src/common/kernel/names.c b/src/common/kernel/names.c index bd846db10..8e3315eab 100644 --- a/src/common/kernel/names.c +++ b/src/common/kernel/names.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "names.h" diff --git a/src/common/kernel/order.c b/src/common/kernel/order.c index a3c72be7d..4397adb58 100644 --- a/src/common/kernel/order.c +++ b/src/common/kernel/order.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "order.h" diff --git a/src/common/kernel/pathfinder.c b/src/common/kernel/pathfinder.c index c07076824..a46c9361a 100644 --- a/src/common/kernel/pathfinder.c +++ b/src/common/kernel/pathfinder.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "pathfinder.h" diff --git a/src/common/kernel/plane.c b/src/common/kernel/plane.c index 8483a14dc..47c95bb6a 100644 --- a/src/common/kernel/plane.c +++ b/src/common/kernel/plane.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "plane.h" diff --git a/src/common/kernel/player.c b/src/common/kernel/player.c index dcb1ecc49..c8076f640 100644 --- a/src/common/kernel/player.c +++ b/src/common/kernel/player.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include "player.h" #include diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index 562b950a3..af19509ca 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "pool.h" diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c index a736e59b7..01403ec0b 100644 --- a/src/common/kernel/race.c +++ b/src/common/kernel/race.c @@ -17,7 +17,7 @@ * This program may not be sold or used commercially without prior written * permission from the authors. */ -#include +#include #include #include "race.h" diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index 3eff5d7c2..cef89c256 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "region.h" diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c index e9eea362f..f3b6167d8 100644 --- a/src/common/kernel/reports.c +++ b/src/common/kernel/reports.c @@ -17,7 +17,7 @@ * This program may not be sold or used commercially without prior written * permission from the authors. */ -#include +#include #include #include "reports.h" diff --git a/src/common/kernel/resources.c b/src/common/kernel/resources.c index 3bf07b021..642f1a9e1 100644 --- a/src/common/kernel/resources.c +++ b/src/common/kernel/resources.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "resources.h" diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index d7feae64f..e0d560852 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -18,7 +18,7 @@ * permission from the authors. */ -#include +#include #include #include "save.h" diff --git a/src/common/kernel/ship.c b/src/common/kernel/ship.c index 69db9157e..ded216245 100644 --- a/src/common/kernel/ship.c +++ b/src/common/kernel/ship.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "ship.h" diff --git a/src/common/kernel/skill.c b/src/common/kernel/skill.c index 0dc6c8571..7380d61a0 100644 --- a/src/common/kernel/skill.c +++ b/src/common/kernel/skill.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "skill.h" diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index a1df201ab..1c2f27254 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "spell.h" diff --git a/src/common/kernel/sqlite.c b/src/common/kernel/sqlite.c index 45385a407..3ac5e7a17 100644 --- a/src/common/kernel/sqlite.c +++ b/src/common/kernel/sqlite.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/common/kernel/teleport.c b/src/common/kernel/teleport.c index 793707812..e4ac1f3b5 100644 --- a/src/common/kernel/teleport.c +++ b/src/common/kernel/teleport.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "teleport.h" diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c index b8ca731d8..3a453e9f6 100644 --- a/src/common/kernel/terrain.c +++ b/src/common/kernel/terrain.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include #include "terrain.h" diff --git a/src/common/kernel/textstore.c b/src/common/kernel/textstore.c index b49449127..a54174f81 100644 --- a/src/common/kernel/textstore.c +++ b/src/common/kernel/textstore.c @@ -6,7 +6,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "eressea.h" #include "textstore.h" diff --git a/src/common/kernel/types.h b/src/common/kernel/types.h index 35dcf5c0e..d19d23897 100644 --- a/src/common/kernel/types.h +++ b/src/common/kernel/types.h @@ -27,7 +27,7 @@ * and write #include (or whatever settings you want * your game to use) in there. * !!! DO NOT COMMIT THE SETTINGS.H FILE TO CVS !!! - * settings.h should always be the first thing you include (after config.h). + * settings.h should always be the first thing you include (after platform.h). */ #include #include diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c index 33a4860e9..093037159 100644 --- a/src/common/kernel/unit.c +++ b/src/common/kernel/unit.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include "unit.h" diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 805971ceb..d5bf15b84 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -10,7 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "xmlreader.h" diff --git a/src/vc9/eressea-lua.vcproj b/src/common/lua-bindings.vcproj similarity index 67% rename from src/vc9/eressea-lua.vcproj rename to src/common/lua-bindings.vcproj index c92782eac..7f294d7a2 100644 --- a/src/vc9/eressea-lua.vcproj +++ b/src/common/lua-bindings.vcproj @@ -1,12 +1,11 @@ + @@ -124,13 +126,14 @@ + @@ -186,119 +190,117 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c index f07a60047..2b804cc97 100644 --- a/src/common/modules/arena.c +++ b/src/common/modules/arena.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #if ARENA_MODULE diff --git a/src/common/modules/autoseed.c b/src/common/modules/autoseed.c index 57820234e..57293aaca 100644 --- a/src/common/modules/autoseed.c +++ b/src/common/modules/autoseed.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "autoseed.h" diff --git a/src/common/modules/dungeon.c b/src/common/modules/dungeon.c index 17d10e983..8c2e29756 100644 --- a/src/common/modules/dungeon.c +++ b/src/common/modules/dungeon.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #if DUNGEON_MODULE diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c index be0854d99..b54380caf 100644 --- a/src/common/modules/gmcmd.c +++ b/src/common/modules/gmcmd.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "gmcmd.h" #include diff --git a/src/common/modules/infocmd.c b/src/common/modules/infocmd.c index 4d5da45fa..a7fee4876 100644 --- a/src/common/modules/infocmd.c +++ b/src/common/modules/infocmd.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #if INFOCMD_MODULE diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c index f494fc5b0..c0dbe0f4e 100644 --- a/src/common/modules/museum.c +++ b/src/common/modules/museum.c @@ -18,7 +18,7 @@ * - Meldungen */ -#include +#include #include diff --git a/src/common/modules/oceannames.c b/src/common/modules/oceannames.c index 1b0c25e8f..98b65cce7 100644 --- a/src/common/modules/oceannames.c +++ b/src/common/modules/oceannames.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "oceannames.h" diff --git a/src/common/modules/score.c b/src/common/modules/score.c index 1ae9c76b4..fcfe8e57f 100644 --- a/src/common/modules/score.c +++ b/src/common/modules/score.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #if SCORE_MODULE #include "score.h" diff --git a/src/common/modules/weather.c b/src/common/modules/weather.c index daf354912..3dccc622a 100644 --- a/src/common/modules/weather.c +++ b/src/common/modules/weather.c @@ -25,7 +25,7 @@ #ifdef WEATHER -#include +#include #include #include "weather.h" diff --git a/src/common/modules/wormhole.c b/src/common/modules/wormhole.c index 779f91bb9..7c9febeb0 100644 --- a/src/common/modules/wormhole.c +++ b/src/common/modules/wormhole.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "settings.h" diff --git a/src/common/modules/xecmd.c b/src/common/modules/xecmd.c index d70123992..908b26654 100644 --- a/src/common/modules/xecmd.c +++ b/src/common/modules/xecmd.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #if XECMD_MODULE diff --git a/src/common/modules/xmas.c b/src/common/modules/xmas.c index 024b45a0d..d5f3d9589 100644 --- a/src/common/modules/xmas.c +++ b/src/common/modules/xmas.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ -#include +#include #include #include "xmas.h" diff --git a/src/common/races/dragons.c b/src/common/races/dragons.c index 23d8874a0..e19a4e1e5 100644 --- a/src/common/races/dragons.c +++ b/src/common/races/dragons.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "dragons.h" diff --git a/src/common/races/illusion.c b/src/common/races/illusion.c index 12920da45..2621441ba 100644 --- a/src/common/races/illusion.c +++ b/src/common/races/illusion.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "illusion.h" diff --git a/src/common/races/races.c b/src/common/races/races.c index e1869abdf..b0a8cb72f 100644 --- a/src/common/races/races.c +++ b/src/common/races/races.c @@ -8,7 +8,7 @@ * */ -#include +#include #include #include "races.h" diff --git a/src/common/races/zombies.c b/src/common/races/zombies.c index 258bca5b2..4a32d6204 100644 --- a/src/common/races/zombies.c +++ b/src/common/races/zombies.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "zombies.h" diff --git a/src/vc9/editor.vcproj b/src/common/server.vcproj similarity index 71% rename from src/vc9/editor.vcproj rename to src/common/server.vcproj index 418f7cf18..3ba94ac39 100644 --- a/src/vc9/editor.vcproj +++ b/src/common/server.vcproj @@ -1,12 +1,11 @@ @@ -40,6 +39,7 @@ /> @@ -115,6 +116,7 @@ EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="4" + Detect64BitPortabilityProblems="true" DebugInformationFormat="0" /> + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/src/common/settings-conquest.h b/src/common/settings-conquest.h deleted file mode 100644 index 9c7b16adc..000000000 --- a/src/common/settings-conquest.h +++ /dev/null @@ -1,53 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2002 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -/* - * Contains defines for the "conquest" vinyambar game (Speedgame). - * Include this file from settings.h to make eressea work. - */ -#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */ -#define CHANGED_CROSSBOWS 1 -#define COMBAT_TURNS 5 -#define ENTERTAINBASE 15 -#define ENTERTAINPERLEVEL 5 -#define ENTERTAINFRACTION 20 -#define GAME_ID 3 -#define GROWING_TREES 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define GUARD_DISABLES_RECRUIT 1 -#define HUNGER_DISABLES_LONGORDERS 1 -#define IMMUN_GEGEN_ANGRIFF 8 -#define LARGE_CASTLES 1 -#define NEW_MIGRATION 1 -#define NMRTIMEOUT 5 -#define PEASANTS_DO_NOT_STARVE 0 -#define PEASANT_ADJUSTMENT 1 -#define RACE_ADJUSTMENTS 1 -#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define REDUCED_PEASANTGROWTH 1 -#define REMOVENMRNEWBIE 0 -#define RESOURCE_CONVERSION 1 -#define RESOURCE_QUANTITY 0.5 -#define TEACHDIFFERENCE 2 -#define GIVERESTRICTION 0 -#define NEWATSROI 0 -#if NEWATSROI == 1 -#define ATSBONUS 2 -#define ROIBONUS 4 -#endif - -#define ENHANCED_QUIT -#define ALLIANCES -#undef ALLIANCEJOIN -#define AUTOALLIANCE (HELP_FIGHT) - -#define MAILITPATH "/usr/sbin:$HOME/bin:/bin:/usr/bin:/usr/local/bin" diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h deleted file mode 100644 index bf62c9907..000000000 --- a/src/common/settings-tutorial.h +++ /dev/null @@ -1,57 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2003 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -/* - * Contains defines for the "free" game (Eressea) . - * Include this file from settings.h to make eressea work. - */ -#define ENTERTAINFRACTION 20 -#define TEACHDIFFERENCE 2 -#define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define RESOURCE_QUANTITY 0.5 -#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define COMBAT_TURNS 5 -#define NEWATSROI 0 - -/* Vermehrungsrate Bauern in 1/10000. -* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */ -#define PEASANTGROWTH 10 -#define BATTLE_KILLS_PEASANTS 20 -#define PEASANTLUCK 10 - -#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert - auf die Hälfte */ - -#define ASTRAL_ITEM_RESTRICTIONS /* keine grossen dinge im astralraum */ -#define NEW_DAEMONHUNGER_RULE -#define NEW_COMBATSKILLS_RULE -#define ROW_FACTOR 3 /* factor for combat row advancement rule */ -#define HEROES - -/* optional game components. TODO: These should either be - * configuration variables (XML), script extensions (lua), - * or both. We don't want separate binaries for different games - */ -#define SCORE_MODULE 1 -#define MUSEUM_MODULE 0 -#define ARENA_MODULE 0 -#define WORMHOLE_MODULE 0 -#define XECMD_MODULE 0 -#define KARMA_MODULE 0 -#define DUNGEON_MODULE 0 -#define INFOCMD_MODULE 0 -#define CHANGED_CROSSBOWS 0 /* use the WTF_ARMORPIERCING flag */ -#define GLOBAL_WARMING 0 /* number of turns before global warming sets in */ - -#define SIMPLE_COMBAT -#define SIMPLE_ESCAPE diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h deleted file mode 100644 index d940b32fb..000000000 --- a/src/common/settings-vinyambar-3.h +++ /dev/null @@ -1,35 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2003 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -/* - * Contains defines for the "alliance" vinyambar game (V3). - * Include this file from settings.h to make eressea work. - */ -#define ENTERTAINFRACTION 20 -#define TEACHDIFFERENCE 2 -#define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define RESOURCE_QUANTITY 0.5 -#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define NEWATSROI 0 -#define COMBAT_TURNS 5 - -/* Vermehrungsrate Bauern in 1/10000. -* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */ -#define PEASANTGROWTH 10 -#define BATTLE_KILLS_PEASANTS 20 -#define PEASANTLUCK 10 - -#if NEWATSROI == 1 -#define ATSBONUS 2 -#define ROIBONUS 4 -#endif diff --git a/src/common/settings-vinyambar-murder.h b/src/common/settings-vinyambar-murder.h deleted file mode 100644 index 079d1f0e2..000000000 --- a/src/common/settings-vinyambar-murder.h +++ /dev/null @@ -1,42 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2001 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -/* - * Contains defines for the "murder variant" game (vinyambar) . - * Include this file from settings.h to make eressea work. - */ -#define GAME_ID 0 -#define IMMUN_GEGEN_ANGRIFF 8 -#define RESOURCE_CONVERSION 1 -#define LARGE_CASTLES 1 -#define GROWING_TREES 1 -#define REMOVENMRNEWBIE 1 -#define NMRTIMEOUT 4 -#define HUNGER_DISABLES_LONGORDERS 1 -#define REDUCED_PEASANTGROWTH 1 -#define RACE_ADJUSTMENTS 1 -#define TEACHDIFFERENCE 2 -#define PEASANT_ADJUSTMENT 1 -#define NEW_MIGRATION 1 -#define PEASANTS_DO_NOT_STARVE 0 -#define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define RESOURCE_QUANTITY 1.0 -#define RECRUITFRACTION 40 -#define CATAPULT_AMMUNITION 1 -#define CHANGED_CROSSBOWS 1 -#define NEWATSROI 0 - -#define VICTORY_CONDITION VICTORY_MURDER -#define VICTORY_DELAY 4 - -#define MAILITPATH "/usr/sbin:$HOME/bin:/bin:/usr/bin:/usr/local/bin" diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h deleted file mode 100644 index faed41e90..000000000 --- a/src/common/settings-wdw.h +++ /dev/null @@ -1,51 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2003 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ - -/* - * Contains defines for the "alliance" vinyambar game (wdw). - * Include this file from settings.h to make eressea work. - */ -#define ENTERTAINFRACTION 20 -#define TEACHDIFFERENCE 2 -#define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define RESOURCE_QUANTITY 0.5 -#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ -#define COMBAT_TURNS 5 - -/* Vermehrungsrate Bauern in 1/10000. -* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */ -#define PEASANTGROWTH 10 -#define BATTLE_KILLS_PEASANTS 20 -#define PEASANTLUCK 10 - -#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert - auf die Hälfte */ - -#define PEASANT_HUNGRY_DAEMONS_HAVE_FULL_SKILLS - - -#define NEWATSROI 1 -#if NEWATSROI == 1 -#define ATSBONUS 2 -#define ROIBONUS 4 -#endif - -#undef ALLIANCEJOIN - -#define SCORE_MODULE -#undef DUNGEON_MODULE -#undef MUSEUM_MODULE -#undef ARENA_MODULE -#undef WORMHOLE_MODULE -#undef XECMD_MODULE -#define WDW_PYRAMID diff --git a/src/common/settings-eressea.h b/src/common/settings.h similarity index 100% rename from src/common/settings-eressea.h rename to src/common/settings.h diff --git a/src/common/spells/alp.c b/src/common/spells/alp.c index efb8ec86f..b6a618987 100644 --- a/src/common/spells/alp.c +++ b/src/common/spells/alp.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "alp.h" diff --git a/src/common/spells/buildingcurse.c b/src/common/spells/buildingcurse.c index 776bed013..802f68136 100644 --- a/src/common/spells/buildingcurse.c +++ b/src/common/spells/buildingcurse.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "buildingcurse.h" diff --git a/src/common/spells/combatspells.c b/src/common/spells/combatspells.c index 0d2b8d48e..0a77e3045 100644 --- a/src/common/spells/combatspells.c +++ b/src/common/spells/combatspells.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "combatspells.h" diff --git a/src/common/spells/regioncurse.c b/src/common/spells/regioncurse.c index 6912e7d8d..b05d70e90 100644 --- a/src/common/spells/regioncurse.c +++ b/src/common/spells/regioncurse.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "regioncurse.h" diff --git a/src/common/spells/shipcurse.c b/src/common/spells/shipcurse.c index 0f033b522..2be53e4da 100644 --- a/src/common/spells/shipcurse.c +++ b/src/common/spells/shipcurse.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "shipcurse.h" diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c index b6514b8db..3475ad301 100644 --- a/src/common/spells/spells.c +++ b/src/common/spells/spells.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "spells.h" diff --git a/src/common/spells/unitcurse.c b/src/common/spells/unitcurse.c index fdeb61c6b..2d6e4d085 100644 --- a/src/common/spells/unitcurse.c +++ b/src/common/spells/unitcurse.c @@ -11,7 +11,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "unitcurse.h" diff --git a/src/common/triggers/changefaction.c b/src/common/triggers/changefaction.c index 691305309..249e4683b 100644 --- a/src/common/triggers/changefaction.c +++ b/src/common/triggers/changefaction.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "changefaction.h" diff --git a/src/common/triggers/changerace.c b/src/common/triggers/changerace.c index fa563b4a4..f6ca84622 100644 --- a/src/common/triggers/changerace.c +++ b/src/common/triggers/changerace.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "changerace.h" diff --git a/src/common/triggers/clonedied.c b/src/common/triggers/clonedied.c index 6ad77689b..806399831 100644 --- a/src/common/triggers/clonedied.c +++ b/src/common/triggers/clonedied.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "clonedied.h" diff --git a/src/common/triggers/createcurse.c b/src/common/triggers/createcurse.c index 9f0648428..0ff1d27c8 100644 --- a/src/common/triggers/createcurse.c +++ b/src/common/triggers/createcurse.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "createcurse.h" diff --git a/src/common/triggers/createunit.c b/src/common/triggers/createunit.c index aa6cbd40d..a0cc7dc8f 100644 --- a/src/common/triggers/createunit.c +++ b/src/common/triggers/createunit.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "createunit.h" diff --git a/src/common/triggers/gate.c b/src/common/triggers/gate.c index a84d91450..3ca29c6ca 100644 --- a/src/common/triggers/gate.c +++ b/src/common/triggers/gate.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "gate.h" diff --git a/src/common/triggers/giveitem.c b/src/common/triggers/giveitem.c index 3a441b02f..92d835d4e 100644 --- a/src/common/triggers/giveitem.c +++ b/src/common/triggers/giveitem.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "giveitem.h" diff --git a/src/common/triggers/killunit.c b/src/common/triggers/killunit.c index 02cad7e9d..adc19c7bb 100644 --- a/src/common/triggers/killunit.c +++ b/src/common/triggers/killunit.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "killunit.h" diff --git a/src/common/triggers/removecurse.c b/src/common/triggers/removecurse.c index 2be5986da..152be6ff4 100644 --- a/src/common/triggers/removecurse.c +++ b/src/common/triggers/removecurse.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "removecurse.h" diff --git a/src/common/triggers/shock.c b/src/common/triggers/shock.c index 74dfbea94..fb349c5f7 100644 --- a/src/common/triggers/shock.c +++ b/src/common/triggers/shock.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "shock.h" diff --git a/src/common/triggers/timeout.c b/src/common/triggers/timeout.c index 8b569dfa7..8e421575b 100644 --- a/src/common/triggers/timeout.c +++ b/src/common/triggers/timeout.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include #include "timeout.h" diff --git a/src/common/triggers/triggers.c b/src/common/triggers/triggers.c index 404bb83ca..9154e1912 100644 --- a/src/common/triggers/triggers.c +++ b/src/common/triggers/triggers.c @@ -17,7 +17,7 @@ * world. */ -#include +#include #include /* triggers includes */ diff --git a/src/common/triggers/unguard.c b/src/common/triggers/unguard.c index 9947af80f..dbda41cce 100644 --- a/src/common/triggers/unguard.c +++ b/src/common/triggers/unguard.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "unguard.h" diff --git a/src/common/triggers/unitmessage.c b/src/common/triggers/unitmessage.c index 3e8fd397b..9974f381d 100644 --- a/src/common/triggers/unitmessage.c +++ b/src/common/triggers/unitmessage.c @@ -7,7 +7,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include #include "unitmessage.h" diff --git a/src/common/util.vcproj b/src/common/util.vcproj index acc3d2d8b..28a92ce00 100644 --- a/src/common/util.vcproj +++ b/src/common/util.vcproj @@ -84,73 +84,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -328,38 +210,18 @@ RelativePath=".\util\language_struct.h" > - - - - - - - - - - @@ -368,34 +230,18 @@ RelativePath=".\util\nrmessage_struct.h" > - - - - - - - - @@ -404,10 +250,6 @@ RelativePath=".\util\rng.h" > - - @@ -416,30 +258,14 @@ RelativePath=".\util\storage.h" > - - - - - - - - @@ -448,39 +274,124 @@ RelativePath=".\util\variant.h" > - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c index e6f8e2353..62033911d 100644 --- a/src/common/util/attrib.c +++ b/src/common/util/attrib.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "attrib.h" #include "log.h" diff --git a/src/common/util/base36.c b/src/common/util/base36.c index 3b3f7a2b8..548066853 100644 --- a/src/common/util/base36.c +++ b/src/common/util/base36.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "base36.h" #include diff --git a/src/common/util/bsdstring.c b/src/common/util/bsdstring.c index 331155a54..84802c70e 100644 --- a/src/common/util/bsdstring.c +++ b/src/common/util/bsdstring.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/common/util/console.c b/src/common/util/console.c index 33c461730..62353604a 100644 --- a/src/common/util/console.c +++ b/src/common/util/console.c @@ -1,4 +1,4 @@ -#include +#include #include "console.h" /* lua includes */ diff --git a/src/common/util/crmessage.c b/src/common/util/crmessage.c index 20ffe3a63..6cb1ba349 100644 --- a/src/common/util/crmessage.c +++ b/src/common/util/crmessage.c @@ -11,7 +11,7 @@ */ -#include +#include #include "crmessage.h" #include "message.h" diff --git a/src/common/util/cvector.c b/src/common/util/cvector.c index eb39a4f90..b8483e1fb 100644 --- a/src/common/util/cvector.c +++ b/src/common/util/cvector.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "cvector.h" #include "rng.h" diff --git a/src/common/util/dice.c b/src/common/util/dice.c index 36525074b..bf8593d0c 100644 --- a/src/common/util/dice.c +++ b/src/common/util/dice.c @@ -17,7 +17,7 @@ * authors. */ -#include +#include #include "rng.h" #include diff --git a/src/common/util/event.c b/src/common/util/event.c index ce73524b9..f7465262f 100644 --- a/src/common/util/event.c +++ b/src/common/util/event.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "event.h" /* util includes */ diff --git a/src/common/util/eventbus.c b/src/common/util/eventbus.c index 71087ec9b..77e81b578 100644 --- a/src/common/util/eventbus.c +++ b/src/common/util/eventbus.c @@ -1,4 +1,4 @@ -#include +#include #include "eventbus.h" /* diff --git a/src/common/util/filereader.c b/src/common/util/filereader.c index 49032e336..26c745851 100644 --- a/src/common/util/filereader.c +++ b/src/common/util/filereader.c @@ -1,4 +1,4 @@ -#include +#include #include "filereader.h" #include diff --git a/src/common/util/functions.c b/src/common/util/functions.c index b68e2c28a..207f3dfdd 100644 --- a/src/common/util/functions.c +++ b/src/common/util/functions.c @@ -12,7 +12,7 @@ * prior permission by the authors of Eressea. */ -#include +#include #include "functions.h" /* libc includes */ diff --git a/src/common/util/goodies.c b/src/common/util/goodies.c index 82308cf2f..90f2e6359 100644 --- a/src/common/util/goodies.c +++ b/src/common/util/goodies.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "goodies.h" #include "unicode.h" diff --git a/src/common/util/language.c b/src/common/util/language.c index d95cfd595..424fb33b5 100644 --- a/src/common/util/language.c +++ b/src/common/util/language.c @@ -11,7 +11,7 @@ * This program may not be used, modified or distributed without * prior permission by the authors of Eressea. */ -#include +#include #include "language.h" #include "language_struct.h" diff --git a/src/common/util/listbox.c b/src/common/util/listbox.c index 9490068a7..508d5bd3c 100644 --- a/src/common/util/listbox.c +++ b/src/common/util/listbox.c @@ -8,8 +8,8 @@ * */ -/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */ -#include +/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */ +#include #include #include "listbox.h" diff --git a/src/common/util/lists.c b/src/common/util/lists.c index 9bbfcbb4f..296978ed5 100644 --- a/src/common/util/lists.c +++ b/src/common/util/lists.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "lists.h" void diff --git a/src/common/util/log.c b/src/common/util/log.c index 51fdc50ee..7b5b22ff6 100644 --- a/src/common/util/log.c +++ b/src/common/util/log.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "log.h" #include "unicode.h" diff --git a/src/common/util/message.c b/src/common/util/message.c index ae8346465..243b6ba40 100644 --- a/src/common/util/message.c +++ b/src/common/util/message.c @@ -11,7 +11,7 @@ */ -#include +#include #include "message.h" #include "goodies.h" diff --git a/src/common/util/nrmessage.c b/src/common/util/nrmessage.c index ee7056145..5e36d350d 100644 --- a/src/common/util/nrmessage.c +++ b/src/common/util/nrmessage.c @@ -11,7 +11,7 @@ */ -#include +#include #include "nrmessage.h" #include "nrmessage_struct.h" diff --git a/src/common/util/parser.c b/src/common/util/parser.c index 8ccd14143..1dfff3798 100644 --- a/src/common/util/parser.c +++ b/src/common/util/parser.c @@ -1,4 +1,4 @@ -#include +#include #include "parser.h" #include "unicode.h" #include "log.h" diff --git a/src/common/util/patricia.c b/src/common/util/patricia.c index 6208c34d1..4189f146b 100644 --- a/src/common/util/patricia.c +++ b/src/common/util/patricia.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/common/util/rand.c b/src/common/util/rand.c index 868af0738..5330d3e64 100644 --- a/src/common/util/rand.c +++ b/src/common/util/rand.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "rand.h" #include "rng.h" diff --git a/src/common/util/resolve.c b/src/common/util/resolve.c index 6f7a58845..79376501b 100644 --- a/src/common/util/resolve.c +++ b/src/common/util/resolve.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include #include #include "resolve.h" diff --git a/src/common/util/sql.c b/src/common/util/sql.c index 8b66cb113..88c8bed0a 100644 --- a/src/common/util/sql.c +++ b/src/common/util/sql.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "sql.h" #include "log.h" diff --git a/src/common/util/strings.c b/src/common/util/strings.c index 715972c3c..4d5160c23 100644 --- a/src/common/util/strings.c +++ b/src/common/util/strings.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include /* libc includes */ #include diff --git a/src/common/util/translation.c b/src/common/util/translation.c index e14d3e51b..b92246a19 100644 --- a/src/common/util/translation.c +++ b/src/common/util/translation.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "translation.h" #include "log.h" diff --git a/src/common/util/umlaut.c b/src/common/util/umlaut.c index 07a2f11f7..e260660eb 100644 --- a/src/common/util/umlaut.c +++ b/src/common/util/umlaut.c @@ -19,7 +19,7 @@ * permission from the authors. */ -#include +#include #include "umlaut.h" #include "log.h" diff --git a/src/common/util/unicode.c b/src/common/util/unicode.c index 09a91dfc9..adda90870 100644 --- a/src/common/util/unicode.c +++ b/src/common/util/unicode.c @@ -8,7 +8,7 @@ * */ -#include +#include #include "unicode.h" #include diff --git a/src/common/util/xml.c b/src/common/util/xml.c index 05c35b8ba..65b6fbaec 100644 --- a/src/common/util/xml.c +++ b/src/common/util/xml.c @@ -9,7 +9,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ -#include +#include #include "xml.h" /* util includes */ diff --git a/src/eressea.sln b/src/eressea.sln index ba0219565..36d582cb1 100644 --- a/src/eressea.sln +++ b/src/eressea.sln @@ -4,19 +4,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel.vcp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "eressea\editor.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "common\server.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eressea-lua.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" - ProjectSection(ProjectDependencies) = postProject - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} = {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} = {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} - {1E8BFF9E-3044-0742-992F-C5765B80FE65} = {1E8BFF9E-3044-0742-992F-C5765B80FE65} - {D893D6B3-805D-9848-8EA4-CDA1B79151F6} = {D893D6B3-805D-9848-8EA4-CDA1B79151F6} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "eressea\build.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" EndProject Global GlobalSection(SubversionScc) = preSolution @@ -25,40 +21,30 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Profile|Win32 = Profile|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Profile|Win32.ActiveCfg = Profile|Win32 - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Profile|Win32.Build.0 = Profile|Win32 {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.ActiveCfg = Release|Win32 {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.Build.0 = Release|Win32 {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|Win32 - {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Profile|Win32.ActiveCfg = Profile|Win32 - {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Profile|Win32.Build.0 = Profile|Win32 {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.ActiveCfg = Release|Win32 {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.Build.0 = Release|Win32 {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Debug|Win32.ActiveCfg = Debug|Win32 - {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Profile|Win32.ActiveCfg = Profile|Win32 - {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Profile|Win32.Build.0 = Profile|Win32 {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.ActiveCfg = Release|Win32 {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.Build.0 = Release|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.ActiveCfg = Release|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.Build.0 = Release|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32 - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.ActiveCfg = Profile|Win32 - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.Build.0 = Profile|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.Build.0 = Release|Win32 {75501170-51C2-E641-BA8B-EDC008184192}.Debug|Win32.ActiveCfg = Debug|Win32 - {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.ActiveCfg = Profile|Win32 - {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.Build.0 = Profile|Win32 {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.ActiveCfg = Release|Win32 {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.Build.0 = Release|Win32 + {F9AE4586-8F65-486B-9666-744839E40A54}.Debug|Win32.ActiveCfg = Debug|Win32 + {F9AE4586-8F65-486B-9666-744839E40A54}.Release|Win32.ActiveCfg = Release|Win32 + {F9AE4586-8F65-486B-9666-744839E40A54}.Release|Win32.Build.0 = Release|Win32 + {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32 + {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32 + {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/eressea.vcproj b/src/eressea/build.vcproj similarity index 78% rename from src/eressea.vcproj rename to src/eressea/build.vcproj index 4a228ac58..1d11a98ec 100644 --- a/src/eressea.vcproj +++ b/src/eressea/build.vcproj @@ -2,9 +2,9 @@ + + - - - - - - - - - - - - diff --git a/src/eressea/editor.vcproj b/src/eressea/editor.vcproj deleted file mode 100644 index 265aa2cac..000000000 --- a/src/eressea/editor.vcproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj deleted file mode 100644 index cd5369a04..000000000 --- a/src/eressea/eressea-lua.vcproj +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/eressea/server.c b/src/eressea/server.c index 685c060bd..3a1b7e653 100644 --- a/src/eressea/server.c +++ b/src/eressea/server.c @@ -20,11 +20,11 @@ */ /* config includes */ -#include +#include +#include "stdafx.h" #include -#include "console.h" -#include "gmtool.h" +#include /* initialization - TODO: init in separate module */ #include @@ -83,6 +83,7 @@ /* util includes */ #include +#include #include #include #include @@ -101,18 +102,18 @@ #include #include #include -#include "tolua/bindings.h" -#include "tolua/helpers.h" -#include "tolua/bind_attrib.h" -#include "tolua/bind_building.h" -#include "tolua/bind_faction.h" -#include "tolua/bind_gmtool.h" -#include "tolua/bind_hashtable.h" -#include "tolua/bind_message.h" -#include "tolua/bind_region.h" -#include "tolua/bind_ship.h" -#include "tolua/bind_storage.h" -#include "tolua/bind_unit.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // BINDINGS_TOLUA #ifdef BINDINGS_LUABIND diff --git a/src/common/util/dl/malloc.c b/src/external/dlmalloc/malloc.c similarity index 100% rename from src/common/util/dl/malloc.c rename to src/external/dlmalloc/malloc.c diff --git a/src/common/util/dl/malloc.h b/src/external/dlmalloc/malloc.h similarity index 100% rename from src/common/util/dl/malloc.h rename to src/external/dlmalloc/malloc.h diff --git a/src/common/iniparser/iniparser.c b/src/external/iniparser/iniparser.c similarity index 99% rename from src/common/iniparser/iniparser.c rename to src/external/iniparser/iniparser.c index 28d8f73bf..acdbf1797 100644 --- a/src/common/iniparser/iniparser.c +++ b/src/external/iniparser/iniparser.c @@ -28,7 +28,7 @@ */ -#include +#include #include #include #include diff --git a/src/common/iniparser/iniparser.h b/src/external/iniparser/iniparser.h similarity index 100% rename from src/common/iniparser/iniparser.h rename to src/external/iniparser/iniparser.h diff --git a/src/common/util/mt19937ar.c b/src/external/mt19937ar.c similarity index 100% rename from src/common/util/mt19937ar.c rename to src/external/mt19937ar.c diff --git a/src/external/sqlite3.c b/src/external/sqlite3.c index 91422d30e..3eab0e651 100644 --- a/src/external/sqlite3.c +++ b/src/external/sqlite3.c @@ -75,7 +75,7 @@ ** autoconf-based build */ #ifdef _HAVE_SQLITE_CONFIG_H -#include "config.h" +#include "platform.h" #endif /************** Include sqliteLimit.h in the middle of sqliteInt.h ***********/ diff --git a/src/common/config.h b/src/platform.h similarity index 100% rename from src/common/config.h rename to src/platform.h diff --git a/src/stdafx.h b/src/stdafx.h deleted file mode 100644 index 187ac2cc3..000000000 --- a/src/stdafx.h +++ /dev/null @@ -1,21 +0,0 @@ -/* vi: set ts=2: - +-------------------+ Christian Schlittchen - | | Enno Rehling - | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2001 | Henning Peters - | | Ingo Wilken - +-------------------+ Stefan Reich - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. -*/ -#if !defined(AFX_STDAFX_H__FE6139E7_C2CB_11D2_8C39_A27E32099752__INCLUDED_) -#define AFX_STDAFX_H__FE6139E7_C2CB_11D2_8C39_A27E32099752__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif - -#define VC_EXTRALEAN /* Selten verwendete Teile der Windows-Header nicht einbinden */ - -#endif diff --git a/src/vc9/bindings.vcproj b/src/vc9/bindings.vcproj deleted file mode 100644 index 3e1835646..000000000 --- a/src/vc9/bindings.vcproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vc9/codegen.vcproj b/src/vc9/codegen.vcproj deleted file mode 100644 index d08f1b0e4..000000000 --- a/src/vc9/codegen.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vc9/eressea.sln b/src/vc9/eressea.sln deleted file mode 100644 index 3f23321d2..000000000 --- a/src/vc9/eressea.sln +++ /dev/null @@ -1,54 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindings", "bindings.vcproj", "{74B1CBD4-3B6E-E544-9475-33FBB0BCE165}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea-lua.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" - ProjectSection(ProjectDependencies) = postProject - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} = {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} = {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} - {1E8BFF9E-3044-0742-992F-C5765B80FE65} = {1E8BFF9E-3044-0742-992F-C5765B80FE65} - {D893D6B3-805D-9848-8EA4-CDA1B79151F6} = {D893D6B3-805D-9848-8EA4-CDA1B79151F6} - {74B1CBD4-3B6E-E544-9475-33FBB0BCE165} = {74B1CBD4-3B6E-E544-9475-33FBB0BCE165} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32 - {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32 - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.ActiveCfg = Release|Win32 - {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|Win32 - {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.ActiveCfg = Release|Win32 - {74B1CBD4-3B6E-E544-9475-33FBB0BCE165}.Debug|Win32.ActiveCfg = Debug|Win32 - {74B1CBD4-3B6E-E544-9475-33FBB0BCE165}.Release|Win32.ActiveCfg = Release|Win32 - {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Debug|Win32.ActiveCfg = Debug|Win32 - {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.ActiveCfg = Release|Win32 - {75501170-51C2-E641-BA8B-EDC008184192}.Debug|Win32.ActiveCfg = Debug|Win32 - {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.ActiveCfg = Release|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32 - {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(SubversionScc) = preSolution - Svn-Managed = True - Manager = AnkhSVN - Subversion Support for Visual Studio - EndGlobalSection -EndGlobal diff --git a/src/vc9/eressea.vcproj b/src/vc9/eressea.vcproj deleted file mode 100644 index 4e73e7cfe..000000000 --- a/src/vc9/eressea.vcproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vc9/gamecode.vcproj b/src/vc9/gamecode.vcproj deleted file mode 100644 index 85a55b557..000000000 --- a/src/vc9/gamecode.vcproj +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vc9/kernel.vcproj b/src/vc9/kernel.vcproj deleted file mode 100644 index 6698fe5e5..000000000 --- a/src/vc9/kernel.vcproj +++ /dev/null @@ -1,1030 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vc9/util.vcproj b/src/vc9/util.vcproj deleted file mode 100644 index 63e5492c0..000000000 --- a/src/vc9/util.vcproj +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -