nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

move validations before their first use

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2022-02-25 22:41:21 -08:00
committed by PatR
parent 7f28a79ae6
commit 757139476f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mkobj.c
+3 -1
View File
@@ -2085,7 +2085,7 @@ is_rottable(struct obj *otmp)
void void
place_object(struct obj *otmp, int x, int y) place_object(struct obj *otmp, int x, int y)
{ {
register struct obj *otmp2 = g.level.objects[x][y]; register struct obj *otmp2;
if (!isok(x, y)) { /* validate location */ if (!isok(x, y)) { /* validate location */
void (*func)(const char *, ...) PRINTF_F(1, 2); void (*func)(const char *, ...) PRINTF_F(1, 2);
@@ -2099,6 +2099,8 @@ place_object(struct obj *otmp, int x, int y)
panic("place_object: obj \"%s\" [%d] not free", panic("place_object: obj \"%s\" [%d] not free",
safe_typename(otmp->otyp), otmp->where); safe_typename(otmp->otyp), otmp->where);
otmp2 = g.level.objects[x][y];
obj_no_longer_held(otmp); obj_no_longer_held(otmp);
if (otmp->otyp == BOULDER) { if (otmp->otyp == BOULDER) {
if (!otmp2 || otmp2->otyp != BOULDER) if (!otmp2 || otmp2->otyp != BOULDER)