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

I broke the Lua tests, must initialize resources in eressea.free_game binding

This commit is contained in:
Enno Rehling 2014-12-31 00:20:19 +01:00
parent e04a541167
commit 80be0a8e89
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bind_eressea.c
View File

@ -5,6 +5,7 @@
#include "json.h" #include "json.h"
#include <kernel/faction.h> #include <kernel/faction.h>
#include <kernel/item.h>
#include <kernel/config.h> #include <kernel/config.h>
#include <kernel/save.h> #include <kernel/save.h>
@ -14,6 +15,7 @@
void eressea_free_game(void) { void eressea_free_game(void) {
free_gamedata(); free_gamedata();
init_resources();
} }
int eressea_read_game(const char * filename) { int eressea_read_game(const char * filename) {

6
src/kernel/item.h
View File

@ -313,9 +313,9 @@ extern "C" {
extern struct attrib_type at_showitem; /* show this potion's description */ extern struct attrib_type at_showitem; /* show this potion's description */
extern void register_resources(void); void register_resources(void);
extern void init_resources(void); void init_resources(void);
extern void init_itemtypes(void); void init_itemtypes(void);
extern void register_item_give(int (*foo) (struct unit *, struct unit *, extern void register_item_give(int (*foo) (struct unit *, struct unit *,
const struct item_type *, int, struct order *), const char *name); const struct item_type *, int, struct order *), const char *name);