summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-23 14:00:22 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-23 14:00:22 +0000
commit3194533c578cb83b3c3b5e1fd2f9f151db2e53bc (patch)
treea808d89bcf0972108244dd0b63b40d24eaadf333 /src/map
parent265ee7b10968a5368f80ccb47f5b8b8ce5492d89 (diff)
downloadhercules-3194533c578cb83b3c3b5e1fd2f9f151db2e53bc.tar.gz
hercules-3194533c578cb83b3c3b5e1fd2f9f151db2e53bc.tar.bz2
hercules-3194533c578cb83b3c3b5e1fd2f9f151db2e53bc.tar.xz
hercules-3194533c578cb83b3c3b5e1fd2f9f151db2e53bc.zip
- Moved the homunculus setting from pet.conf to homunc.conf
- Fixed homuncs not triggering land spells if they are spawned on top of them and hom_setting&0x2 is not set to make them bypass them. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9696 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/trade.c1
3 files changed, 3 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 951dbcc5c..aec804b3d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3849,7 +3849,7 @@ static const struct battle_data_int {
{ "mob_remove_delay", &battle_config.mob_remove_delay },
{ "sg_miracle_skill_min_duration", &battle_config.sg_miracle_skill_duration_min },
{ "sg_miracle_skill_max_duration", &battle_config.sg_miracle_skill_duration_max },
- { "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate }, //[orn]
+ { "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate }, //[orn]
};
int battle_set_value(char *w1, char *w2) {
diff --git a/src/map/clif.c b/src/map/clif.c
index f5fad25e4..355d001fd 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8292,8 +8292,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
//Homunc mimic their master's speed on each map change. [Skotlex]
if (battle_config.hom_setting&0x8)
status_calc_bl(&sd->hd->bl, SCB_SPEED);
-// Since hom is inmune to land effects, unneeded.
-// skill_unit_move(&sd->hd->bl,gettick(),1);
+ if (!battle_config.hom_setting&0x2)
+ skill_unit_move(&sd->hd->bl,gettick(),1);
}
if(sd->state.connect_new) {
diff --git a/src/map/trade.c b/src/map/trade.c
index 216692752..f6c587ddb 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -17,7 +17,6 @@
#include "intif.h"
#include "atcommand.h"
#include "log.h"
-#include "../common/malloc.h"
//Max distance from traders to enable a trade to take place.
#define TRADE_DISTANCE 2