summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 20:34:02 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 20:34:02 +0000
commit4843efac1f35011a8490ece2aeabb25be3e480e8 (patch)
tree059e97fc8b68959521ddfd4089814716615b2113 /src
parentfd2afa501d4b887fe13966ce57cea84012b8bed7 (diff)
downloadhercules-4843efac1f35011a8490ece2aeabb25be3e480e8.tar.gz
hercules-4843efac1f35011a8490ece2aeabb25be3e480e8.tar.bz2
hercules-4843efac1f35011a8490ece2aeabb25be3e480e8.tar.xz
hercules-4843efac1f35011a8490ece2aeabb25be3e480e8.zip
Renamed RRMODE to REMODE
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15111 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c8
-rw-r--r--src/map/config/Renewal.h2
-rw-r--r--src/map/itemdb.c6
-rw-r--r--src/map/itemdb.h4
-rw-r--r--src/map/mob.c6
-rw-r--r--src/map/party.c6
-rw-r--r--src/map/party.h2
-rw-r--r--src/map/pc.c6
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c70
-rw-r--r--src/map/status.h10
11 files changed, 61 insertions, 61 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index b1232b488..c1faed285 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2092,7 +2092,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
if (!flag.idef || !flag.idef2)
{ //Defense reduction
short vit_def;
-#if RRMODE
+#if REMODE
short def1 = status_get_def(target); //Don't use tstatus->def1 due to skill timer reductions.
#else
signed char def1 = status_get_def(target); //Don't use tstatus->def1 due to skill timer reductions.
@@ -2704,7 +2704,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
break;
default:
{
- #if RRMODE //Renewal MATK Appliance according to doddler (?title=Renewal_Changes#Upgrade_MATK)
+ #if REMODE //Renewal MATK Appliance according to doddler (?title=Renewal_Changes#Upgrade_MATK)
/**
* min: (weaponMATK+upgradeMATK) * 2 + 1.5 * statusMATK
* max: [weaponMATK+upgradeMATK+(wMatk*wLvl)/10] * 2 + 1.5 * statusMATK
@@ -3025,7 +3025,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
}
if(!flag.imdef){
-#if RRMODE
+#if REMODE
short mdef = tstatus->mdef;
#else
char mdef = tstatus->mdef;
@@ -3041,7 +3041,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
//mdef2-= mdef2* i/100;
}
}
- #if RRMODE
+ #if REMODE
/**
* RE MDEF Reduction (from doddler:?title=Renewal_Changes#MDEF)
* Damage from magic = Magic Attack * 111.5/(111.5+eMDEF)
diff --git a/src/map/config/Renewal.h b/src/map/config/Renewal.h
index a1ab30427..a37959675 100644
--- a/src/map/config/Renewal.h
+++ b/src/map/config/Renewal.h
@@ -18,7 +18,7 @@
* -> Note some features may be enabled/disabled at this file despite this setting being ON
* 0 : renewal support disabled, use original formulas
**/
-#define RRMODE 1
+#define REMODE 1
/**
* Renewal Cast Time
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 3fc0a5704..c71aab5ed 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -801,7 +801,7 @@ static bool itemdb_parse_dbrow(char** str, const char* source, int line, int scr
id->value_buy, id->value_sell, nameid, id->jname);
id->weight = atoi(str[6]);
-#if RRMODE
+#if REMODE
itemdb_rr_split_atoi(str[7],&id->atk,&id->matk);
#else
id->atk = atoi(str[7]);
@@ -870,7 +870,7 @@ static int itemdb_readdb(void)
/**
* ro-resources inheritance: item_db -> item_db_re -> item_db2 (user customs)
**/
-#if RRMODE
+#if REMODE
const char* filename[] = { "item_db.txt","item_db_re.txt","item_db2.txt" };
#else
const char* filename[] = { "item_db.txt","item_db2.txt" };
@@ -986,7 +986,7 @@ static int itemdb_readdb(void)
*======================================*/
static int itemdb_read_sqldb(void)
{
-#if RRMODE
+#if REMODE
const char* item_db_name[] = { item_db_db, item_db_re_db, item_db2_db };
#else
const char* item_db_name[] = { item_db_db, item_db2_db };
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 801b81be8..f2444cef1 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -5,7 +5,7 @@
#define _ITEMDB_H_
#include "../common/mmo.h" // ITEM_NAME_LENGTH
-#include "map.h" //RRMODE
+#include "map.h" //REMODE
#define MAX_RANDITEM 11000
@@ -56,7 +56,7 @@ struct item_data {
int equip;
int weight;
int atk;
-#if RRMODE
+#if REMODE
int matk;//[RRInd] -- used in RE for matk
#endif
int def;
diff --git a/src/map/mob.c b/src/map/mob.c
index df547c77d..ec192b311 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2164,7 +2164,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(base_exp || job_exp)
{
if( md->dmglog[i].flag != MDLF_PET || battle_config.pet_attack_exp_to_master ) {
-#if RRMODE
+#if REMODE
party_renewal_exp_mod(&base_exp,&job_exp,tmpsd[i]->status.base_level,md->level);
#endif
pc_gainexp(tmpsd[i], &md->bl, base_exp, job_exp, false);
@@ -2189,7 +2189,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
struct item_drop_list *dlist = ers_alloc(item_drop_list_ers, struct item_drop_list);
struct item_drop *ditem;
int drop_rate;
-#if RRMODE
+#if REMODE
int drop_modifier = mvp_sd ? party_renewal_drop_mod(mvp_sd->status.base_level - md->level) :
second_sd ? party_renewal_drop_mod(second_sd->status.base_level - md->level) :
third_sd ? party_renewal_drop_mod(third_sd->status.base_level - md->level) : 100;
@@ -2235,7 +2235,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
// Increase drop rate if user has SC_ITEMBOOST
if (sd && sd->sc.data[SC_ITEMBOOST]) // now rig the drop rate to never be over 90% unless it is originally >90%.
drop_rate = max(drop_rate,cap_value((int)(0.5+drop_rate*(sd->sc.data[SC_ITEMBOOST]->val1)/100.),0,9000));
-#if RRMODE
+#if REMODE
if( drop_modifier != 100 )
drop_rate = drop_rate * drop_modifier / 100;
#endif
diff --git a/src/map/party.c b/src/map/party.c
index a8a524046..b3b55f93f 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -917,7 +917,7 @@ int party_send_xy_clear(struct party_data *p)
}
return 0;
}
-#if RRMODE
+#if REMODE
/**
* Renewal Drop Earning Modifier
**/
@@ -972,7 +972,7 @@ int party_exp_share(struct party_data* p, struct block_list* src, unsigned int b
{
struct map_session_data* sd[MAX_PARTY];
unsigned int i, c;
-#if RRMODE
+#if REMODE
int src_lvl = status_get_lv(src);
#endif
nullpo_ret(p);
@@ -1002,7 +1002,7 @@ int party_exp_share(struct party_data* p, struct block_list* src, unsigned int b
}
for (i = 0; i < c; i++) {
-#if RRMODE
+#if REMODE
party_renewal_exp_mod(&base_exp,&job_exp,sd[i]->status.base_level,src_lvl);
#endif
pc_gainexp(sd[i], src, base_exp, job_exp, false);
diff --git a/src/map/party.h b/src/map/party.h
index 4918d9a3a..4a19c6565 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -92,7 +92,7 @@ void party_booking_update(struct map_session_data *sd, short* job);
void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
bool party_booking_delete(struct map_session_data *sd);
-#if RRMODE
+#if REMODE
void party_renewal_exp_mod(unsigned int *base_exp, unsigned int *job_exp, int lvl, int moblvl);
int party_renewal_drop_mod(int diff);
#endif
diff --git a/src/map/pc.c b/src/map/pc.c
index 2d27f194e..82694a792 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5228,7 +5228,7 @@ int pc_need_status_point(struct map_session_data* sd, int type, int val)
swap(low, high);
for ( ; low < high; low++ )
-#if RRMODE //Renewal Stat Cost Formula
+#if REMODE //Renewal Stat Cost Formula
sp += (low < 100) ? (2 + (low - 1) / 10) : (16 + 4 * ((low - 100) / 5));
#else
sp += ( 1 + (low + 9) / 10 );
@@ -8250,7 +8250,7 @@ int pc_readdb(void)
// ƒXƒLƒ‹ƒcƒŠ?
memset(statp,0,sizeof(statp));
i=1;
-#if RRMODE
+#if REMODE
sprintf(line, "%s/statpoint_renewal.txt", db_path);
#else
sprintf(line, "%s/statpoint.txt", db_path);
@@ -8273,7 +8273,7 @@ int pc_readdb(void)
i++;
}
fclose(fp);
- #if RRMODE
+ #if REMODE
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","statpoint_renewal.txt");
#else
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","statpoint.txt");
diff --git a/src/map/skill.c b/src/map/skill.c
index c8de8e07b..44eeafd76 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -352,7 +352,7 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, int skill
default:
if (skill_lv >= battle_config.max_heal_lv)
return battle_config.max_heal;
- #if RRMODE
+ #if REMODE
/**
* Renewal Heal Formula (from Doddler)
* TODO: whats that( 1+ %Modifier / 100 ) ? currently using 'x1' (100/100) until found out
diff --git a/src/map/status.c b/src/map/status.c
index 8114362c4..7adc96adc 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -56,7 +56,7 @@ static int refinebonus[MAX_REFINE_BONUS][3]; // Έ˜Bƒ{[ƒiƒXƒe[ƒuƒ‹(refine_db.t
int percentrefinery[5][MAX_REFINE+1]; // Έ˜B¬Œχ—¦(refine_db.txt)
static int atkmods[3][MAX_WEAPON_TYPE]; // •ŠνATKƒTƒCƒYC³(size_fix.txt)
static char job_bonus[CLASS_COUNT][MAX_LEVEL];
-#if RRMODE
+#if REMODE
enum {
SHIELD_ASPD,
RE_JOB_DB_MAX,
@@ -1537,7 +1537,7 @@ int status_base_amotion_pc(struct map_session_data* sd, struct status_data* stat
// raw delay adjustment from bAspd bonus
amotion+= sd->aspd_add;
-#if RRMODE
+#if REMODE
/**
* Bearing a shield decreases your ASPD by a fixed value depending on your class
**/
@@ -1597,20 +1597,20 @@ static unsigned short status_base_atk(const struct block_list *bl, const struct
static inline unsigned short status_base_matk_max(const struct status_data* status)
{
- #if RRMODE
+ #if REMODE
return status->matk_max;//In RE maximum MATK signs weapon matk, which we store in this var
#else //Original Max MATK Formula
return status->int_+(status->int_/5)*(status->int_/5);
#endif
}
-#if RRMODE
+#if REMODE
static inline unsigned short status_base_matk_min(const struct status_data* status, int lvl)
#else
static inline unsigned short status_base_matk_min(const struct status_data* status)
#endif
{
- #if RRMODE //Renewal MATK Formula
+ #if REMODE //Renewal MATK Formula
return status->int_+(status->int_/2)+(status->dex/5)+(status->luk/3)+(lvl/4);
#else //Original Min MATK Formula
return status->int_+(status->int_/7)*(status->int_/7);
@@ -1627,14 +1627,14 @@ void status_calc_misc(struct block_list *bl, struct status_data *status, int lev
status->hit = status->flee =
status->def2 = status->mdef2 =
status->cri = status->flee2 = 0;
-#if RRMODE
+#if REMODE
status->matk_min = status_base_matk_min(status, level);
#else
status->matk_min = status_base_matk_min(status);
#endif
status->matk_max = status_base_matk_max(status);
-#if RRMODE //Renewal Formulas
+#if REMODE //Renewal Formulas
status->hit += level + status->dex;//base level + ( every 1 dex = +1 hit )
status->hit += status->luk / 3;//every 3 luk = +1 hit
status->flee += level + status->agi;//base level + ( every 1 agi = +1 flee )
@@ -1668,7 +1668,7 @@ void status_calc_misc(struct block_list *bl, struct status_data *status, int lev
status->batk = cap_value(temp, 0, USHRT_MAX);
} else
status->batk = status_base_atk(bl, status);
-#if RRMODE //Renewal ATK Bonus Formula (after atk is calculated)
+#if REMODE //Renewal ATK Bonus Formula (after atk is calculated)
status->batk += status->luk / 3;//every 3 luk = +1ATK
status->batk += level / 4;//every 4 levels = +1 ATK
#endif
@@ -1982,7 +1982,7 @@ static unsigned int status_base_pc_maxsp(struct map_session_data* sd, struct sta
return val;
}
-#if RRMODE
+#if REMODE
/**
* Renewal Absolute Bonus to be applied after all bonuses were applied (so % bonuses on say, skills, don't affect them)
**/
@@ -2230,7 +2230,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
}
wa->atk += sd->inventory_data[index]->atk;
wa->atk2 = (r=sd->status.inventory[index].refine)*refinebonus[wlv][0];
- #if RRMODE
+ #if REMODE
/**
* in RE matk_max is used as the weapon's matk.
* += is used so that two-wield weapons (in the case of, say, sinx) bonus stack.
@@ -2608,13 +2608,13 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
sd->def_rate = 0;
if(sd->def_rate != 100) {
i = status->def * sd->def_rate/100;
-#if RRMODE
+#if REMODE
status->def = cap_value(i, SHRT_MIN, SHRT_MAX);
#else
status->def = cap_value(i, CHAR_MIN, CHAR_MAX);
#endif
}
-#if RRMODE == 0
+#if REMODE == 0
/**
* The following setting does not affect Renewal Mode
**/
@@ -2631,13 +2631,13 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
sd->mdef_rate = 0;
if(sd->mdef_rate != 100) {
i = status->mdef * sd->mdef_rate/100;
-#if RRMODE
+#if REMODE
status->mdef = cap_value(i, SHRT_MIN, SHRT_MAX);
#else
status->mdef = cap_value(i, CHAR_MIN, CHAR_MAX);
#endif
}
-#if RRMODE == 0
+#if REMODE == 0
/**
* The following setting does not affect Renewal Mode
**/
@@ -2879,7 +2879,7 @@ int status_calc_homunculus_(struct homun_data *hd, bool first)
status->adelay = status->amotion; //It seems adelay = amotion for Homunculus.
status_calc_misc(&hd->bl, status, hom->level);
-#if RRMODE
+#if REMODE
/**
* In RE Mode matk_max is used as source of weaponMATK, but homuns don't have it -- so we swap the values here.
**/
@@ -2902,13 +2902,13 @@ static signed short status_calc_hit(struct block_list *,struct status_change *,i
static signed short status_calc_critical(struct block_list *,struct status_change *,int);
static signed short status_calc_flee(struct block_list *,struct status_change *,int);
static signed short status_calc_flee2(struct block_list *,struct status_change *,int);
-#if RRMODE
+#if REMODE
static short status_calc_def(struct block_list *bl, struct status_change *sc, int);
#else
static signed char status_calc_def(struct block_list *,struct status_change *,int);
#endif
static signed short status_calc_def2(struct block_list *,struct status_change *,int);
-#if RRMODE
+#if REMODE
static short status_calc_mdef(struct block_list *bl, struct status_change *sc, int);
#else
static signed char status_calc_mdef(struct block_list *,struct status_change *,int);
@@ -3345,7 +3345,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
if(flag&SCB_MATK) {
//New matk
- #if RRMODE
+ #if REMODE
status->matk_min = status_base_matk_min(status,status_get_lv(bl));
#else
status->matk_min = status_base_matk_min(status);
@@ -3355,14 +3355,14 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
if( bl->type&BL_PC && sd->matk_rate != 100 )
{
//Bonuses from previous matk
- #if RRMODE == 0 //Only changed in non-re [RRInd]
+ #if REMODE == 0 //Only changed in non-re [RRInd]
status->matk_max = status->matk_max * sd->matk_rate/100;
#endif
status->matk_min = status->matk_min * sd->matk_rate/100;
}
status->matk_min = status_calc_matk(bl, sc, status->matk_min);
- #if RRMODE == 0 //Only changed in non-re [RRInd]
+ #if REMODE == 0 //Only changed in non-re [RRInd]
status->matk_max = status_calc_matk(bl, sc, status->matk_max);
#endif
@@ -3445,7 +3445,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
status->dmotion = status_calc_dmotion(bl, sc, b_status->dmotion);
}
}
-#if RRMODE
+#if REMODE
status_renewal_postcalc(status,flag);
#endif
if(flag&(SCB_VIT|SCB_MAXHP|SCB_INT|SCB_MAXSP) && bl->type&BL_REGEN)
@@ -4065,14 +4065,14 @@ static signed short status_calc_flee2(struct block_list *bl, struct status_chang
return (short)cap_value(flee2,10,SHRT_MAX);
}
-#if RRMODE
+#if REMODE
static short status_calc_def(struct block_list *bl, struct status_change *sc, int def)
#else
static signed char status_calc_def(struct block_list *bl, struct status_change *sc, int def)
#endif
{
if(!sc || !sc->count)
-#if RRMODE
+#if REMODE
return (short)cap_value(def,SHRT_MIN,SHRT_MAX);
#else
return (signed char)cap_value(def,CHAR_MIN,CHAR_MAX);
@@ -4131,7 +4131,7 @@ static signed short status_calc_flee2(struct block_list *bl, struct status_chang
def -= def * sc->data[SC_ROCK_CRUSHER]->val2 / 100;
if( sc->data[SC_POWER_OF_GAIA] )
def += def * sc->data[SC_POWER_OF_GAIA]->val2 / 100;
-#if RRMODE
+#if REMODE
return (short)cap_value(def,SHRT_MIN,SHRT_MAX);
#else
return (signed char)cap_value(def,CHAR_MIN,CHAR_MAX);
@@ -4184,14 +4184,14 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
return (short)cap_value(def2,1,SHRT_MAX);
}
-#if RRMODE
+#if REMODE
static short status_calc_mdef(struct block_list *bl, struct status_change *sc, int mdef)
#else
static signed char status_calc_mdef(struct block_list *bl, struct status_change *sc, int mdef)
#endif
{
if(!sc || !sc->count)
-#if RRMODE
+#if REMODE
return (short)cap_value(mdef,SHRT_MIN,SHRT_MAX);
#else
return (signed char)cap_value(mdef,CHAR_MIN,CHAR_MAX);
@@ -4226,7 +4226,7 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
if(sc->data[SC_WATER_BARRIER])
mdef += sc->data[SC_WATER_BARRIER]->val2;
-#if RRMODE
+#if REMODE
return (short)cap_value(mdef,SHRT_MIN,SHRT_MAX);
#else
return (signed char)cap_value(mdef,CHAR_MIN,CHAR_MAX);
@@ -4414,7 +4414,7 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
/// Note that the scale of aspd_rate is 1000 = 100%.
static short status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int aspd_rate)
{
-#if RRMODE == 0
+#if REMODE == 0
/**
* this variable is not used unless in non-RE
**/
@@ -4488,7 +4488,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
else if(sc->data[SC_MADNESSCANCEL])
aspd_rate -= 200;
}
-#if RRMODE == 0
+#if REMODE == 0
/**
* in RE they give a fixed boost -- we do so along SERVICE4U in status_base_amotion_pc
**/
@@ -4786,7 +4786,7 @@ struct status_data *status_get_base_status(struct block_list *bl)
return NULL;
}
}
-#if RRMODE
+#if REMODE
short status_get_def(struct block_list *bl)
#else
signed char status_get_def(struct block_list *bl)
@@ -4798,7 +4798,7 @@ struct status_data *status_get_base_status(struct block_list *bl)
ud = unit_bl2ud(bl);
if (ud && ud->skilltimer != INVALID_TIMER)
def -= def * skill_get_castdef(ud->skillid)/100;
-#if RRMODE
+#if REMODE
return cap_value(def, SHRT_MIN, SHRT_MAX);
#else
return cap_value(def, CHAR_MIN, CHAR_MAX);
@@ -6076,7 +6076,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_EXPLOSIONSPIRITS:
val2 = 75 + 25*val1; //Cri bonus
break;
-#if RRMODE == 0
+#if REMODE == 0
/**
* Only in non-RE it's var is changed
**/
@@ -9410,7 +9410,7 @@ static int status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_
* size_fix.txt - size adjustment table for weapons
* refine_db.txt - refining data table
*------------------------------------------*/
-#if RRMODE
+#if REMODE
static bool status_readdb_job_re(char* fields[], int columns, int current) {
int idx, class_;
unsigned int i;
@@ -9514,7 +9514,7 @@ int status_readdb(void)
memset(hp_coefficient2, 0, sizeof(hp_coefficient2));
memset(sp_coefficient, 0, sizeof(sp_coefficient));
memset(aspd_base, 0, sizeof(aspd_base));
-#if RRMODE
+#if REMODE
memset(re_job_db, 0, sizeof(re_job_db));
#endif
// job_db2.txt
@@ -9543,7 +9543,7 @@ int status_readdb(void)
sv_readdb(db_path, "size_fix.txt", ',', MAX_WEAPON_TYPE, MAX_WEAPON_TYPE, ARRAYLENGTH(atkmods), &status_readdb_sizefix);
sv_readdb(db_path, "refine_db.txt", ',', 3+MAX_REFINE+1, 3+MAX_REFINE+1, ARRAYLENGTH(percentrefinery), &status_readdb_refine);
-#if RRMODE
+#if REMODE
sv_readdb(db_path, "re_job_db.txt", ',', 1+RE_JOB_DB_MAX, 1+RE_JOB_DB_MAX, -1, &status_readdb_job_re);
#endif
diff --git a/src/map/status.h b/src/map/status.h
index 27d60b5a9..01ef0d4ea 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1362,7 +1362,7 @@ struct status_data {
short
hit, flee, cri, flee2,
def2, mdef2,
-#if RRMODE
+#if REMODE
/**
* In RE def and mdef can go over 127 (signed char) limit, so in RE mode we use short
**/
@@ -1371,14 +1371,14 @@ struct status_data {
aspd_rate;
unsigned char
def_ele, ele_lv,
-#if RRMODE
+#if REMODE
/**
* in RE weapon level is used in several areas, keeping it here saves performance
**/
wlv,
#endif
size, race;
-#if RRMODE == 0
+#if REMODE == 0
/**
* In NON-RE def and mdef are not required to be short, so we keep it signed char (ancient-default)
**/
@@ -1494,7 +1494,7 @@ int status_get_lv(struct block_list *bl);
#define status_get_luk(bl) status_get_status_data(bl)->luk
#define status_get_hit(bl) status_get_status_data(bl)->hit
#define status_get_flee(bl) status_get_status_data(bl)->flee
-#if RRMODE
+#if REMODE
short status_get_def(struct block_list *bl);
#else
signed char status_get_def(struct block_list *bl);
@@ -1524,7 +1524,7 @@ unsigned char status_calc_attack_element(struct block_list *bl, struct status_ch
#define status_get_race(bl) status_get_status_data(bl)->race
#define status_get_size(bl) status_get_status_data(bl)->size
#define status_get_mode(bl) status_get_status_data(bl)->mode
-#if RRMODE
+#if REMODE
/**
* in RE weapon level is used in several areas, keeping it here saves performance
**/