summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-19 20:33:35 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-19 20:33:35 +0000
commite40f18144353a58e9d433fcba000d862b240e34f (patch)
tree4eb803c146348ebdc37d93b7a2c117a209db5818 /src
parentfcf36ede4febcb956a6685f666e21b64659d38e1 (diff)
downloadhercules-e40f18144353a58e9d433fcba000d862b240e34f.tar.gz
hercules-e40f18144353a58e9d433fcba000d862b240e34f.tar.bz2
hercules-e40f18144353a58e9d433fcba000d862b240e34f.tar.xz
hercules-e40f18144353a58e9d433fcba000d862b240e34f.zip
- Fixed the setting hom_setting not being read at all.
- Minor cleanups git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9525 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/pc.c1
-rw-r--r--src/map/script.c7
3 files changed, 3 insertions, 7 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 766622490..b80861df7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3760,7 +3760,7 @@ static const struct battle_data_short {
{ "debuff_on_logout", &battle_config.debuff_on_logout},
{ "monster_ai", &battle_config.mob_ai},
- { "monster_ai", &battle_config.hom_setting},
+ { "hom_setting", &battle_config.hom_setting},
{ "dynamic_mobs", &battle_config.dynamic_mobs},
{ "mob_remove_damaged", &battle_config.mob_remove_damaged},
{ "show_hp_sp_drain", &battle_config.show_hp_sp_drain}, // [Skotlex]
diff --git a/src/map/pc.c b/src/map/pc.c
index 8ffa54291..f6923a8c2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5770,7 +5770,6 @@ int pc_setcart(struct map_session_data *sd,int type)
pc_setoption(sd,option);
clif_cartlist(sd);
clif_updatestatus(sd,SP_CARTINFO);
- clif_status_change(&sd->bl,SI_INCREASEAGI,0); //0x0c is 12, Increase Agi??
}
else{
pc_setoption(sd,option);
diff --git a/src/map/script.c b/src/map/script.c
index 90a657075..dca64002c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7452,11 +7452,8 @@ int buildin_getmapguildusers(struct script_state *st) {
if (g){
for(i = 0; i < g->max_member; i++)
{
- if (g->member[i].sd )
- {
- if(g->member[i].sd->bl.m == m)
- c++;
- }
+ if (g->member[i].sd && g->member[i].sd->bl.m == m)
+ c++;
}
}