From bd94e2c5cbc1d2865d92babf59a532ddf2112fd6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Feb 2010 08:05:27 +0000 Subject: [PATCH] big rename: eressea.c[hc] => config.[hc] --- src/common/attributes/attributes.c | 2 +- src/common/attributes/follow.c | 2 +- src/common/attributes/giveitem.c | 2 +- src/common/attributes/gm.c | 2 +- src/common/attributes/hate.c | 2 +- src/common/attributes/iceberg.c | 2 +- src/common/attributes/key.c | 2 +- src/common/attributes/moved.c | 2 +- src/common/attributes/movement.c | 2 +- src/common/attributes/object.c | 2 +- src/common/attributes/option.c | 2 +- src/common/attributes/orcification.c | 2 +- src/common/attributes/otherfaction.c | 2 +- src/common/attributes/overrideroads.c | 2 +- src/common/attributes/racename.c | 2 +- src/common/attributes/raceprefix.c | 2 +- src/common/attributes/reduceproduction.c | 2 +- src/common/attributes/targetregion.c | 2 +- src/common/attributes/variable.c | 2 +- src/common/bindings/bind_attrib.c | 2 +- src/common/bindings/bind_faction.c | 2 +- src/common/bindings/bind_message.c | 2 +- src/common/bindings/bind_region.c | 2 +- src/common/bindings/bind_unit.c | 2 +- src/common/bindings/bindings.c | 2 +- src/common/bindings/helpers.c | 2 +- src/common/gamecode/archetype.c | 2 +- src/common/gamecode/creation.c | 2 +- src/common/gamecode/creport.c | 2 +- src/common/gamecode/economy.c | 2 +- src/common/gamecode/give.c | 2 +- src/common/gamecode/items.c | 2 +- src/common/gamecode/laws.c | 4 ++-- src/common/gamecode/luck.c | 2 +- src/common/gamecode/market.c | 2 +- src/common/gamecode/monster.c | 2 +- src/common/gamecode/randenc.c | 2 +- src/common/gamecode/report.c | 2 +- src/common/gamecode/spells.c | 2 +- src/common/gamecode/spy.c | 2 +- src/common/gamecode/study.c | 2 +- src/common/gamecode/summary.c | 2 +- src/common/gamecode/xmlreport.c | 2 +- src/common/gmtool.c | 2 +- src/common/items/artrewards.c | 2 +- src/common/items/demonseye.c | 2 +- src/common/items/itemtypes.c | 2 +- src/common/items/phoenixcompass.c | 2 +- src/common/items/seed.c | 4 ++-- src/common/items/speedsail.c | 2 +- src/common/items/weapons.c | 2 +- src/common/items/xerewards.c | 2 +- src/common/kernel.vcproj | 16 ++++++++-------- src/common/kernel/alchemy.c | 2 +- src/common/kernel/alliance.c | 2 +- src/common/kernel/battle.c | 2 +- src/common/kernel/binarystore.c | 2 +- src/common/kernel/build.c | 2 +- src/common/kernel/building.c | 2 +- src/common/kernel/command.c | 2 +- src/common/kernel/{eressea.c => config.c} | 2 +- src/common/kernel/{eressea.h => config.h} | 2 +- src/common/kernel/connection.c | 2 +- src/common/kernel/curse.c | 2 +- src/common/kernel/equipment.c | 2 +- src/common/kernel/faction.c | 2 +- src/common/kernel/group.c | 2 +- src/common/kernel/item.c | 2 +- src/common/kernel/karma.c | 2 +- src/common/kernel/magic.c | 2 +- src/common/kernel/message.c | 4 ++-- src/common/kernel/move.c | 2 +- src/common/kernel/names.c | 2 +- src/common/kernel/order.c | 2 +- src/common/kernel/pathfinder.c | 2 +- src/common/kernel/plane.c | 2 +- src/common/kernel/pool.c | 2 +- src/common/kernel/race.c | 2 +- src/common/kernel/region.c | 2 +- src/common/kernel/reports.c | 2 +- src/common/kernel/resources.c | 2 +- src/common/kernel/save.c | 2 +- src/common/kernel/ship.c | 2 +- src/common/kernel/skill.c | 2 +- src/common/kernel/spell.c | 2 +- src/common/kernel/sqlite.c | 2 +- src/common/kernel/teleport.c | 2 +- src/common/kernel/terrain.c | 2 +- src/common/kernel/textstore.c | 2 +- src/common/kernel/types.h | 2 +- src/common/kernel/unit.c | 2 +- src/common/kernel/xmlreader.c | 2 +- src/common/modules/arena.c | 2 +- src/common/modules/autoseed.c | 2 +- src/common/modules/dungeon.c | 2 +- src/common/modules/gmcmd.c | 2 +- src/common/modules/infocmd.c | 2 +- src/common/modules/museum.c | 2 +- src/common/modules/oceannames.c | 2 +- src/common/modules/score.c | 2 +- src/common/modules/weather.c | 2 +- src/common/modules/wormhole.c | 2 +- src/common/modules/xecmd.c | 2 +- src/common/modules/xmas.c | 2 +- src/common/races/dragons.c | 2 +- src/common/races/illusion.c | 2 +- src/common/races/races.c | 2 +- src/common/races/zombies.c | 2 +- src/common/spells/alp.c | 4 ++-- src/common/spells/buildingcurse.c | 2 +- src/common/spells/combatspells.c | 2 +- src/common/spells/regioncurse.c | 2 +- src/common/spells/shipcurse.c | 2 +- src/common/spells/spells.c | 2 +- src/common/spells/unitcurse.c | 2 +- src/common/triggers/changefaction.c | 2 +- src/common/triggers/changerace.c | 2 +- src/common/triggers/clonedied.c | 2 +- src/common/triggers/createcurse.c | 2 +- src/common/triggers/createunit.c | 2 +- src/common/triggers/gate.c | 2 +- src/common/triggers/giveitem.c | 2 +- src/common/triggers/killunit.c | 2 +- src/common/triggers/removecurse.c | 2 +- src/common/triggers/shock.c | 2 +- src/common/triggers/timeout.c | 2 +- src/common/triggers/triggers.c | 2 +- src/common/triggers/unguard.c | 2 +- src/common/triggers/unitmessage.c | 2 +- 129 files changed, 140 insertions(+), 140 deletions(-) rename src/common/kernel/{eressea.c => config.c} (99%) rename src/common/kernel/{eressea.h => config.h} (99%) diff --git a/src/common/attributes/attributes.c b/src/common/attributes/attributes.c index 6544a3074..8c8c6d5cc 100644 --- a/src/common/attributes/attributes.c +++ b/src/common/attributes/attributes.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "attributes.h" /* attributes includes */ diff --git a/src/common/attributes/follow.c b/src/common/attributes/follow.c index 5b56c6e68..b6db8be7c 100644 --- a/src/common/attributes/follow.c +++ b/src/common/attributes/follow.c @@ -15,7 +15,7 @@ #include #include "follow.h" -#include +#include #include #include diff --git a/src/common/attributes/giveitem.c b/src/common/attributes/giveitem.c index b8dfe2950..0538bd53d 100644 --- a/src/common/attributes/giveitem.c +++ b/src/common/attributes/giveitem.c @@ -14,7 +14,7 @@ #include #include "giveitem.h" -#include +#include /* kernel includes */ #include diff --git a/src/common/attributes/gm.c b/src/common/attributes/gm.c index 4c0f8b86b..67c60b9d2 100644 --- a/src/common/attributes/gm.c +++ b/src/common/attributes/gm.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "gm.h" /* kernel includes */ diff --git a/src/common/attributes/hate.c b/src/common/attributes/hate.c index 3eed4331b..cb0cf2f0b 100644 --- a/src/common/attributes/hate.c +++ b/src/common/attributes/hate.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "hate.h" #include diff --git a/src/common/attributes/iceberg.c b/src/common/attributes/iceberg.c index d0e3b5588..a3c5edf49 100644 --- a/src/common/attributes/iceberg.c +++ b/src/common/attributes/iceberg.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "iceberg.h" #include diff --git a/src/common/attributes/key.c b/src/common/attributes/key.c index 8bd1b1b2c..ac5f7edd8 100644 --- a/src/common/attributes/key.c +++ b/src/common/attributes/key.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "key.h" #include diff --git a/src/common/attributes/moved.c b/src/common/attributes/moved.c index 90454c607..73a43e7bf 100644 --- a/src/common/attributes/moved.c +++ b/src/common/attributes/moved.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "moved.h" #include diff --git a/src/common/attributes/movement.c b/src/common/attributes/movement.c index f809b8431..ecafc54dc 100644 --- a/src/common/attributes/movement.c +++ b/src/common/attributes/movement.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "movement.h" #include diff --git a/src/common/attributes/object.c b/src/common/attributes/object.c index 9cf099b01..e15b29b77 100644 --- a/src/common/attributes/object.c +++ b/src/common/attributes/object.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "object.h" /* kernel includes */ diff --git a/src/common/attributes/option.c b/src/common/attributes/option.c index 90aeeef58..8fda51e8a 100644 --- a/src/common/attributes/option.c +++ b/src/common/attributes/option.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "option.h" #include diff --git a/src/common/attributes/orcification.c b/src/common/attributes/orcification.c index 0130b7655..70da3a34c 100644 --- a/src/common/attributes/orcification.c +++ b/src/common/attributes/orcification.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "orcification.h" #include diff --git a/src/common/attributes/otherfaction.c b/src/common/attributes/otherfaction.c index bf1694324..294ee3404 100644 --- a/src/common/attributes/otherfaction.c +++ b/src/common/attributes/otherfaction.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "otherfaction.h" #include diff --git a/src/common/attributes/overrideroads.c b/src/common/attributes/overrideroads.c index 30534c848..cc462d937 100644 --- a/src/common/attributes/overrideroads.c +++ b/src/common/attributes/overrideroads.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "overrideroads.h" #include diff --git a/src/common/attributes/racename.c b/src/common/attributes/racename.c index 2680c0488..f4232e532 100644 --- a/src/common/attributes/racename.c +++ b/src/common/attributes/racename.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "racename.h" #include diff --git a/src/common/attributes/raceprefix.c b/src/common/attributes/raceprefix.c index 2dd24d88b..6d3b27deb 100644 --- a/src/common/attributes/raceprefix.c +++ b/src/common/attributes/raceprefix.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "raceprefix.h" #include diff --git a/src/common/attributes/reduceproduction.c b/src/common/attributes/reduceproduction.c index 9e1852494..e4c14ee91 100644 --- a/src/common/attributes/reduceproduction.c +++ b/src/common/attributes/reduceproduction.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "reduceproduction.h" #include #include diff --git a/src/common/attributes/targetregion.c b/src/common/attributes/targetregion.c index 4ae8d65d5..88bdea6e3 100644 --- a/src/common/attributes/targetregion.c +++ b/src/common/attributes/targetregion.c @@ -15,7 +15,7 @@ #include #include "targetregion.h" -#include +#include #include #include #include diff --git a/src/common/attributes/variable.c b/src/common/attributes/variable.c index 5563e403d..9483c2ce5 100644 --- a/src/common/attributes/variable.c +++ b/src/common/attributes/variable.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "variable.h" #include diff --git a/src/common/bindings/bind_attrib.c b/src/common/bindings/bind_attrib.c index 038563dd9..e14406763 100644 --- a/src/common/bindings/bind_attrib.c +++ b/src/common/bindings/bind_attrib.c @@ -12,7 +12,7 @@ without prior permission by the authors of Eressea. #include #include "bind_attrib.h" -#include +#include #include #include diff --git a/src/common/bindings/bind_faction.c b/src/common/bindings/bind_faction.c index 6870eaea6..821ce76c1 100644 --- a/src/common/bindings/bind_faction.c +++ b/src/common/bindings/bind_faction.c @@ -16,7 +16,7 @@ without prior permission by the authors of Eressea. #include "bindings.h" #include -#include +#include #include #include #include diff --git a/src/common/bindings/bind_message.c b/src/common/bindings/bind_message.c index 93577ad99..1ea31ebdf 100644 --- a/src/common/bindings/bind_message.c +++ b/src/common/bindings/bind_message.c @@ -1,5 +1,5 @@ #include -#include +#include // kernel includes #include diff --git a/src/common/bindings/bind_region.c b/src/common/bindings/bind_region.c index 97ac77d14..c2ee6bc03 100644 --- a/src/common/bindings/bind_region.c +++ b/src/common/bindings/bind_region.c @@ -16,7 +16,7 @@ without prior permission by the authors of Eressea. #include "bind_ship.h" #include "bind_building.h" -#include +#include #include #include #include diff --git a/src/common/bindings/bind_unit.c b/src/common/bindings/bind_unit.c index 37344a080..db36757d9 100644 --- a/src/common/bindings/bind_unit.c +++ b/src/common/bindings/bind_unit.c @@ -22,7 +22,7 @@ without prior permission by the authors of Eressea. // kernel includes #include -#include +#include #include #include #include diff --git a/src/common/bindings/bindings.c b/src/common/bindings/bindings.c index 54cf59cc3..ef75534fa 100644 --- a/src/common/bindings/bindings.c +++ b/src/common/bindings/bindings.c @@ -17,7 +17,7 @@ without prior permission by the authors of Eressea. #include "bind_region.h" #include "helpers.h" -#include +#include #include #include diff --git a/src/common/bindings/helpers.c b/src/common/bindings/helpers.c index 37a85c2e1..1445c850d 100644 --- a/src/common/bindings/helpers.c +++ b/src/common/bindings/helpers.c @@ -17,7 +17,7 @@ without prior permission by the authors of Eressea. #include #include -#include +#include #include #include #include diff --git a/src/common/gamecode/archetype.c b/src/common/gamecode/archetype.c index af369af9a..8f82e7d31 100644 --- a/src/common/gamecode/archetype.c +++ b/src/common/gamecode/archetype.c @@ -1,5 +1,5 @@ #include -#include +#include #include "archetype.h" /* kernel includes */ diff --git a/src/common/gamecode/creation.c b/src/common/gamecode/creation.c index 9ca399b7d..7a4a0779d 100644 --- a/src/common/gamecode/creation.c +++ b/src/common/gamecode/creation.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "creation.h" #include "monster.h" diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index 7e133d568..0d0eceeb5 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -8,7 +8,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "creport.h" /* tweakable features */ diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 86f60f24b..7a0e05220 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -22,7 +22,7 @@ #pragma region includes #include -#include +#include #include "economy.h" /* gamecode includes */ diff --git a/src/common/gamecode/give.c b/src/common/gamecode/give.c index 87c47845b..46c035255 100644 --- a/src/common/gamecode/give.c +++ b/src/common/gamecode/give.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "give.h" #include "economy.h" diff --git a/src/common/gamecode/items.c b/src/common/gamecode/items.c index 59ac49eb1..0a6d00a65 100644 --- a/src/common/gamecode/items.c +++ b/src/common/gamecode/items.c @@ -1,5 +1,5 @@ #include -#include +#include #include "items.h" #include "study.h" diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 828c0757a..9b972e91e 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -22,7 +22,7 @@ #pragma region includes #include -#include +#include #include "laws.h" #include @@ -2705,7 +2705,7 @@ sinkships(region * r) } /* The following functions do not really belong here: */ -#include +#include #include static attrib_type at_number = { diff --git a/src/common/gamecode/luck.c b/src/common/gamecode/luck.c index eb2affab1..e15ab2a96 100644 --- a/src/common/gamecode/luck.c +++ b/src/common/gamecode/luck.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "luck.h" diff --git a/src/common/gamecode/market.c b/src/common/gamecode/market.c index 6668606f8..8393e75e1 100644 --- a/src/common/gamecode/market.c +++ b/src/common/gamecode/market.c @@ -11,7 +11,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "market.h" #include diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c index d014807ac..a4df9806a 100644 --- a/src/common/gamecode/monster.c +++ b/src/common/gamecode/monster.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "monster.h" /* gamecode includes */ diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index a09344bd6..4932c5554 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "randenc.h" #include "economy.h" diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 69150c927..8e6223925 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -15,7 +15,7 @@ #define ECHECK_VERSION "4.01" #include -#include +#include /* modules includes */ #include diff --git a/src/common/gamecode/spells.c b/src/common/gamecode/spells.c index 3d283d65f..7bcadb8ff 100644 --- a/src/common/gamecode/spells.c +++ b/src/common/gamecode/spells.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "spy.h" #include diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c index 0891ebd12..8fd36d1f8 100644 --- a/src/common/gamecode/spy.c +++ b/src/common/gamecode/spy.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "spy.h" /* kernel includes */ diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c index 8213c5e04..57465137b 100644 --- a/src/common/gamecode/study.c +++ b/src/common/gamecode/study.c @@ -23,7 +23,7 @@ #define TEACH_FRIENDS #include -#include +#include #include "study.h" #include diff --git a/src/common/gamecode/summary.c b/src/common/gamecode/summary.c index 1542a77f2..dce53337e 100644 --- a/src/common/gamecode/summary.c +++ b/src/common/gamecode/summary.c @@ -10,7 +10,7 @@ /* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */ #include -#include +#include #include "summary.h" diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c index a4333601e..0fb8c0e3d 100644 --- a/src/common/gamecode/xmlreport.c +++ b/src/common/gamecode/xmlreport.c @@ -8,7 +8,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "xmlreport.h" #define XML_ATL_NAMESPACE (const xmlChar *) "http://www.eressea.de/XML/2008/atlantis" diff --git a/src/common/gmtool.c b/src/common/gmtool.c index 4d718b307..dc9cfe2fb 100644 --- a/src/common/gmtool.c +++ b/src/common/gmtool.c @@ -11,7 +11,7 @@ /* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */ #include #include -#include +#include #include "gmtool.h" #include "gmtool_structs.h" diff --git a/src/common/items/artrewards.c b/src/common/items/artrewards.c index 37d32c490..43064aa5d 100644 --- a/src/common/items/artrewards.c +++ b/src/common/items/artrewards.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "artrewards.h" /* kernel includes */ diff --git a/src/common/items/demonseye.c b/src/common/items/demonseye.c index 7cca80ba9..fec6e68b8 100644 --- a/src/common/items/demonseye.c +++ b/src/common/items/demonseye.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "demonseye.h" /* kernel includes */ diff --git a/src/common/items/itemtypes.c b/src/common/items/itemtypes.c index 8239ccd5f..af0efe305 100644 --- a/src/common/items/itemtypes.c +++ b/src/common/items/itemtypes.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "itemtypes.h" #include "xerewards.h" diff --git a/src/common/items/phoenixcompass.c b/src/common/items/phoenixcompass.c index 5cdaf6a91..76431806e 100644 --- a/src/common/items/phoenixcompass.c +++ b/src/common/items/phoenixcompass.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "phoenixcompass.h" /* kernel includes */ diff --git a/src/common/items/seed.c b/src/common/items/seed.c index 3ca40ca74..3ad84e0c7 100644 --- a/src/common/items/seed.c +++ b/src/common/items/seed.c @@ -11,13 +11,13 @@ */ #include -#include +#include #include "seed.h" /* kernel includes */ #include -#include +#include #include #include diff --git a/src/common/items/speedsail.c b/src/common/items/speedsail.c index c62d0e2cf..f44b3beb2 100644 --- a/src/common/items/speedsail.c +++ b/src/common/items/speedsail.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "speedsail.h" /* kernel includes */ diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c index 57ea38654..95ef16a7e 100644 --- a/src/common/items/weapons.c +++ b/src/common/items/weapons.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "weapons.h" #include diff --git a/src/common/items/xerewards.c b/src/common/items/xerewards.c index 7719d7394..b59538272 100644 --- a/src/common/items/xerewards.c +++ b/src/common/items/xerewards.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "xerewards.h" /* kernel includes */ diff --git a/src/common/kernel.vcproj b/src/common/kernel.vcproj index 46d28d9f5..007ecd275 100644 --- a/src/common/kernel.vcproj +++ b/src/common/kernel.vcproj @@ -221,6 +221,14 @@ RelativePath=".\kernel\command.h" > + + + + @@ -245,14 +253,6 @@ RelativePath=".\kernel\equipment.h" > - - - - diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c index c7a164bd8..e8085ff6e 100644 --- a/src/common/kernel/alchemy.c +++ b/src/common/kernel/alchemy.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "alchemy.h" #include "item.h" diff --git a/src/common/kernel/alliance.c b/src/common/kernel/alliance.c index de2694381..e9c05c9ad 100644 --- a/src/common/kernel/alliance.c +++ b/src/common/kernel/alliance.c @@ -13,7 +13,7 @@ without prior permission by the authors of Eressea. #pragma region includes #include -#include +#include #include "alliance.h" #include diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 2a5a877f7..0f7644eaa 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -15,7 +15,7 @@ #pragma region includes #include -#include +#include #include "battle.h" #include "alchemy.h" diff --git a/src/common/kernel/binarystore.c b/src/common/kernel/binarystore.c index 4f9f0a2d7..c0c8a5f61 100644 --- a/src/common/kernel/binarystore.c +++ b/src/common/kernel/binarystore.c @@ -7,7 +7,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ #include -#include "eressea.h" +#include "config.h" #include "textstore.h" #include "save.h" diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index f103e1e06..0f0a1129a 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "build.h" /* kernel includes */ diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c index f19b3ec06..818a56340 100644 --- a/src/common/kernel/building.c +++ b/src/common/kernel/building.c @@ -14,7 +14,7 @@ #include -#include +#include #include "building.h" /* kernel includes */ diff --git a/src/common/kernel/command.c b/src/common/kernel/command.c index 31d35e812..93741e4c2 100644 --- a/src/common/kernel/command.c +++ b/src/common/kernel/command.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "command.h" #include diff --git a/src/common/kernel/eressea.c b/src/common/kernel/config.c similarity index 99% rename from src/common/kernel/eressea.c rename to src/common/kernel/config.c index cfebc9ce4..f57d211ce 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/config.c @@ -19,7 +19,7 @@ */ #include -#include +#include /* attributes includes */ #include diff --git a/src/common/kernel/eressea.h b/src/common/kernel/config.h similarity index 99% rename from src/common/kernel/eressea.h rename to src/common/kernel/config.h index 5160f1611..b40f11868 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/config.h @@ -89,7 +89,7 @@ extern "C" { #define STAMINA_AFFECTS_HP 1<<0 /** - * Hier endet der Teil von eressea.h, der die defines für die + * Hier endet der Teil von config.h, der die defines für die * Spielwelt Eressea enthält, und beginnen die allgemeinen Routinen */ diff --git a/src/common/kernel/connection.c b/src/common/kernel/connection.c index 2902566eb..0e7633887 100644 --- a/src/common/kernel/connection.c +++ b/src/common/kernel/connection.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "connection.h" #include "region.h" diff --git a/src/common/kernel/curse.c b/src/common/kernel/curse.c index 1c9c22ec2..80eef1fc8 100644 --- a/src/common/kernel/curse.c +++ b/src/common/kernel/curse.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "curse.h" /* kernel includes */ diff --git a/src/common/kernel/equipment.c b/src/common/kernel/equipment.c index c03b20ef2..8b64d4669 100644 --- a/src/common/kernel/equipment.c +++ b/src/common/kernel/equipment.c @@ -18,7 +18,7 @@ * permission from the authors. */ #include -#include +#include #include "equipment.h" /* kernel includes */ diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c index b9559ebe6..afd974517 100644 --- a/src/common/kernel/faction.c +++ b/src/common/kernel/faction.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "faction.h" #include "equipment.h" diff --git a/src/common/kernel/group.c b/src/common/kernel/group.c index 16efd1b99..1e58f3fff 100644 --- a/src/common/kernel/group.c +++ b/src/common/kernel/group.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "group.h" /* kernel includes */ diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index f6da5d8cd..ba69a3ea1 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "item.h" #include diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c index f3c853bcb..348bfc10b 100644 --- a/src/common/kernel/karma.c +++ b/src/common/kernel/karma.c @@ -13,7 +13,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 ea987f642..3480b1e15 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "magic.h" #include "building.h" diff --git a/src/common/kernel/message.c b/src/common/kernel/message.c index 65f796d69..d80549dd0 100644 --- a/src/common/kernel/message.c +++ b/src/common/kernel/message.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "message.h" /* kernel includes */ @@ -57,7 +57,7 @@ typedef struct msg_setting { /************ Compatibility function *************/ #define MAXSTRLEN (4*DISPLAYSIZE+3) #include "region.h" -#include +#include static void arg_set(variant args[], const message_type * mtype, const char * buffer, variant v) diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c index d80f1b993..d20719bae 100644 --- a/src/common/kernel/move.c +++ b/src/common/kernel/move.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "move.h" #include "alchemy.h" diff --git a/src/common/kernel/names.c b/src/common/kernel/names.c index 8e3315eab..c5d302216 100644 --- a/src/common/kernel/names.c +++ b/src/common/kernel/names.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "names.h" /* kernel includes */ diff --git a/src/common/kernel/order.c b/src/common/kernel/order.c index 4397adb58..690cd0181 100644 --- a/src/common/kernel/order.c +++ b/src/common/kernel/order.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "order.h" #include "skill.h" diff --git a/src/common/kernel/pathfinder.c b/src/common/kernel/pathfinder.c index a46c9361a..99203dd93 100644 --- a/src/common/kernel/pathfinder.c +++ b/src/common/kernel/pathfinder.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "pathfinder.h" #include "region.h" diff --git a/src/common/kernel/plane.c b/src/common/kernel/plane.c index 47c95bb6a..79f0f25ac 100644 --- a/src/common/kernel/plane.c +++ b/src/common/kernel/plane.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "plane.h" /* kernel includes */ diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index af19509ca..5dcb20589 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "pool.h" #include "faction.h" diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c index 01403ec0b..4c41140ff 100644 --- a/src/common/kernel/race.c +++ b/src/common/kernel/race.c @@ -18,7 +18,7 @@ * permission from the authors. */ #include -#include +#include #include "race.h" #include diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index cef89c256..3e86a163a 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "region.h" /* kernel includes */ diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c index f3b6167d8..fb022763f 100644 --- a/src/common/kernel/reports.c +++ b/src/common/kernel/reports.c @@ -18,7 +18,7 @@ * permission from the authors. */ #include -#include +#include #include "reports.h" /* kernel includes */ diff --git a/src/common/kernel/resources.c b/src/common/kernel/resources.c index 642f1a9e1..999ff1671 100644 --- a/src/common/kernel/resources.c +++ b/src/common/kernel/resources.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "resources.h" /* kernel includes */ diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index e0d560852..a84239593 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -19,7 +19,7 @@ */ #include -#include +#include #include "save.h" #include "alchemy.h" diff --git a/src/common/kernel/ship.c b/src/common/kernel/ship.c index ded216245..4aa10babe 100644 --- a/src/common/kernel/ship.c +++ b/src/common/kernel/ship.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "ship.h" /* kernel includes */ diff --git a/src/common/kernel/skill.c b/src/common/kernel/skill.c index 7380d61a0..77674927e 100644 --- a/src/common/kernel/skill.c +++ b/src/common/kernel/skill.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "skill.h" #include "curse.h" diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index 53451f75a..a6befd02e 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "spell.h" /* kernel includes */ diff --git a/src/common/kernel/sqlite.c b/src/common/kernel/sqlite.c index 3ac5e7a17..eba6f3b3e 100644 --- a/src/common/kernel/sqlite.c +++ b/src/common/kernel/sqlite.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/common/kernel/teleport.c b/src/common/kernel/teleport.c index e4ac1f3b5..e308741de 100644 --- a/src/common/kernel/teleport.c +++ b/src/common/kernel/teleport.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "teleport.h" /* kernel includes */ diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c index 3a453e9f6..3e902150a 100644 --- a/src/common/kernel/terrain.c +++ b/src/common/kernel/terrain.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include "terrain.h" #include "terrainid.h" diff --git a/src/common/kernel/textstore.c b/src/common/kernel/textstore.c index a54174f81..391038f0f 100644 --- a/src/common/kernel/textstore.c +++ b/src/common/kernel/textstore.c @@ -7,7 +7,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ #include -#include "eressea.h" +#include "config.h" #include "textstore.h" #include "save.h" diff --git a/src/common/kernel/types.h b/src/common/kernel/types.h index d19d23897..c9509efb1 100644 --- a/src/common/kernel/types.h +++ b/src/common/kernel/types.h @@ -24,7 +24,7 @@ /* * Features enabled: * If you are lacking the settings.h, create a new file common/settings.h, - * and write #include (or whatever settings you want + * 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 platform.h). diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c index 133965f82..ec9ad6c6b 100644 --- a/src/common/kernel/unit.c +++ b/src/common/kernel/unit.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include "unit.h" #include "building.h" diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 5db22dac0..08fa32843 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -11,7 +11,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "xmlreader.h" /* kernel includes */ diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c index 2b804cc97..69f0d3cf5 100644 --- a/src/common/modules/arena.c +++ b/src/common/modules/arena.c @@ -13,7 +13,7 @@ */ #include -#include +#include #if ARENA_MODULE #include "arena.h" diff --git a/src/common/modules/autoseed.c b/src/common/modules/autoseed.c index 57293aaca..ddae43de3 100644 --- a/src/common/modules/autoseed.c +++ b/src/common/modules/autoseed.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "autoseed.h" /* kernel includes */ diff --git a/src/common/modules/dungeon.c b/src/common/modules/dungeon.c index 8c2e29756..a8275bbda 100644 --- a/src/common/modules/dungeon.c +++ b/src/common/modules/dungeon.c @@ -11,7 +11,7 @@ */ #include -#include +#include #if DUNGEON_MODULE #include "dungeon.h" diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c index b54380caf..04a18e92e 100644 --- a/src/common/modules/gmcmd.c +++ b/src/common/modules/gmcmd.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "gmcmd.h" #include diff --git a/src/common/modules/infocmd.c b/src/common/modules/infocmd.c index a7fee4876..7c33b450d 100644 --- a/src/common/modules/infocmd.c +++ b/src/common/modules/infocmd.c @@ -11,7 +11,7 @@ */ #include -#include +#include #if INFOCMD_MODULE #include "infocmd.h" diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c index c0dbe0f4e..de9ba9608 100644 --- a/src/common/modules/museum.c +++ b/src/common/modules/museum.c @@ -20,7 +20,7 @@ #include -#include +#include #if MUSEUM_MODULE #include "museum.h" diff --git a/src/common/modules/oceannames.c b/src/common/modules/oceannames.c index 98b65cce7..0a5210a6a 100644 --- a/src/common/modules/oceannames.c +++ b/src/common/modules/oceannames.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "oceannames.h" /* kernel includes */ diff --git a/src/common/modules/score.c b/src/common/modules/score.c index fcfe8e57f..985bfa392 100644 --- a/src/common/modules/score.c +++ b/src/common/modules/score.c @@ -20,7 +20,7 @@ */ #include -#include +#include #if SCORE_MODULE #include "score.h" diff --git a/src/common/modules/weather.c b/src/common/modules/weather.c index 3dccc622a..0a7b86350 100644 --- a/src/common/modules/weather.c +++ b/src/common/modules/weather.c @@ -26,7 +26,7 @@ #ifdef WEATHER #include -#include +#include #include "weather.h" /* libc includes */ diff --git a/src/common/modules/wormhole.c b/src/common/modules/wormhole.c index 7c9febeb0..4071743f9 100644 --- a/src/common/modules/wormhole.c +++ b/src/common/modules/wormhole.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "settings.h" #include "wormhole.h" diff --git a/src/common/modules/xecmd.c b/src/common/modules/xecmd.c index 908b26654..b181766b2 100644 --- a/src/common/modules/xecmd.c +++ b/src/common/modules/xecmd.c @@ -11,7 +11,7 @@ */ #include -#include +#include #if XECMD_MODULE #include "xecmd.h" diff --git a/src/common/modules/xmas.c b/src/common/modules/xmas.c index d5f3d9589..74a80fa26 100644 --- a/src/common/modules/xmas.c +++ b/src/common/modules/xmas.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "xmas.h" /* kernel includes */ diff --git a/src/common/races/dragons.c b/src/common/races/dragons.c index e19a4e1e5..795967c47 100644 --- a/src/common/races/dragons.c +++ b/src/common/races/dragons.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "dragons.h" /* kernel includes */ diff --git a/src/common/races/illusion.c b/src/common/races/illusion.c index 2621441ba..f1c9a9d4a 100644 --- a/src/common/races/illusion.c +++ b/src/common/races/illusion.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "illusion.h" /* kernel includes */ diff --git a/src/common/races/races.c b/src/common/races/races.c index b0a8cb72f..03e2d3407 100644 --- a/src/common/races/races.c +++ b/src/common/races/races.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include "races.h" #include "zombies.h" diff --git a/src/common/races/zombies.c b/src/common/races/zombies.c index 4a32d6204..a01d970e5 100644 --- a/src/common/races/zombies.c +++ b/src/common/races/zombies.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "zombies.h" /* kernel includes */ diff --git a/src/common/spells/alp.c b/src/common/spells/alp.c index b6a618987..7f1617095 100644 --- a/src/common/spells/alp.c +++ b/src/common/spells/alp.c @@ -12,10 +12,10 @@ */ #include -#include +#include #include "alp.h" -#include +#include #include #include #include diff --git a/src/common/spells/buildingcurse.c b/src/common/spells/buildingcurse.c index 802f68136..22e6871d0 100644 --- a/src/common/spells/buildingcurse.c +++ b/src/common/spells/buildingcurse.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "buildingcurse.h" /* kernel includes */ diff --git a/src/common/spells/combatspells.c b/src/common/spells/combatspells.c index 0a77e3045..d7fdcbf54 100644 --- a/src/common/spells/combatspells.c +++ b/src/common/spells/combatspells.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "combatspells.h" /* kernel includes */ diff --git a/src/common/spells/regioncurse.c b/src/common/spells/regioncurse.c index b02af0181..93d082580 100644 --- a/src/common/spells/regioncurse.c +++ b/src/common/spells/regioncurse.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "regioncurse.h" /* kernel includes */ diff --git a/src/common/spells/shipcurse.c b/src/common/spells/shipcurse.c index 8a0c46b1d..577abc53a 100644 --- a/src/common/spells/shipcurse.c +++ b/src/common/spells/shipcurse.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "shipcurse.h" /* kernel includes */ diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c index 454b34a3c..7b6a40c1c 100644 --- a/src/common/spells/spells.c +++ b/src/common/spells/spells.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "spells.h" #include "buildingcurse.h" diff --git a/src/common/spells/unitcurse.c b/src/common/spells/unitcurse.c index 2d6e4d085..190116205 100644 --- a/src/common/spells/unitcurse.c +++ b/src/common/spells/unitcurse.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include "unitcurse.h" /* kernel includes */ diff --git a/src/common/triggers/changefaction.c b/src/common/triggers/changefaction.c index 249e4683b..bb13996af 100644 --- a/src/common/triggers/changefaction.c +++ b/src/common/triggers/changefaction.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "changefaction.h" /* kernel includes */ diff --git a/src/common/triggers/changerace.c b/src/common/triggers/changerace.c index f6ca84622..f91fb5288 100644 --- a/src/common/triggers/changerace.c +++ b/src/common/triggers/changerace.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "changerace.h" /* kernel includes */ diff --git a/src/common/triggers/clonedied.c b/src/common/triggers/clonedied.c index 806399831..c593918f7 100644 --- a/src/common/triggers/clonedied.c +++ b/src/common/triggers/clonedied.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "clonedied.h" /* kernel includes */ diff --git a/src/common/triggers/createcurse.c b/src/common/triggers/createcurse.c index 0ff1d27c8..30a9be16e 100644 --- a/src/common/triggers/createcurse.c +++ b/src/common/triggers/createcurse.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "createcurse.h" /* kernel includes */ diff --git a/src/common/triggers/createunit.c b/src/common/triggers/createunit.c index a0cc7dc8f..9697d0ceb 100644 --- a/src/common/triggers/createunit.c +++ b/src/common/triggers/createunit.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "createunit.h" /* kernel includes */ diff --git a/src/common/triggers/gate.c b/src/common/triggers/gate.c index 3ca29c6ca..ef1344495 100644 --- a/src/common/triggers/gate.c +++ b/src/common/triggers/gate.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "gate.h" /* kernel includes */ diff --git a/src/common/triggers/giveitem.c b/src/common/triggers/giveitem.c index 92d835d4e..0a98283a5 100644 --- a/src/common/triggers/giveitem.c +++ b/src/common/triggers/giveitem.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "giveitem.h" /* kernel includes */ diff --git a/src/common/triggers/killunit.c b/src/common/triggers/killunit.c index adc19c7bb..5a80ea540 100644 --- a/src/common/triggers/killunit.c +++ b/src/common/triggers/killunit.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "killunit.h" #include diff --git a/src/common/triggers/removecurse.c b/src/common/triggers/removecurse.c index 152be6ff4..98dcc2d1a 100644 --- a/src/common/triggers/removecurse.c +++ b/src/common/triggers/removecurse.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "removecurse.h" /* kernel includes */ diff --git a/src/common/triggers/shock.c b/src/common/triggers/shock.c index fb349c5f7..4d3c13b2c 100644 --- a/src/common/triggers/shock.c +++ b/src/common/triggers/shock.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "shock.h" /* kernel includes */ diff --git a/src/common/triggers/timeout.c b/src/common/triggers/timeout.c index 8e421575b..b2fba8ef2 100644 --- a/src/common/triggers/timeout.c +++ b/src/common/triggers/timeout.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "timeout.h" /* util includes */ diff --git a/src/common/triggers/triggers.c b/src/common/triggers/triggers.c index 9154e1912..236b1fde6 100644 --- a/src/common/triggers/triggers.c +++ b/src/common/triggers/triggers.c @@ -18,7 +18,7 @@ */ #include -#include +#include /* triggers includes */ #include diff --git a/src/common/triggers/unguard.c b/src/common/triggers/unguard.c index dbda41cce..1c4cb42ea 100644 --- a/src/common/triggers/unguard.c +++ b/src/common/triggers/unguard.c @@ -10,7 +10,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "unguard.h" /* kernel includes */ diff --git a/src/common/triggers/unitmessage.c b/src/common/triggers/unitmessage.c index 9974f381d..f1d7d7dbf 100644 --- a/src/common/triggers/unitmessage.c +++ b/src/common/triggers/unitmessage.c @@ -8,7 +8,7 @@ without prior permission by the authors of Eressea. */ #include -#include +#include #include "unitmessage.h" /* kernel includes */