summaryrefslogtreecommitdiff
path: root/src/common/core.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/core.h')
-rw-r--r--src/common/core.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/common/core.h b/src/common/core.h
index 8fdcdcfc3..a8337e1b9 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -2,16 +2,15 @@
// See the LICENSE file
// Portions Copyright (c) Athena Dev Teams
-#ifndef _CORE_H_
-#define _CORE_H_
+#ifndef COMMON_CORE_H
+#define COMMON_CORE_H
#include "../common/db.h"
#include "../common/mmo.h"
-#include "../config/core.h"
/* so that developers with --enable-debug can raise signals from any section of the code they'd like */
#ifdef DEBUG
- #include <signal.h>
+# include <signal.h>
#endif
extern int arg_c;
@@ -24,20 +23,18 @@ extern int runflag;
extern char *SERVER_NAME;
enum server_types {
- SERVER_TYPE_UNKNOWN = 0x0,
- SERVER_TYPE_LOGIN = 0x1,
- SERVER_TYPE_CHAR = 0x2,
- SERVER_TYPE_MAP = 0x4,
+ SERVER_TYPE_UNKNOWN = 0x0,
+ SERVER_TYPE_LOGIN = 0x1,
+ SERVER_TYPE_CHAR = 0x2,
+ SERVER_TYPE_MAP = 0x4,
};
enum server_types SERVER_TYPE;
-const char *get_svn_revision(void);
-const char *get_git_hash (void);
extern int do_init(int,char**);
extern void set_server_type(void);
extern void do_abort(void);
-extern void do_final(void);
+extern int do_final(void);
/// The main loop continues until runflag is CORE_ST_STOP
enum E_CORE_ST {
@@ -50,4 +47,4 @@ enum E_CORE_ST {
/// If NULL, runflag is set to CORE_ST_STOP instead.
extern void (*shutdown_callback)(void);
-#endif /* _CORE_H_ */
+#endif /* COMMON_CORE_H */