Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up d6caec1: changed RC_NONE to RC_NONE_ in map.h because it confilcts with RC_NONE in WinGDI.h

Browse Source 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2014-01-08 13:07:35 +07:00
parent d6caec1c51
commit 14a096a5a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/map.h
View File

@ -281,7 +281,7 @@ enum bl_type {
enum npc_subtype { WARP, SHOP, SCRIPT, CASHSHOP, ITEMSHOP, POINTSHOP, TOMB }; enum npc_subtype { WARP, SHOP, SCRIPT, CASHSHOP, ITEMSHOP, POINTSHOP, TOMB };
enum e_race { enum e_race {
RC_NONE=-1, //don't give us bonus RC_NONE_=-1, //don't give us bonus
RC_FORMLESS=0, RC_FORMLESS=0,
RC_UNDEAD, RC_UNDEAD,
RC_BRUTE, RC_BRUTE,

6
src/map/pc.c
View File

@ -1915,9 +1915,9 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id
if( if(
((id && drop[i].id == id) || ((id && drop[i].id == id) ||
(group && drop[i].group == group)) (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(class_<CLASS_NONE && class_<CLASS_MAX) drop[i].class_ |= 1<<class_;
if(drop[i].rate > 0 && rate > 0) if(drop[i].rate > 0 && rate > 0)
{ //Both are absolute rates. { //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].id = id;
drop[i].group = group; 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_; if(class_<CLASS_NONE && class_<CLASS_MAX) drop[i].class_ |= 1<<class_;
drop[i].rate = rate; drop[i].rate = rate;
return 1; return 1;