Fixes compile errors on GCC 10.2 (#5631)

* Fixes #5629.
* Removes va_list from nullpo checks.
Thanks to @behelit2!
This commit is contained in:
Aleos
2020-12-17 11:43:18 -05:00
committed by GitHub
parent 8e48188313
commit 626b93e6c6
2 changed files with 0 additions and 6 deletions

View File

@@ -467,7 +467,6 @@ static int instance_npcinit(struct block_list *bl, va_list ap)
struct npc_data* nd;
nullpo_retr(0, bl);
nullpo_retr(0, ap);
nullpo_retr(0, nd = (struct npc_data *)bl);
return npc_instanceinit(nd);
@@ -481,7 +480,6 @@ static int instance_npcdestroy(struct block_list *bl, va_list ap)
struct npc_data* nd;
nullpo_retr(0, bl);
nullpo_retr(0, ap);
nullpo_retr(0, nd = (struct npc_data *)bl);
return npc_instancedestroy(nd);
@@ -495,7 +493,6 @@ static int instance_addnpc_sub(struct block_list *bl, va_list ap)
struct npc_data* nd;
nullpo_retr(0, bl);
nullpo_retr(0, ap);
nullpo_retr(0, nd = (struct npc_data *)bl);
return npc_duplicate4instance(nd, va_arg(ap, int));