rename message.[hc] to messages.[hc] in kernel because of naming conflict with util/

begin json config files (WIP)

src/bind_attrib.c

@@ -1,414 +0,0 @@
-/* vi: set ts=2:
-+-------------------+
-|                   |  Enno Rehling <enno@eressea.de>
-| Eressea PBEM host |  Christian Schlittchen <corwin@amber.kn-bremen.de>
-| (c) 1998 - 2010   |  Katja Zedel <katze@felidae.kn-bremen.de>
-|                   |  Henning Peters <faroul@beyond.kn-bremen.de>
-+-------------------+
-
-This program may not be used, modified or distributed
-without prior permission by the authors of Eressea.
-*/
-
-#include <platform.h>
-#include "bind_attrib.h"
-#include <kernel/config.h>
-
-#include <kernel/unit.h>
-#include <kernel/faction.h>
-#include <kernel/ship.h>
-#include <kernel/building.h>
-#include <kernel/region.h>
-#include <kernel/objtypes.h>
-#include <util/attrib.h>
-#include <util/log.h>
-#include <util/resolve.h>
-
-#include <storage.h>
-
-/* external libraries */
-#include <bson.h>
-
-#include <lua.h>
-#include <tolua.h>
-#include <errno.h>
-
-static void init_ext(attrib * a)
-{
-  lua_State *L = (lua_State *) global.vm_state;
-
-  lua_pushstring(L, "callbacks");
-  lua_rawget(L, LUA_GLOBALSINDEX);
-  if (lua_istable(L, -1)) {
-    lua_pushstring(L, "attrib_init");
-    lua_rawget(L, LUA_GLOBALSINDEX);
-    if (lua_isfunction(L, -1)) {
-      lua_rawgeti(L, LUA_REGISTRYINDEX, a->data.i);
-      if (lua_pcall(L, 1, 0, 0) != 0) {
-        const char *error = lua_tostring(L, -1);
-        log_error("attrib_init '%d': %s.\n", a->data.i, error);
-      }
-    }
-  }
-}
-
-static void free_ext(attrib * a)
-{
-  lua_State *L = (lua_State *) global.vm_state;
-  if (a->data.i > 0) {
-    luaL_unref(L, LUA_REGISTRYINDEX, a->data.i);
-  }
-}
-
-static int age_ext(attrib * a)
-{
-  return AT_AGE_KEEP;
-}
-
-static void write_ext_i(lua_State * L, const char *name, bson_buffer * bb)
-{
-  int type = lua_type(L, -1);
-  switch (type) {
-    case LUA_TNUMBER:
-    {
-      double value = tolua_tonumber(L, -1, 0);
-      bson_append_double(bb, name, value);
-    }
-      break;
-    case LUA_TSTRING:
-    {
-      const char *value = tolua_tostring(L, -1, 0);
-      bson_append_string(bb, name, value);
-    }
-      break;
-    case LUA_TTABLE:
-    {
-      int n = luaL_getn(L, -1);
-      if (n) {
-        bson_buffer *arr = bson_append_start_array(bb, name);
-        int i;
-        for (i = 0; i != n; ++i) {
-          char num[12];
-          bson_numstr(num, i);
-          lua_rawgeti(L, -1, i + 1);
-          write_ext_i(L, num, arr);
-          lua_pop(L, 1);
-        }
-        bson_append_finish_object(arr);
-      } else {
-        bson_buffer *sub = bson_append_start_object(bb, name);
-        lua_pushnil(L);         /* first key */
-        while (lua_next(L, -2) != 0) {
-          const char *key;
-          /* uses 'key' (at index -2) and 'value' (at index -1) */
-          lua_pushvalue(L, -2);
-          key = lua_tolstring(L, -1, 0);
-          lua_pushvalue(L, -2);
-          if (key) {
-            write_ext_i(L, key, sub);
-          }
-          /* removes 'value'; keeps 'key' for next iteration */
-          lua_pop(L, 3);
-        }
-        bson_append_finish_object(sub);
-      }
-    }
-      break;
-    case LUA_TUSERDATA:
-    {
-      tolua_Error tolua_err;
-      if (tolua_isusertype(L, -1, "unit", 0, &tolua_err)) {
-        unit *u = (unit *) tolua_tousertype(L, -1, 0);
-        bson_oid_t oid;
-        oid.ints[0] = TYP_UNIT;
-        oid.ints[1] = u->no;
-        bson_append_oid(bb, name, &oid);
-      } else if (tolua_isusertype(L, -1, "region", 0, &tolua_err)) {
-        region *r = (region *) tolua_tousertype(L, -1, 0);
-        bson_oid_t oid;
-        oid.ints[0] = TYP_REGION;
-        oid.ints[1] = r->uid;
-        bson_append_oid(bb, name, &oid);
-      } else if (tolua_isusertype(L, -1, "ship", 0, &tolua_err)) {
-        ship *sh = (ship *) tolua_tousertype(L, -1, 0);
-        bson_oid_t oid;
-        oid.ints[0] = TYP_SHIP;
-        oid.ints[1] = sh->no;
-        bson_append_oid(bb, name, &oid);
-      } else if (tolua_isusertype(L, -1, "building", 0, &tolua_err)) {
-        building *b = (building *) tolua_tousertype(L, -1, 0);
-        bson_oid_t oid;
-        oid.ints[0] = TYP_BUILDING;
-        oid.ints[1] = b->no;
-        bson_append_oid(bb, name, &oid);
-      } else {
-        log_error("unsuported type.\n");
-        bson_append_null(bb, name);
-      }
-    }
-      break;
-    default:
-      bson_append_null(bb, name);
-      break;
-  }
-}
-
-static void
-write_ext(const attrib * a, const void *owner, struct storage *store)
-{
-  lua_State *L = (lua_State *) global.vm_state;
-  if (a->data.i > 0) {
-    int handle = a->data.i;
-    bson_buffer bb;
-    bson b;
-
-    bson_buffer_init(&bb);
-    lua_rawgeti(L, LUA_REGISTRYINDEX, handle);
-    write_ext_i(L, "_data", &bb);
-    bson_from_buffer(&b, &bb);
-    store->w_int(store, bson_size(&b));
-    store->w_bin(store, b.data, bson_size(&b));
-    bson_destroy(&b);
-  }
-}
-
-static int read_ext_i(lua_State * L, bson_iterator * it, bson_type type)
-{
-  switch (type) {
-    case bson_double:
-    {
-      lua_pushnumber(L, bson_iterator_double(it));
-    }
-      break;
-    case bson_string:
-    {
-      lua_pushstring(L, bson_iterator_string(it));
-    }
-      break;
-    case bson_array:
-    {
-      bson_iterator sub;
-      int err;
-      bson_iterator_subiterator(it, &sub);
-      lua_newtable(L);
-      if (bson_iterator_more(&sub)) {
-        bson_type ctype;
-        for (ctype = bson_iterator_next(&sub); bson_iterator_more(&sub);
-          ctype = bson_iterator_next(&sub)) {
-          int i = atoi(bson_iterator_key(&sub));
-          err = read_ext_i(L, &sub, ctype);
-          if (err) {
-            lua_pop(L, 1);
-            return err;
-          }
-          lua_rawseti(L, -2, i + 1);
-        }
-      }
-    }
-      break;
-    case bson_object:
-    {
-      bson_iterator sub;
-      int err;
-      bson_iterator_subiterator(it, &sub);
-      lua_newtable(L);
-      if (bson_iterator_more(&sub)) {
-        bson_type ctype;
-        for (ctype = bson_iterator_next(&sub); bson_iterator_more(&sub);
-          ctype = bson_iterator_next(&sub)) {
-          lua_pushstring(L, bson_iterator_key(&sub));
-          err = read_ext_i(L, &sub, ctype);
-          if (err) {
-            lua_pop(L, 1);
-            return err;
-          }
-          lua_rawset(L, -3);
-        }
-      }
-    }
-      break;
-    case bson_oid:
-    {
-      bson_oid_t *oid = bson_iterator_oid(it);
-      if (oid->ints[0] == TYP_UNIT) {
-        unit *u = findunit(oid->ints[1]);
-        if (u)
-          tolua_pushusertype(L, u, "unit");
-        else
-          lua_pushnil(L);
-      } else if (oid->ints[0] == TYP_REGION) {
-        region *r = findregionbyid(oid->ints[1]);
-        if (r)
-          tolua_pushusertype(L, r, "region");
-        else
-          lua_pushnil(L);
-      } else if (oid->ints[0] == TYP_SHIP) {
-        ship *sh = findship(oid->ints[1]);
-        if (sh)
-          tolua_pushusertype(L, sh, "ship");
-        else
-          lua_pushnil(L);
-      } else if (oid->ints[0] == TYP_BUILDING) {
-        building *b = findbuilding(oid->ints[1]);
-        if (b)
-          tolua_pushusertype(L, b, "building");
-        else
-          lua_pushnil(L);
-      } else {
-        log_error("unknown oid %d %d %d\n", oid->ints[0], oid->ints[1], oid->ints[2]);
-        lua_pushnil(L);
-      }
-    }
-      break;
-    case bson_null:
-      lua_pushnil(L);
-      break;
-    case bson_eoo:
-      return EFAULT;
-    default:
-      return EINVAL;
-  }
-  return 0;
-}
-
-static int resolve_bson(variant data, void *address)
-{
-  lua_State *L = (lua_State *) global.vm_state;
-  bson b;
-  int err;
-  bson_iterator it;
-  attrib *a = (attrib *) address;
-  char *buffer = data.v;
-
-  bson_init(&b, buffer, 1);
-  bson_iterator_init(&it, b.data);
-  err = read_ext_i(L, &it, bson_iterator_next(&it));
-  a->data.i = luaL_ref(L, LUA_REGISTRYINDEX);
-  bson_destroy(&b);
-  return err ? AT_READ_FAIL : AT_READ_OK;
-}
-
-static int read_ext(attrib * a, void *owner, struct storage *store)
-{
-  variant data;
-  int len = store->r_int(store);
-  data.v = bson_malloc(len);
-  store->r_bin(store, data.v, (size_t) len);
-  a->data.v = 0;
-  ur_add(data, a, resolve_bson);
-  return AT_READ_OK;
-}
-
-attrib_type at_lua_ext = {
-  "lua", init_ext, free_ext, age_ext, write_ext, read_ext
-};
-
-static attrib **get_attribs(lua_State * L, int idx)
-{
-  attrib **ap = NULL;
-  tolua_Error tolua_err;
-
-  if (tolua_isusertype(L, idx, TOLUA_CAST "unit", 0, &tolua_err)) {
-    unit *u = (unit *) tolua_tousertype(L, idx, 0);
-    if (u)
-      ap = &u->attribs;
-  } else if (tolua_isusertype(L, idx, TOLUA_CAST "region", 0, &tolua_err)) {
-    region *r = (region *) tolua_tousertype(L, idx, 0);
-    if (r)
-      ap = &r->attribs;
-  } else if (tolua_isusertype(L, idx, TOLUA_CAST "faction", 0, &tolua_err)) {
-    faction *f = (faction *) tolua_tousertype(L, idx, 0);
-    if (f)
-      ap = &f->attribs;
-  } else if (lua_isstring(L, idx)) {
-    const char *str = tolua_tostring(L, idx, NULL);
-    if (str && strcmp(str, "global") == 0) {
-      ap = &global.attribs;
-    }
-  }
-  return ap;
-}
-
-static int tolua_attrib_create(lua_State * L)
-{
-  attrib **ap = get_attribs(L, 1);
-  if (ap) {
-    attrib *a = a_new(&at_lua_ext);
-    int handle;
-
-    lua_pushvalue(L, 2);
-    handle = luaL_ref(L, LUA_REGISTRYINDEX);
-    a->data.i = handle;
-
-    a_add(ap, a);
-    tolua_pushusertype(L, (void *)a, TOLUA_CAST "attrib");
-    return 1;
-  }
-  return 0;
-}
-
-int tolua_attrib_data(lua_State * L)
-{
-  attrib *a = (attrib *) tolua_tousertype(L, 1, 0);
-  if (a && a->data.i) {
-    lua_rawgeti(L, LUA_REGISTRYINDEX, a->data.i);
-    return 1;
-  }
-  return 0;
-}
-
-attrib *tolua_get_lua_ext(struct attrib * alist)
-{
-  while (alist && alist->type != &at_lua_ext)
-    alist = alist->next;
-  return alist;
-}
-
-int tolua_attriblist_next(lua_State * L)
-{
-  attrib **attrib_ptr = (attrib **) lua_touserdata(L, lua_upvalueindex(1));
-  attrib *a = *attrib_ptr;
-  if (a != NULL) {
-    tolua_pushusertype(L, (void *)a, TOLUA_CAST "attrib");
-    *attrib_ptr = tolua_get_lua_ext(a->next);
-    return 1;
-  } else
-    return 0;                   /* no more values to return */
-}
-
-int tolua_attrib_get(lua_State * L)
-{
-  attrib **ap = get_attribs(L, 1);
-  if (ap) {
-    attrib *a = tolua_get_lua_ext(*ap);
-    attrib **attrib_ptr = (attrib **) lua_newuserdata(L, sizeof(attrib *));
-    luaL_getmetatable(L, "attrib");
-    lua_setmetatable(L, -2);
-    *attrib_ptr = a;
-    lua_pushcclosure(L, tolua_attriblist_next, 1);
-    return 1;
-  } else
-    return 0;
-}
-
-void tolua_attrib_open(lua_State * L)
-{
-  at_register(&at_lua_ext);
-
-  tolua_usertype(L, TOLUA_CAST "attrib");
-
-  tolua_module(L, NULL, 0);
-  tolua_beginmodule(L, NULL);
-  {
-    tolua_cclass(L, TOLUA_CAST "attrib", TOLUA_CAST "attrib", TOLUA_CAST "",
-      NULL);
-    tolua_beginmodule(L, TOLUA_CAST "attrib");
-    {
-      tolua_function(L, TOLUA_CAST "create", &tolua_attrib_create);
-      tolua_function(L, TOLUA_CAST "get", &tolua_attrib_get);
-      tolua_variable(L, TOLUA_CAST "data", &tolua_attrib_data, NULL);
-    }
-    tolua_endmodule(L);
-  }
-  tolua_endmodule(L);
-}

