summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-08-19 14:54:22 -0300
committerJesusaves <cpntb1@ymail.com>2019-08-19 14:54:22 -0300
commitdd7d9ed813bbba25915200533223931ab3ff0d6a (patch)
treeeafe306cc9dc4726836dd680879c7784d7b89fdb
parent97b6801abb61b12b36593fa0c38cdc7cdac7d413 (diff)
downloadevol-hercules-dd7d9ed813bbba25915200533223931ab3ff0d6a.tar.gz
evol-hercules-dd7d9ed813bbba25915200533223931ab3ff0d6a.tar.bz2
evol-hercules-dd7d9ed813bbba25915200533223931ab3ff0d6a.tar.xz
evol-hercules-dd7d9ed813bbba25915200533223931ab3ff0d6a.zip
Drop support for Monster Collision
-rw-r--r--src/emap/data/mobd.c2
-rw-r--r--src/emap/mob.c4
-rw-r--r--src/emap/struct/mobdext.h2
3 files changed, 8 insertions, 0 deletions
diff --git a/src/emap/data/mobd.c b/src/emap/data/mobd.c
index e11a222..0d2209b 100644
--- a/src/emap/data/mobd.c
+++ b/src/emap/data/mobd.c
@@ -51,8 +51,10 @@ struct MobdExt *mobd_create(void)
data->weaponAttacks[f] = 10000;
for (int f = 0; f < MAX_SKILL_DB; f ++)
data->skillAttacks[f] = 10000;
+ /* Disabled in TMW2
data->collisionDx = -1;
data->collisionDy = -1;
data->collisionMask = 1;
+ */
return data;
}
diff --git a/src/emap/mob.c b/src/emap/mob.c
index fbc75b6..3391620 100644
--- a/src/emap/mob.c
+++ b/src/emap/mob.c
@@ -260,6 +260,7 @@ void emob_read_db_additional_fields_pre(struct mob_db **entryPtr,
}
}
+ /* Disabled in TMW2
if ((tt = libconfig->setting_get_member(*itPtr, "SpawnCollisionSize")))
{
if (config_setting_is_aggregate(tt))
@@ -279,6 +280,7 @@ void emob_read_db_additional_fields_pre(struct mob_db **entryPtr,
if (mob->lookup_const(*itPtr, "SpawnCollisionMask", &i32))
data->collisionMask = i32;
+ */
}
uint32 emob_read_db_mode_sub_post(uint32 retVal,
@@ -296,6 +298,7 @@ uint32 emob_read_db_mode_sub_post(uint32 retVal,
struct mob_data *emob_spawn_dataset_post(struct mob_data *retVal,
struct spawn_data *data __attribute__ ((unused)))
{
+ /* Disabled in TMW2
if (retVal)
{
struct MobdExt *ext = mobd_get_by_mob(retVal);
@@ -314,6 +317,7 @@ struct mob_data *emob_spawn_dataset_post(struct mob_data *retVal,
name);
}
}
+ */
return retVal;
}
diff --git a/src/emap/struct/mobdext.h b/src/emap/struct/mobdext.h
index 24c6f34..119ad3c 100644
--- a/src/emap/struct/mobdext.h
+++ b/src/emap/struct/mobdext.h
@@ -9,9 +9,11 @@ struct MobdExt
int walkMask;
int weaponAttacks[MAX_WEAPON_TYPE];
int skillAttacks[MAX_SKILL_DB];
+ /* Disabled in TMW2
int collisionDx;
int collisionDy;
int collisionMask;
+ */
};
#endif // EVOL_MAP_MOBDEXT