merge conflict nightmare fix.

src/eressea.c

@@ -49,8 +49,6 @@ void game_done(void)
     free_gamedata();
     creport_cleanup();
     report_cleanup();
-#endif
-#endif
     calendar_cleanup();
     free_functions();
     free_config();

src/give.c

@@ -163,9 +163,9 @@ int give_quota(const unit * src, const unit * dst, const item_type * type,
     }
     if (dst && src && src->faction != dst->faction) {
         static int config;
-        static double divisor = 1.0;
+        static int divisor = 1;
         if (config_changed(&config)) {
-            divisor = config_get_flt("rules.items.give_divisor", divisor);
+            divisor = config_get_int("rules.items.give_divisor", divisor);
         }
         assert(divisor <= 0 || divisor >= 1);
         if (divisor >= 1) {

src/helpers.c

@@ -252,9 +252,6 @@ static int
 lua_use_item(unit *u, const item_type *itype, const char * fname, int amount, struct order *ord)
 {
     lua_State *L = (lua_State *)global.vm_state;
-    int len, result = 0;
-    char fname[64];
-    int (*callout)(unit *, const item_type *, int, struct order *);
 
     lua_getglobal(L, fname);
     if (lua_isfunction(L, -1)) {

src/kernel/connection.c

@@ -242,7 +242,6 @@ void b_read(connection * b, gamedata * data)
     default:
         assert(!"invalid variant type in connection");
     }
-    assert(result >= 0 || !"EOF encountered?");
 }
 
 void b_write(const connection * b, storage * store)

src/util/base36.c

@@ -103,7 +103,7 @@ const char *itoa36_r(int i, char *result, size_t len)
 {
     return itoab_r(i, 36, result, len);
 }
-
+ 
 const char *itoab(int i, int base)
 {
     static char sstr[80];