diff options
| author | Haru <haru@dotalux.com> | 2014-05-04 06:13:56 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-09 08:29:46 +0200 |
| commit | b6b3f58795288701d0e162d43fa6f0a47af913b3 (patch) | |
| tree | a75f686731786ed1746325589d8acb1569409981 /src/char/char.c | |
| parent | 1c4e3820d5f4ff9870c28104122f6733db4d55a6 (diff) | |
| download | hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.gz hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.bz2 hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.xz hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.zip | |
Fixed order of includes in all source files
- Changed order according to the (upcoming) code style guidelines.
- Fixes several issues caused by missing headers when their include
order is changed or in plugins.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/char/char.c b/src/char/char.c index 77e393c0d..6c0902644 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -2,7 +2,30 @@ // See the LICENSE file // Portions Copyright (c) Athena Dev Teams +#define HERCULES_CORE + +#include "../config/core.h" // CONSOLE_INPUT +#include "char.h" + +#include <signal.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <time.h> + +#include "int_elemental.h" +#include "int_guild.h" +#include "int_homun.h" +#include "int_mercenary.h" +#include "int_party.h" +#include "int_storage.h" +#include "inter.h" +#include "pincode.h" +#include "../common/HPM.h" #include "../common/cbasetypes.h" +#include "../common/console.h" #include "../common/core.h" #include "../common/db.h" #include "../common/malloc.h" @@ -13,25 +36,6 @@ #include "../common/strlib.h" #include "../common/timer.h" #include "../common/utils.h" -#include "../common/console.h" -#include "../common/HPM.h" -#include "int_guild.h" -#include "int_homun.h" -#include "int_mercenary.h" -#include "int_elemental.h" -#include "int_party.h" -#include "int_storage.h" -#include "char.h" -#include "inter.h" -#include "pincode.h" - -#include <sys/types.h> -#include <time.h> -#include <signal.h> -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> // private declarations #define CHAR_CONF_NAME "conf/char-server.conf" @@ -5497,7 +5501,7 @@ int do_init(int argc, char **argv) { Sql_HerculesUpdateCheck(sql_handle); #ifdef CONSOLE_INPUT - console->setSQL(sql_handle); + console->input->setSQL(sql_handle); #endif ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port); |