src/bind_attrib.h

@@ -1,26 +0,0 @@
-/* vi: set ts=2:
-+-------------------+
-|                   |  Enno Rehling <enno@eressea.de>
-| Eressea PBEM host |  Christian Schlittchen <corwin@amber.kn-bremen.de>
-| (c) 1998 - 2010   |  Katja Zedel <katze@felidae.kn-bremen.de>
-|                   |  Henning Peters <faroul@beyond.kn-bremen.de>
-+-------------------+
-
-This program may not be used, modified or distributed
-without prior permission by the authors of Eressea.
-*/
-
-#include <lua.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  struct attrib;
-  void tolua_attrib_open(struct lua_State *L);
-  struct attrib *tolua_get_lua_ext(struct attrib *alist);
-  int tolua_attriblist_next(struct lua_State *L);
-
-#ifdef __cplusplus
-}
-#endif

src/bind_message.c

@@ -4,7 +4,7 @@
 /* kernel includes */
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/reports.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>

src/bind_unit.c

@@ -31,7 +31,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/group.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/pool.h>

src/bindings.c

@@ -34,7 +34,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/calendar.h>
 #include <kernel/unit.h>
 #include <kernel/terrain.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/region.h>
 #include <kernel/reports.h>
 #include <kernel/building.h>

