container groundwork / splitting welded weapons (trunk only)
Some miscellaneous changes preparatory to enhancing the container interface. This also fixes a minor inconsistency in object manipulation: askchain() wouldn't let you split a stack of welded weapons but getobj() would, so you couldn't get rid of part of the stack using 'D' or #loot, but you could with 'd' (and post-3.4.3, with #adjust). Now getobj() will behave like askchain(); if you have 3 cursed daggers welded to your hand, you won't be able to drop 1 or 2 of them anymore.
This commit is contained in:
@@ -616,7 +616,7 @@ E void FDECL(done_in_by, (struct monst *,int));
|
||||
E void VDECL(panic, (const char *,...)) PRINTF_F(1,2);
|
||||
#if !defined(MAKEDEFS_C) && !defined(LEV_LEX_C)
|
||||
E void FDECL(done, (int));
|
||||
E void FDECL(container_contents, (struct obj *,BOOLEAN_P,BOOLEAN_P));
|
||||
E void FDECL(container_contents, (struct obj *,BOOLEAN_P,BOOLEAN_P,BOOLEAN_P));
|
||||
E void FDECL(terminate, (int));
|
||||
E int NDECL(num_genocides);
|
||||
E void FDECL(delayed_killer, (int, int, const char*));
|
||||
@@ -1639,8 +1639,8 @@ E void FDECL(add_valid_menu_class, (int));
|
||||
E boolean FDECL(allow_all, (struct obj *));
|
||||
E boolean FDECL(allow_category, (struct obj *));
|
||||
E boolean FDECL(is_worn_by_type, (struct obj *));
|
||||
#ifdef USE_TRAMPOLI
|
||||
E int FDECL(ck_bag, (struct obj *));
|
||||
#ifdef USE_TRAMPOLI
|
||||
E int FDECL(in_container, (struct obj *));
|
||||
E int FDECL(out_container, (struct obj *));
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user