From cf30ac9f4643471b884d2b16f2beb4a62dcdaa99 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 26 May 2009 18:22:14 +0000
Subject: [PATCH] gcc compile fixes

---
 src/common/kernel/alliance.c | 4 ++--
 src/common/kernel/magic.h    | 2 +-
 src/eressea/server.c         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/kernel/alliance.c b/src/common/kernel/alliance.c
index 7dd254da3..8874bdfb1 100644
--- a/src/common/kernel/alliance.c
+++ b/src/common/kernel/alliance.c
@@ -147,7 +147,7 @@ cmd_join(const tnode * tnext, void * data, struct order * ord)
 }
 
 static void
-perform_kick()
+perform_kick(void)
 {
   alliance_transaction ** tap = transactions+ALLIANCE_KICK;
   while (*tap) {
@@ -335,7 +335,7 @@ alliance_cmd(void)
       add_command(leaf, NULL, LOC(slang->lang, "invite"), &cmd_invite);
       add_command(leaf, NULL, LOC(slang->lang, "join"), &cmd_join);
       add_command(leaf, NULL, LOC(slang->lang, "kick"), &cmd_kick);
-      add_command(leaf, NULL, LOC(slang->lang, "leave"), &cmd_new);
+      add_command(leaf, NULL, LOC(slang->lang, "leave"), &cmd_leave);
       add_command(leaf, NULL, LOC(slang->lang, "command"), &cmd_transfer);
       slang->root = leaf;
       slang = slang->next;
diff --git a/src/common/kernel/magic.h b/src/common/kernel/magic.h
index 79e94fb22..686309fd1 100644
--- a/src/common/kernel/magic.h
+++ b/src/common/kernel/magic.h
@@ -379,7 +379,7 @@ extern const char * spell_name(const struct spell * sp, const struct locale * la
 extern const char * curse_name(const struct curse_type * ctype, const struct locale * lang);
 
 extern struct message * msg_unitnotfound(const struct unit * mage, struct order * ord, const struct spllprm * spobj);
-extern int FactionSpells();
+extern int FactionSpells(void);
 extern struct spell_list ** get_spelllist(struct sc_mage * mage, struct faction * f);
 
 extern void write_spelllist(const struct spell_list * slist, struct storage * store);
diff --git a/src/eressea/server.c b/src/eressea/server.c
index f18df0f03..c04964e72 100644
--- a/src/eressea/server.c
+++ b/src/eressea/server.c
@@ -596,7 +596,6 @@ load_inifile(const char * filename)
 static void
 write_spells(void)
 {
-  const resource_type * rt_water = rt_find("p2");
   struct locale * loc = find_locale("de");
   FILE * F = fopen("spells.txt", "w");
   spell_list * spl = spells;
@@ -649,7 +648,8 @@ main(int argc, char *argv[])
   kernel_init();
   game_init();
 
-  /* write_spells(); */
+  if (0)
+    write_spells();
 
   /* run the main script */
   if (luafile==NULL) lua_console(luaState);