forked from github/server
clean includes for bindings and main
This commit is contained in:
parent
dfa9c64465
commit
0759482934
|
@ -5,7 +5,6 @@
|
||||||
#include "bind_building.h"
|
#include "bind_building.h"
|
||||||
#include "bind_unit.h"
|
#include "bind_unit.h"
|
||||||
|
|
||||||
#include <kernel/config.h>
|
|
||||||
#include <kernel/unit.h>
|
#include <kernel/unit.h>
|
||||||
#include <kernel/building.h>
|
#include <kernel/building.h>
|
||||||
#include <kernel/region.h>
|
#include <kernel/region.h>
|
||||||
|
@ -15,9 +14,12 @@
|
||||||
#include <util/macros.h>
|
#include <util/macros.h>
|
||||||
#include <util/strings.h>
|
#include <util/strings.h>
|
||||||
|
|
||||||
|
#include <lua.h>
|
||||||
|
#include <lauxlib.h>
|
||||||
#include <tolua.h>
|
#include <tolua.h>
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
int tolua_buildinglist_next(lua_State * L)
|
int tolua_buildinglist_next(lua_State * L)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,17 +5,15 @@
|
||||||
#include "bind_config.h"
|
#include "bind_config.h"
|
||||||
|
|
||||||
#include "jsonconf.h"
|
#include "jsonconf.h"
|
||||||
|
#include "magic.h"
|
||||||
|
|
||||||
#include <kernel/config.h>
|
#include <kernel/config.h>
|
||||||
#include <kernel/building.h>
|
#include <kernel/building.h>
|
||||||
#include <kernel/race.h>
|
#include <kernel/race.h>
|
||||||
#include <kernel/ship.h>
|
#include <kernel/ship.h>
|
||||||
#include <kernel/spell.h>
|
#include <kernel/spell.h>
|
||||||
#include <kernel/spellbook.h>
|
|
||||||
#include <kernel/terrain.h>
|
|
||||||
|
|
||||||
#include <util/log.h>
|
#include <util/log.h>
|
||||||
#include <util/language.h>
|
|
||||||
#include <util/nrmessage.h>
|
#include <util/nrmessage.h>
|
||||||
#include <util/path.h>
|
#include <util/path.h>
|
||||||
#include <util/strings.h>
|
#include <util/strings.h>
|
||||||
|
|
|
@ -17,19 +17,16 @@ without prior permission by the authors of Eressea.
|
||||||
#include "bind_faction.h"
|
#include "bind_faction.h"
|
||||||
#include "bind_unit.h"
|
#include "bind_unit.h"
|
||||||
#include "bindings.h"
|
#include "bindings.h"
|
||||||
#include "helpers.h"
|
|
||||||
#include "magic.h"
|
#include "magic.h"
|
||||||
|
|
||||||
#include <kernel/alliance.h>
|
#include <kernel/alliance.h>
|
||||||
#include <kernel/faction.h>
|
#include <kernel/faction.h>
|
||||||
#include <kernel/unit.h>
|
#include <kernel/unit.h>
|
||||||
#include <kernel/item.h>
|
#include <kernel/item.h>
|
||||||
#include <kernel/faction.h>
|
|
||||||
#include <kernel/messages.h>
|
#include <kernel/messages.h>
|
||||||
#include <kernel/plane.h>
|
#include <kernel/plane.h>
|
||||||
#include <kernel/race.h>
|
#include <kernel/race.h>
|
||||||
#include <kernel/region.h>
|
#include <kernel/region.h>
|
||||||
#include <kernel/spellbook.h>
|
|
||||||
#include "kernel/types.h"
|
#include "kernel/types.h"
|
||||||
|
|
||||||
#include <util/base36.h>
|
#include <util/base36.h>
|
||||||
|
@ -46,7 +43,6 @@ without prior permission by the authors of Eressea.
|
||||||
#include <tolua.h>
|
#include <tolua.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
|
||||||
|
|
||||||
typedef struct helpmode {
|
typedef struct helpmode {
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
#include "settings.pkg.c"
|
#include "settings.pkg.c"
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
|
|
||||||
|
#include <lua.h>
|
||||||
|
|
||||||
void tolua_bind_open(lua_State * L) {
|
void tolua_bind_open(lua_State * L) {
|
||||||
tolua_eressea_open(L);
|
tolua_eressea_open(L);
|
||||||
tolua_process_open(L);
|
tolua_process_open(L);
|
||||||
|
|
18
src/main.c
18
src/main.c
|
@ -22,15 +22,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
#include <kernel/calendar.h>
|
#include <kernel/calendar.h>
|
||||||
#include <kernel/config.h>
|
#include <kernel/config.h>
|
||||||
#include <kernel/database.h>
|
|
||||||
#include <kernel/messages.h>
|
#include <kernel/messages.h>
|
||||||
#include <kernel/save.h>
|
|
||||||
#include <kernel/version.h>
|
#include <kernel/version.h>
|
||||||
|
|
||||||
#include <util/filereader.h>
|
|
||||||
#include <util/language.h>
|
#include <util/language.h>
|
||||||
#include <util/log.h>
|
#include <util/log.h>
|
||||||
#include <util/macros.h>
|
|
||||||
#include <util/path.h>
|
#include <util/path.h>
|
||||||
|
|
||||||
#include "eressea.h"
|
#include "eressea.h"
|
||||||
|
@ -39,14 +35,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "bindings.h"
|
#include "bindings.h"
|
||||||
#include "races/races.h"
|
|
||||||
#include "spells.h"
|
#include <iniparser.h>
|
||||||
|
#include <dictionary.h>
|
||||||
|
|
||||||
#include <lua.h>
|
#include <lua.h>
|
||||||
#include <assert.h>
|
|
||||||
|
#include <limits.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include <wctype.h>
|
#include <wctype.h>
|
||||||
#include <iniparser.h>
|
|
||||||
|
|
||||||
static const char *logfile = "eressea.log";
|
static const char *logfile = "eressea.log";
|
||||||
static const char *luafile = 0;
|
static const char *luafile = 0;
|
||||||
|
@ -302,7 +302,7 @@ void locale_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void bind_monsters(struct lua_State *L);
|
extern void bind_monsters(lua_State *L);
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue