diff options
| author | Haru <haru@dotalux.com> | 2019-02-11 02:00:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 02:00:58 +0100 |
| commit | 2d8a44b753832610d23678629127369f5db576a3 (patch) | |
| tree | 258e78c458642cc017837f674b0d23255ac49bf4 /src/map/npc.c | |
| parent | 68126f7d762e001b1a34cfe5e0a340db9c7d9da8 (diff) | |
| parent | dbaa9ac111496fdfde9948d5cb15a0b052843b3f (diff) | |
| download | hercules-2d8a44b753832610d23678629127369f5db576a3.tar.gz hercules-2d8a44b753832610d23678629127369f5db576a3.tar.bz2 hercules-2d8a44b753832610d23678629127369f5db576a3.tar.xz hercules-2d8a44b753832610d23678629127369f5db576a3.zip | |
Merge pull request #2364 from 4144/shortfixes
Change different variables types short to int
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 7e1dab1b2..61341744d 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2961,7 +2961,7 @@ static bool npc_viewisid(const char *viewid) * @param class_ The NPC view class. * @return A pointer to the created NPC data (ownership passed to the caller). */ -static struct npc_data *npc_create_npc(enum npc_subtype subtype, int m, int x, int y, uint8 dir, int16 class_) +static struct npc_data *npc_create_npc(enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_) { struct npc_data *nd; @@ -3918,7 +3918,7 @@ static void npc_setdisplayname(struct npc_data *nd, const char *newname) /// /// @param nd Target npc /// @param class_ New display class -static void npc_setclass(struct npc_data *nd, short class_) +static void npc_setclass(struct npc_data *nd, int class_) { nullpo_retv(nd); @@ -4199,7 +4199,7 @@ static const char *npc_parse_mob(const char *w1, const char *w2, const char *w3, mobspawn.num = (unsigned short)num; mobspawn.active = 0; - mobspawn.class_ = (short) class_; + mobspawn.class_ = class_; mobspawn.x = (unsigned short)x; mobspawn.y = (unsigned short)y; mobspawn.xs = (signed short)xs; |