summaryrefslogtreecommitdiff
path: root/src/map/battle.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-03-24 15:10:40 -0400
committermekolat <mekolat@users.noreply.github.com>2016-04-15 11:47:28 -0400
commit2a581450a6ff87c5a183be3855e68b3f2e1b53f3 (patch)
tree7caf4a3c16fa11b92d5cbaf5881d0829aa75b9dc /src/map/battle.cpp
parent6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8 (diff)
downloadtmwa-2a581450a6ff87c5a183be3855e68b3f2e1b53f3.tar.gz
tmwa-2a581450a6ff87c5a183be3855e68b3f2e1b53f3.tar.bz2
tmwa-2a581450a6ff87c5a183be3855e68b3f2e1b53f3.tar.xz
tmwa-2a581450a6ff87c5a183be3855e68b3f2e1b53f3.zip
improvements, cleanup, bug fixes
Diffstat (limited to 'src/map/battle.cpp')
-rw-r--r--src/map/battle.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 554ef14..031b79d 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -85,6 +85,8 @@ Species battle_get_class(dumb_ptr<block_list> bl)
nullpo_retr(Species(), bl);
if (bl->bl_type == BL::MOB)
return bl->is_mob()->mob_class;
+ else if (bl->bl_type == BL::NPC)
+ return bl->is_npc()->npc_class;
else if (bl->bl_type == BL::PC)
return bl->is_player()->status.species;
else