src/creport.c

@@ -40,7 +40,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/faction.h>
 #include <kernel/group.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/economy.c

@@ -37,7 +37,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
@@ -61,7 +61,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/lists.h>
 #include <util/language.h>
 #include <util/lists.h>
-#include <util/message.h>
 #include <util/parser.h>
 #include <util/rng.h>
 

src/give.c

@@ -21,7 +21,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/order.h>
 #include <kernel/pool.h>
 #include <kernel/race.h>

src/items.c

@@ -9,7 +9,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/items/artrewards.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/save.h>
 #include <kernel/skill.h>
 #include <kernel/curse.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/magic.h>
 #include <kernel/ship.h>
 

src/items/demonseye.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* kernel includes */
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>

src/items/phoenixcompass.c

@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/region.h>
 #include <kernel/faction.h>
 #include <kernel/unit.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 
 /* util includes */
 #include <util/functions.h>

src/items/speedsail.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* kernel includes */
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>

src/items/weapons.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/build.h>
 #include <kernel/race.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/battle.h>
 #include <kernel/pool.h>
 

src/items/xerewards.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 #include <kernel/skill.h>
 #include <kernel/curse.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/magic.h>
 #include <kernel/pool.h>
 

src/kernel/CMakeLists.txt

@@ -35,7 +35,7 @@ faction.c
 group.c
 item.c
 magic.c
