summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-13 15:38:23 +0100
committerHaru <haru@dotalux.com>2016-08-19 21:32:26 +0200
commit6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce (patch)
treee4d67ff2bb7e80b6cab693f9ec24dac47b3a27a4 /src/map/battle.h
parentc0e59c874786cdf3bc5863090934b8e18ba0336d (diff)
downloadhercules-6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce.tar.gz
hercules-6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce.tar.bz2
hercules-6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce.tar.xz
hercules-6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce.zip
Ported battle.conf to libconfig
Ported to modern Hercules and cleaned up from Panikon's commits: 44fea0b3cdba6901599265220228ba4359b1f96d, 9cba05bc0811e638bbaaa6cff887d0b2c9872560 Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index e04a713ae..ebfa0e305 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -2,7 +2,7 @@
* This file is part of Hercules.
* http://herc.ws - http://github.com/HerculesWS/Hercules
*
- * Copyright (C) 2012-2015 Hercules Dev Team
+ * Copyright (C) 2012-2016 Hercules Dev Team
* Copyright (C) Athena Dev Teams
*
* Hercules is free software: you can redistribute it and/or modify
@@ -663,10 +663,11 @@ struct battle_interface {
int (*adjust_skill_damage) (int m, unsigned short skill_id);
int64 (*add_mastery) (struct map_session_data *sd,struct block_list *target,int64 dmg,int type);
int (*calc_drain) (int64 damage, int rate, int per);
- /* - battle_config */
- int (*config_read) (const char *cfgName);
+ /* battle_config */
+ bool (*config_read) (const char *filename, bool imported);
void (*config_set_defaults) (void);
- int (*config_set_value) (const char *w1, const char *w2);
+ bool (*config_set_value_sub) (int index, int value);
+ bool (*config_set_value) (const char *param, const char *value);
bool (*config_get_value) (const char *w1, int *value);
void (*config_adjust) (void);
/* ----------------------------------------- */