summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 16:46:19 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 16:46:19 +0000
commitec35f4b8bce178430219c484566a8dceea015221 (patch)
tree8ce50b81edebc57c308a00bccecbe066aa0fdcb0 /src/map/battle.c
parent51079611e59264b02fdbb4beb0d3675cc64618e6 (diff)
downloadhercules-ec35f4b8bce178430219c484566a8dceea015221.tar.gz
hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.bz2
hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.xz
hercules-ec35f4b8bce178430219c484566a8dceea015221.zip
More C/C++ Conformance fixes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1334 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 46d84705c..78d8215ab 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3966,7 +3966,7 @@ int battle_config_switch(const char *str) {
static const struct {
char str[128];
- int *val;
+ void *val;
} battle_data[] = {
{ "warp_point_debug", &battle_config.warp_point_debug },
{ "enemy_critical", &battle_config.enemy_critical },
@@ -4210,7 +4210,7 @@ int battle_set_value(char *w1, char *w2) {
int i;
for(i = 0; i < sizeof(battle_data) / (sizeof(battle_data[0])); i++)
if (strcmpi(w1, battle_data[i].str) == 0) {
- *battle_data[i].val = battle_config_switch(w2);
+ *((unsigned int *) battle_data[i].val) = battle_config_switch(w2);
return 1;
}
return 0;