-message.c
+messages.c
 move.c
 names.c
 order.c

src/kernel/alchemy.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "item.h"
 #include "faction.h"
-#include "message.h"
+#include "messages.h"
 #include "build.h"
 #include "magic.h"
 #include "region.h"

src/kernel/alliance.c

@@ -19,7 +19,7 @@ without prior permission by the authors of Eressea.
 /* kernel includes */
 #include <kernel/building.h>
 #include <kernel/faction.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/order.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>

src/kernel/battle.c

@@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "group.h"
 #include "item.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "move.h"
 #include "names.h"
 #include "order.h"

src/kernel/build.c

@@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "group.h"
 #include "item.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "move.h"
 #include "order.h"
 #include "pool.h"

src/kernel/config.c

@@ -36,7 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "group.h"
 #include "item.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "move.h"
 #include "names.h"
 #include "objtypes.h"

src/kernel/curse.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "building.h"
 #include "faction.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "objtypes.h"
 #include "race.h"
 #include "region.h"

src/kernel/faction.c

@@ -25,7 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "equipment.h"
 #include "group.h"
 #include "item.h"
-#include "message.h"
+#include "messages.h"
 #include "plane.h"
 #include "race.h"
 #include "region.h"

src/kernel/item.c

@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "build.h"
 #include "curse.h"
 #include "faction.h"
