Browse Source

Follow up 72cb55470b160b4a8aae8d64462ac29ab1e44d04
* Added/correcting some #ifdef ADJUST_SKILL_DAMAGE checks

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

Cydh Ramdh 10 years ago
parent
commit
f5ddcc55f8
3 changed files with 5 additions and 1 deletions
  1. 2 0
      src/map/map.c
  2. 2 0
      src/map/map.h
  3. 1 1
      src/map/skill.c

+ 2 - 0
src/map/map.c

@@ -112,7 +112,9 @@ int agit_flag = 0;
 int agit2_flag = 0;
 int agit2_flag = 0;
 int night_flag = 0; // 0=day, 1=night [Yor]
 int night_flag = 0; // 0=day, 1=night [Yor]
 
 
+#ifdef ADJUST_SKILL_DAMAGE
 struct eri *map_skill_damage_ers = NULL;
 struct eri *map_skill_damage_ers = NULL;
+#endif
 
 
 struct charid_request {
 struct charid_request {
 	struct charid_request* next;
 	struct charid_request* next;

+ 2 - 0
src/map/map.h

@@ -898,8 +898,10 @@ void do_reconnect_map(void); //Invoked on map-char reconnection [Skotlex]
 void map_addmap2db(struct map_data *m);
 void map_addmap2db(struct map_data *m);
 void map_removemapdb(struct map_data *m);
 void map_removemapdb(struct map_data *m);
 
 
+#ifdef ADJUST_SKILL_DAMAGE
 void map_skill_damage_free(struct map_data *m);
 void map_skill_damage_free(struct map_data *m);
 void map_skill_damage_add(struct map_data *m, uint16 skill_id, int pc, int mob, int boss, int other, uint8 caster);
 void map_skill_damage_add(struct map_data *m, uint16 skill_id, int pc, int mob, int boss, int other, uint8 caster);
+#endif
 
 
 #define CHK_ELEMENT(ele) ((ele) > ELE_NONE && (ele) < ELE_MAX) /// Check valid Element
 #define CHK_ELEMENT(ele) ((ele) > ELE_NONE && (ele) < ELE_MAX) /// Check valid Element
 #define CHK_ELEMENT_LEVEL(lv) ((lv) >= 1 && (lv) <= MAX_ELE_LEVEL) /// Check valid element level
 #define CHK_ELEMENT_LEVEL(lv) ((lv) >= 1 && (lv) <= MAX_ELE_LEVEL) /// Check valid element level

+ 1 - 1
src/map/skill.c

@@ -20450,11 +20450,11 @@ static bool skill_parse_row_changematerialdb(char* split[], int columns, int cur
 	return true;
 	return true;
 }
 }
 
 
+#ifdef ADJUST_SKILL_DAMAGE
 /**
 /**
  * Reads skill damage adjustment
  * Reads skill damage adjustment
  * @author [Lilith]
  * @author [Lilith]
  */
  */
-#ifdef ADJUST_SKILL_DAMAGE
 static bool skill_parse_row_skilldamage(char* split[], int columns, int current)
 static bool skill_parse_row_skilldamage(char* split[], int columns, int current)
 {
 {
 	uint16 skill_id = skill_name2id(split[0]), idx;
 	uint16 skill_id = skill_name2id(split[0]), idx;