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

Give a hint that containers are looted instead of opened

Browse Source
This commit is contained in:
Pasi Kallinen
2016-06-02 18:11:41 +03:00
parent 8240db3445
commit 984785b13c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+1
View File
@@ -1769,6 +1769,7 @@ E int FDECL(query_objlist, (const char *, struct obj **, int,
menu_item **, int, boolean (*)(OBJ_P))); menu_item **, int, boolean (*)(OBJ_P)));
E struct obj *FDECL(pick_obj, (struct obj *)); E struct obj *FDECL(pick_obj, (struct obj *));
E int NDECL(encumber_msg); E int NDECL(encumber_msg);
E int FDECL(container_at, (int, int, BOOLEAN_P));
E int NDECL(doloot); E int NDECL(doloot);
E boolean FDECL(container_gone, (int (*)(OBJ_P))); E boolean FDECL(container_gone, (int (*)(OBJ_P)));
E boolean NDECL(u_handsy); E boolean NDECL(u_handsy);
src/lock.c
+3
View File
@@ -618,6 +618,9 @@ int x, y;
There("is no obvious way to open the drawbridge."); There("is no obvious way to open the drawbridge.");
else if (portcullis || door->typ == DRAWBRIDGE_DOWN) else if (portcullis || door->typ == DRAWBRIDGE_DOWN)
pline_The("drawbridge is already open."); pline_The("drawbridge is already open.");
else if (container_at(cc.x, cc.y, TRUE))
pline("%s like something lootable over there.",
Blind ? "Feels" : "Seems");
else else
You("%s no door there.", Blind ? "feel" : "see"); You("%s no door there.", Blind ? "feel" : "see");
return res; return res;
src/pickup.c
+1 -2
View File
@@ -39,7 +39,6 @@ STATIC_DCL int FDECL(traditional_loot, (BOOLEAN_P));
STATIC_DCL int FDECL(menu_loot, (int, BOOLEAN_P)); STATIC_DCL int FDECL(menu_loot, (int, BOOLEAN_P));
STATIC_DCL char FDECL(in_or_out_menu, (const char *, struct obj *, BOOLEAN_P, STATIC_DCL char FDECL(in_or_out_menu, (const char *, struct obj *, BOOLEAN_P,
BOOLEAN_P, BOOLEAN_P, BOOLEAN_P)); BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
STATIC_DCL int FDECL(container_at, (int, int, BOOLEAN_P));
STATIC_DCL boolean FDECL(able_to_loot, (int, int, BOOLEAN_P)); STATIC_DCL boolean FDECL(able_to_loot, (int, int, BOOLEAN_P));
STATIC_DCL boolean NDECL(reverse_loot); STATIC_DCL boolean NDECL(reverse_loot);
STATIC_DCL boolean FDECL(mon_beside, (int, int)); STATIC_DCL boolean FDECL(mon_beside, (int, int));
@@ -1513,7 +1512,7 @@ encumber_msg()
} }
/* Is there a container at x,y. Optional: return count of containers at x,y */ /* Is there a container at x,y. Optional: return count of containers at x,y */
STATIC_OVL int int
container_at(x, y, countem) container_at(x, y, countem)
int x, y; int x, y;
boolean countem; boolean countem;