From 14a096a5a269c8a4fe3639bee24b03db60b27f64 Mon Sep 17 00:00:00 2001
From: Cydh Ramdh <house.bad@gmail.com>
Date: Wed, 8 Jan 2014 13:07:35 +0700
Subject: [PATCH] Follow up d6caec1: changed RC_NONE to RC_NONE_ in map.h
 because it confilcts with RC_NONE in WinGDI.h

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
---
 src/map/map.h | 2 +-
 src/map/pc.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/map/map.h b/src/map/map.h
index 0115451b5a..a1f28407be 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -281,7 +281,7 @@ enum bl_type {
 enum npc_subtype { WARP, SHOP, SCRIPT, CASHSHOP, ITEMSHOP, POINTSHOP, TOMB };
 
 enum e_race {
-	RC_NONE=-1, //don't give us bonus
+	RC_NONE_=-1, //don't give us bonus
 	RC_FORMLESS=0,
 	RC_UNDEAD,
 	RC_BRUTE,
diff --git a/src/map/pc.c b/src/map/pc.c
index 2806786c85..e1542c90da 100755
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1915,9 +1915,9 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id
 		if(
 			((id && drop[i].id == id) ||
 			(group && drop[i].group == group))
-			&& ((race<RC_NONE && race<RC_MAX) || (class_<CLASS_NONE && class_<CLASS_MAX))
+			&& ((race<RC_NONE_ && race<RC_MAX) || (class_<CLASS_NONE && class_<CLASS_MAX))
 		) {
-			if(race<RC_NONE && race<RC_MAX) drop[i].race |= 1<<race;
+			if(race<RC_NONE_ && race<RC_MAX) drop[i].race |= 1<<race;
 			if(class_<CLASS_NONE && class_<CLASS_MAX) drop[i].class_ |= 1<<class_;
 			if(drop[i].rate > 0 && rate > 0)
 			{	//Both are absolute rates.
@@ -1939,7 +1939,7 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id
 	}
 	drop[i].id = id;
 	drop[i].group = group;
-	if(race<RC_NONE && race<RC_MAX) drop[i].race |= 1<<race;
+	if(race<RC_NONE_ && race<RC_MAX) drop[i].race |= 1<<race;
 	if(class_<CLASS_NONE && class_<CLASS_MAX) drop[i].class_ |= 1<<class_;
 	drop[i].rate = rate;
 	return 1;