From dd7d9ed813bbba25915200533223931ab3ff0d6a Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 19 Aug 2019 14:54:22 -0300 Subject: Drop support for Monster Collision --- src/emap/data/mobd.c | 2 ++ src/emap/mob.c | 4 ++++ src/emap/struct/mobdext.h | 2 ++ 3 files changed, 8 insertions(+) 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 -- cgit v1.2.3-60-g2f50