diff options
| author | Haru <haru@dotalux.com> | 2017-11-04 21:16:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-04 21:16:03 +0100 |
| commit | 41f3237e4537d7105fb47d56b455d31cf33c155c (patch) | |
| tree | be03ffc4b7ad3e54da03cb8f9918516a6c3fc6d6 /src/map/npc.c | |
| parent | 94a8ddedf7307aab1452fbd0da80d3b8b254eaf1 (diff) | |
| parent | 3e03556e510feb34b6f590574cd3025ef54739a6 (diff) | |
| download | hercules-41f3237e4537d7105fb47d56b455d31cf33c155c.tar.gz hercules-41f3237e4537d7105fb47d56b455d31cf33c155c.tar.bz2 hercules-41f3237e4537d7105fb47d56b455d31cf33c155c.tar.xz hercules-41f3237e4537d7105fb47d56b455d31cf33c155c.zip | |
Merge pull request #1889 from 4144/fixpackets
Fix boss flag and add 2017-10-25 client packets
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index ecf7f878f..de5335302 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3843,7 +3843,12 @@ const char *npc_parse_mob(const char *w1, const char *w2, const char *w3, const memset(&mobspawn, 0, sizeof(struct spawn_data)); - mobspawn.state.boss = (strcmp(w2,"boss_monster") == 0 ? 1 : 0); + if (strcmp(w2, "boss_monster") == 0) + mobspawn.state.boss = BTYPE_MVP; + else if (strcmp(w2, "miniboss_monster") == 0) + mobspawn.state.boss = BTYPE_BOSS; + else + mobspawn.state.boss = BTYPE_NONE; // w1=<map name>,<x>,<y>,<xs>,<ys> // w3=<mob name>{,<mob level>} @@ -4662,7 +4667,7 @@ int npc_parsesrcfile(const char* filepath, bool runOnInit) { { p = npc->parse_duplicate(w1,w2,w3,w4, p, buffer, filepath, (runOnInit?NPO_ONINIT:NPO_NONE), &success); } - else if( (strcmp(w2,"monster") == 0 || strcmp(w2,"boss_monster") == 0) ) + else if (strcmp(w2,"monster") == 0 || strcmp(w2,"boss_monster") == 0 || strcmp(w2,"miniboss_monster") == 0) { p = npc->parse_mob(w1, w2, w3, w4, p, buffer, filepath, &success); } |