summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-19 21:19:18 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-19 21:19:18 +0300
commit9bd03cf313038f9221a9661973ebf29ef6d4654c (patch)
tree4792251df40119472a0879db77d1c07df3548e45 /src
parent98f4fcb5ba1819ace7cfe6ad4ac9fdc4e7754ba9 (diff)
downloadhercules-9bd03cf313038f9221a9661973ebf29ef6d4654c.tar.gz
hercules-9bd03cf313038f9221a9661973ebf29ef6d4654c.tar.bz2
hercules-9bd03cf313038f9221a9661973ebf29ef6d4654c.tar.xz
hercules-9bd03cf313038f9221a9661973ebf29ef6d4654c.zip
Remove some unused macroses. Left macroses in socket.c
Diffstat (limited to 'src')
-rw-r--r--src/char/int_storage.c2
-rw-r--r--src/map/battle.c4
2 files changed, 0 insertions, 6 deletions
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 9884cc6d1..30647233b 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -37,8 +37,6 @@
#include <stdio.h>
#include <stdlib.h>
-#define STORAGE_MEMINC 16
-
struct inter_storage_interface inter_storage_s;
struct inter_storage_interface *inter_storage;
diff --git a/src/map/battle.c b/src/map/battle.c
index 44adef051..4cf9a5b54 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4783,12 +4783,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
//Assuming that 99% of the cases we will not need to check for the flag.rh... we don't.
//ATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc
#define ATK_RATE( a ) do { int64 temp__ = (a); wd.damage= wd.damage*temp__/100 ; if(flag.lh) wd.damage2= wd.damage2*temp__/100; } while(0)
-#define ATK_RATE2( a , b ) do { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; } while(0)
#define ATK_RATER(a) ( wd.damage = wd.damage*(a)/100 )
#define ATK_RATEL(a) ( wd.damage2 = wd.damage2*(a)/100 )
//Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage
#define ATK_ADDRATE( a ) do { int64 temp__ = (a); wd.damage+= wd.damage*temp__/100; if(flag.lh) wd.damage2+= wd.damage2*temp__/100; } while(0)
-#define ATK_ADDRATE2( a , b ) do { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; } while(0)
//Adds an absolute value to damage. 100 = +100 damage
#define ATK_ADD( a ) do { int64 temp__ = (a); wd.damage += temp__; if (flag.lh) wd.damage2 += temp__; } while(0)
#define ATK_ADD2( a , b ) do { wd.damage += (a); if (flag.lh) wd.damage2 += (b); } while(0)
@@ -6373,11 +6371,9 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
return wd.dmg_lv;
}
#undef ATK_RATE
-#undef ATK_RATE2
#undef ATK_RATER
#undef ATK_RATEL
#undef ATK_ADDRATE
-#undef ATK_ADDRATE2
#undef ATK_ADD
#undef ATK_ADD2
#undef GET_NORMAL_ATTACK