summaryrefslogtreecommitdiff
path: root/src/map/map.hpp
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2019-08-28 17:48:49 +0000
committergumi <git@gumi.ca>2019-08-28 17:51:21 +0000
commitb9be7649ea62189bcae67fa94babc438852b9777 (patch)
tree8160f147116bc37cc556f49203f5e4e98fe34566 /src/map/map.hpp
parent543098e789f6fff900651990a16fdab17f249ea2 (diff)
downloadtmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.gz
tmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.bz2
tmwa-b9be7649ea62189bcae67fa94babc438852b9777.tar.xz
tmwa-b9be7649ea62189bcae67fa94babc438852b9777.zip
Revert the changes from the last 2 releases
battle.cpp is very messy and full of bugs
Diffstat (limited to 'src/map/map.hpp')
-rw-r--r--src/map/map.hpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 42ca151..eddbfad 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -482,8 +482,7 @@ struct mob_data : block_list
struct mob_skill *skillidx;
std::unique_ptr<tick_t[]> skilldelayup; // [MAX_MOBSKILL];
LevelElement def_ele;
- BlockId parent_id; // monster that spawned this mob
- BlockId master_id; // player that owns the parent
+ BlockId master_id;
BlockId last_master_id;
int master_dist;
int exclusion_src, exclusion_party;