move gamedata.c to kernel

src/alchemy.c

@@ -34,7 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/macros.h>

src/attributes/attributes.c

@@ -55,7 +55,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>
 

src/attributes/dict.c

@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 #include <util/strings.h>
 

src/attributes/follow.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/variant.h>
 
 #include <storage.h>

src/attributes/hate.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>
 

src/attributes/key.c

@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "key.h"
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <storage.h>
 

src/attributes/movement.c

@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "movement.h"
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 
 #include <storage.h>

src/attributes/otherfaction.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/unit.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 #include <assert.h>

src/attributes/seenspell.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 

src/attributes/targetregion.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/region.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 
 #include <storage.h>

src/bind_storage.c

@@ -6,7 +6,7 @@
 
 #include <kernel/save.h>
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 

src/helpers.c

@@ -22,7 +22,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/attrib.h>
 #include <kernel/event.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/parser.h>

src/kernel/CMakeLists.txt

@@ -25,6 +25,7 @@ database.test.c
 equipment.test.c
 # event.test.c
 faction.test.c
+gamedata.test.c
 group.test.c
 item.test.c
 messages.test.c
@@ -60,6 +61,7 @@ curse.c
 equipment.c
 event.c
 faction.c
+gamedata.c
 group.c
 item.c
 messages.c

src/kernel/ally.c

@@ -12,7 +12,7 @@
 
 #include <kernel/attrib.h>
 #include <util/strings.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 

src/kernel/attrib.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/log.h>
 #include <util/strings.h>
 #include <util/variant.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <storage.h>
 #include <critbit.h>

src/kernel/attrib.test.c

@@ -1,7 +1,7 @@
 #include <platform.h>
 #include "attrib.h"
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 
 #include <storage.h>

src/kernel/building.c

@@ -42,7 +42,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/base36.h>
 #include <kernel/event.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/resolve.h>

src/kernel/connection.c

@@ -28,7 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>

src/kernel/curse.c

@@ -36,7 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/log.h>

src/kernel/curse.test.c

@@ -6,7 +6,7 @@
 #include <kernel/unit.h>
 #include <kernel/attrib.h>
 #include <util/rng.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/message.h>
 #include <binarystore.h>
 #include <filestream.h>

src/kernel/event.c

@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "attrib.h"
 
 /* util includes */
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/strings.h>
 

src/kernel/faction.c

@@ -45,7 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/lists.h>
 #include <util/language.h>

src/kernel/gamedata.c

@@ -1,7 +1,8 @@
 #include <platform.h>
 
 #include "gamedata.h"
-#include "log.h"
+
+#include <util/log.h>
 
 #include <storage.h>
 #include <filestream.h>

src/kernel/group.c

@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/resolve.h>
 #include <util/strings.h>
 #include <util/unicode.h>

src/kernel/group.test.c

@@ -8,7 +8,7 @@
 #include "region.h"
 #include "save.h"
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <kernel/attrib.h>
 #include <attributes/key.h>
 

src/kernel/region.c

@@ -43,7 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <util/assert.h>
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/lists.h>
 #include <util/log.h>

src/kernel/save.c

@@ -61,9 +61,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/base36.h>
 #include <kernel/event.h>
 #include <util/filereader.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>

src/kernel/save.test.c

@@ -20,7 +20,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/password.h>
 #include <util/path.h>
 #include <util/strings.h>

src/kernel/spellbook.c

@@ -4,7 +4,7 @@
 #include <kernel/spell.h>
 
 #include <util/log.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 
 #include "spellbook.h"

src/kernel/unit.c

@@ -53,7 +53,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/language.h>
 #include <util/lists.h>

src/magic.c

@@ -65,7 +65,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>

src/modules/gmcmd.c

@@ -33,7 +33,7 @@
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/macros.h>
 
 #include <storage.h>

src/modules/museum.c

@@ -41,7 +41,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/functions.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/strings.h>
 #include <util/language.h>
 #include <util/macros.h>

src/modules/xmas.c

@@ -28,7 +28,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/goodies.h>
 #include <util/resolve.h>
 

src/move.c

@@ -74,7 +74,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/assert.h>
 #include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>

src/spells.c

@@ -73,7 +73,7 @@
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/message.h>

src/spells/borders.c

@@ -14,7 +14,7 @@
 #include <kernel/unit.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/rand.h>

src/spells/flyingship.c

@@ -11,7 +11,7 @@
 #include <kernel/unit.h>
 #include <kernel/ship.h>
 
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 
 #include <magic.h>
 

src/spells/unitcurse.c

@@ -23,7 +23,7 @@
 #include <kernel/objtypes.h>
 
 /* util includes */
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/nrmessage.h>
 #include <util/macros.h>

src/triggers/changefaction.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/changerace.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/clonedied.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/createcurse.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/createunit.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/gate.c

@@ -20,7 +20,7 @@
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/giveitem.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/killunit.c

@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/shock.c

@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/triggers/timeout.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include <kernel/attrib.h>
 #include <kernel/event.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 

src/util/CMakeLists.txt

@@ -9,7 +9,6 @@ base36.test.c
 # dice.test.c
 # filereader.test.c
 functions.test.c
-gamedata.test.c
 # goodies.test.c
 language.test.c
 # lists.test.c
@@ -37,7 +36,6 @@ crmessage.c
 dice.c
 filereader.c
 functions.c
-gamedata.c
 goodies.c
 language.c
 lists.c

src/vortex.c

@@ -5,7 +5,7 @@
 #include <kernel/region.h>
 
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/strings.h>

src/wormhole.c

@@ -25,7 +25,7 @@
 
 /* util includes */
 #include <kernel/attrib.h>
-#include <util/gamedata.h>
+#include <kernel/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>
 #include <util/resolve.h>

tests/orders.txt

@@ -1,3 +0,0 @@
-ERESSEA uhfr "Hodor"
-EINHEIT 8bz3
-BENENNEN EINHEIT 'Goldene Herde'