Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

merge conflict nightmare fix.

Browse source
This commit is contained in:
Enno Rehling 2018-02-25 20:49:33 +01:00
parent 432a8d432d
commit db83140753
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eressea.c
View file

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

4
src/give.c
View file

@ -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) {

3
src/helpers.c
View file

@ -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)) {

1
src/kernel/connection.c
View file

@ -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)