From 8538670a61c726fbd52087fe392f0a3d961db630 Mon Sep 17 00:00:00 2001 From: protimus Date: Wed, 4 Apr 2012 00:38:07 +0000 Subject: Changed some defines into an enumerator. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15829 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/core.h | 13 ++++++++----- src/common/timer.h | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'src/common') diff --git a/src/common/core.h b/src/common/core.h index 11b4f7c47..d48962c94 100644 --- a/src/common/core.h +++ b/src/common/core.h @@ -15,11 +15,14 @@ extern char **arg_v; extern int runflag; extern char *SERVER_NAME; -#define ATHENA_SERVER_NONE 0 // not defined -#define ATHENA_SERVER_LOGIN 1 // login server -#define ATHENA_SERVER_CHAR 2 // char server -#define ATHENA_SERVER_INTER 4 // inter server -#define ATHENA_SERVER_MAP 8 // map server +enum { + ATHENA_SERVER_NONE = 0, // not defined + ATHENA_SERVER_LOGIN = 1, // login server + ATHENA_SERVER_CHAR = 2, // char server + ATHENA_SERVER_INTER = 4, // inter server + ATHENA_SERVER_MAP = 8, // map server +}; + extern char SERVER_TYPE; extern int parse_console(const char* buf); diff --git a/src/common/timer.h b/src/common/timer.h index a615a5874..d45c73d12 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -11,9 +11,11 @@ #define INVALID_TIMER -1 // timer flags -#define TIMER_ONCE_AUTODEL 0x01 -#define TIMER_INTERVAL 0x02 -#define TIMER_REMOVE_HEAP 0x10 +enum { + TIMER_ONCE_AUTODEL = 0x01, + TIMER_INTERVAL = 0x02, + TIMER_REMOVE_HEAP = 0x10, +}; // Struct declaration -- cgit v1.2.3-60-g2f50