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/char/int_guild.h | 28 +++++++++++++++------------- src/char/int_party.h | 20 ++++++++------------ 2 files changed, 23 insertions(+), 25 deletions(-) (limited to 'src/char') diff --git a/src/char/int_guild.h b/src/char/int_guild.h index be1d16ab6..202b9b512 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -4,19 +4,21 @@ #ifndef _INT_GUILD_SQL_H_ #define _INT_GUILD_SQL_H_ -#define GS_BASIC 0x0001 -#define GS_MEMBER 0x0002 -#define GS_POSITION 0x0004 -#define GS_ALLIANCE 0x0008 -#define GS_EXPULSION 0x0010 -#define GS_SKILL 0x0020 -#define GS_EMBLEM 0x0040 -#define GS_CONNECT 0x0080 -#define GS_LEVEL 0x0100 -#define GS_MES 0x0200 -#define GS_MASK 0x03FF -#define GS_BASIC_MASK (GS_BASIC | GS_EMBLEM | GS_CONNECT | GS_LEVEL | GS_MES) -#define GS_REMOVE 0x8000 +enum { + GS_BASIC = 0x0001, + GS_MEMBER = 0x0002, + GS_POSITION = 0x0004, + GS_ALLIANCE = 0x0008, + GS_EXPULSION = 0x0010, + GS_SKILL = 0x0020, + GS_EMBLEM = 0x0040, + GS_CONNECT = 0x0080, + GS_LEVEL = 0x0100, + GS_MES = 0x0200, + GS_MASK = 0x03FF, + GS_BASIC_MASK = (GS_BASIC | GS_EMBLEM | GS_CONNECT | GS_LEVEL | GS_MES), + GS_REMOVE = 0x8000, +}; struct guild; struct guild_castle; diff --git a/src/char/int_party.h b/src/char/int_party.h index d7965c33b..703cd5bd5 100644 --- a/src/char/int_party.h +++ b/src/char/int_party.h @@ -5,18 +5,14 @@ #define _INT_PARTY_SQL_H_ //Party Flags on what to save/delete. -//Create a new party entry (index holds leader's info) -#define PS_CREATE 0x01 -//Update basic party info. -#define PS_BASIC 0x02 -//Update party's leader -#define PS_LEADER 0x04 -//Specify new party member (index specifies which party member) -#define PS_ADDMEMBER 0x08 -//Specify member that left (index specifies which party member) -#define PS_DELMEMBER 0x10 -//Specify that this party must be deleted. -#define PS_BREAK 0x20 +enum { + PS_CREATE = 0x01, //Create a new party entry (index holds leader's info) + PS_BASIC = 0x02, //Update basic party info. + PS_LEADER = 0x04, //Update party's leader + PS_ADDMEMBER = 0x08, //Specify new party member (index specifies which party member) + PS_DELMEMBER = 0x10, //Specify member that left (index specifies which party member) + PS_BREAK = 0x20, //Specify that this party must be deleted. +}; struct party; -- cgit v1.2.3-70-g09d2