-#include "message.h"
+#include "messages.h"
 #include "pool.h"
 #include "race.h"
 #include "region.h"

src/kernel/jsonconf.c

@@ -18,7 +18,7 @@ without prior permission by the authors of Eressea.
 #include "building.h"
 #include "equipment.h"
 #include "item.h"
-#include "message.h"
+#include "messages.h"
 #include "race.h"
 #include "region.h"
 #include "resources.h"
@@ -145,3 +145,4 @@ void json_config(cJSON *json) {
         json_races(child);
     }
 }
+

src/kernel/magic.c

@@ -25,7 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "curse.h"
 #include "faction.h"
 #include "item.h"
-#include "message.h"
+#include "messages.h"
 #include "objtypes.h"
 #include "order.h"
 #include "pathfinder.h"

src/kernel/messages.c

@@ -18,7 +18,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <platform.h>
 #include <kernel/config.h>
-#include "message.h"
+#include "messages.h"
 
 /* kernel includes */
 #include "building.h"

src/kernel/messages.h

@@ -24,12 +24,9 @@ extern "C" {
 
 #include <util/message.h>
 
-  struct message;
     struct faction;
     struct msglevel;
 
-  struct message_type;
-
   typedef struct mlist {
     struct mlist *next;
     struct message *msg;

src/kernel/move.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "faction.h"
 #include "item.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "order.h"
 #include "plane.h"
 #include "race.h"

src/kernel/region.c

@@ -28,7 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "equipment.h"
 #include "faction.h"
 #include "item.h"
-#include "message.h"
+#include "messages.h"
 #include "plane.h"
 #include "region.h"
 #include "resources.h"

src/kernel/render.h

@@ -16,7 +16,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <util/nrmessage.h>
 #include <util/message.h>
 

src/kernel/reports.c

@@ -28,7 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/group.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/kernel/save.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "group.h"
 #include "item.h"
 #include "magic.h"
-#include "message.h"
+#include "messages.h"
 #include "move.h"
 #include "objtypes.h"
 #include "order.h"

src/kernel/xmlreader.c

@@ -18,7 +18,7 @@ without prior permission by the authors of Eressea.
 #include "building.h"
 #include "equipment.h"
 #include "item.h"
-#include "message.h"
+#include "messages.h"
 #include "race.h"
 #include "region.h"
 #include "resources.h"

src/laws.c

@@ -45,7 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/group.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/market.c

@@ -23,7 +23,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/building.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>

src/modules/arena.c

@@ -36,7 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/modules/gmcmd.c

@@ -26,7 +26,7 @@
 #include <kernel/reports.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>

src/modules/museum.c

@@ -28,7 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/move.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>

src/modules/wormhole.c

@@ -19,7 +19,7 @@
 /* kernel includes */
 #include <kernel/building.h>
 #include <kernel/faction.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>

src/monster.c

@@ -36,7 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/equipment.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/order.h>

src/monsters.c

@@ -39,7 +39,7 @@
 #include <kernel/equipment.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/order.h>

src/platform.h

@@ -114,3 +114,4 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #endif
+

src/races/illusion.c

@@ -18,7 +18,7 @@
 /* kernel includes */
 #include <kernel/unit.h>
 #include <kernel/faction.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 
 /* libc includes */
 #include <stdlib.h>

src/randenc.c

@@ -32,7 +32,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/order.h>
@@ -56,8 +56,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>
-#include <util/message.h>
 #include <util/rand.h>
+#include <util/message.h>
 #include <util/rng.h>
 
 /* libc includes */

src/report.c

@@ -47,7 +47,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/group.h>
 #include <kernel/item.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/objtypes.h>
 #include <kernel/order.h>

src/spells/alp.c

@@ -18,7 +18,7 @@
 #include <kernel/curse.h>
 #include <kernel/faction.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/skill.h>

src/spells/borders.c

@@ -7,7 +7,7 @@
 #include <kernel/curse.h>
 #include <kernel/config.h>
 #include <kernel/faction.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/region.h>
 #include <kernel/save.h>
 #include <kernel/terrain.h>

src/spells/buildingcurse.c

@@ -16,7 +16,7 @@
 #include "buildingcurse.h"
 
 /* kernel includes */
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/objtypes.h>
 #include <kernel/building.h>
 #include <kernel/ship.h>

src/spells/combatspells.c

@@ -22,7 +22,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/order.h>
 #include <kernel/race.h>
 #include <kernel/region.h>

src/spells/regioncurse.c

@@ -18,7 +18,7 @@
 /* kernel includes */
 #include <kernel/curse.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/objtypes.h>
 #include <kernel/region.h>
 #include <kernel/terrain.h>

src/spells/shipcurse.c

@@ -17,7 +17,7 @@
 #include "shipcurse.h"
 
 /* kernel includes */
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/objtypes.h>
 #include <kernel/ship.h>
 #include <kernel/unit.h>

src/spells/spells.c

@@ -36,7 +36,7 @@
 #include <kernel/reports.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/objtypes.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/spells/unitcurse.c

@@ -17,7 +17,7 @@
 
 /* kernel includes */
 #include <kernel/curse.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/race.h>
 #include <kernel/skill.h>
 #include <kernel/unit.h>

src/spy.c

@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/item.h>
 #include <kernel/faction.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/race.h>

src/study.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/triggers/shock.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/curse.h>
 #include <kernel/faction.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/skill.h>
 #include <kernel/spell.h>
 #include <kernel/unit.h>

src/triggers/unitmessage.c

@@ -14,7 +14,7 @@ without prior permission by the authors of Eressea.
 /* kernel includes */
 #include <kernel/unit.h>
 #include <kernel/faction.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 
 /* util includes */
 #include <util/attrib.h>

src/util/message.h

@@ -9,8 +9,8 @@
  This program may not be used, modified or distributed 
  without prior permission by the authors of Eressea.
 */
-#ifndef UTIL_MESSAGE_H
+#ifndef H_MESSAGE_H
-#define UTIL_MESSAGE_H
+#define H_MESSAGE_H
 
 #include "variant.h"
 
@@ -18,8 +18,6 @@
 extern "C" {
 #endif
 
-  struct locale;
-
   typedef struct arg_type {
     struct arg_type *next;
     variant_type vtype;
@@ -71,3 +69,4 @@ extern "C" {
 }
 #endif
 #endif
+

src/xmlreport.c

@@ -39,7 +39,7 @@ without prior permission by the authors of Eressea.
 #include <kernel/group.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/message.h>
+#include <kernel/messages.h>
 #include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>