summaryrefslogtreecommitdiffstats
path: root/rogue/pack.c
diff options
context:
space:
mode:
Diffstat (limited to 'rogue/pack.c')
-rw-r--r--rogue/pack.c96
1 files changed, 45 insertions, 51 deletions
diff --git a/rogue/pack.c b/rogue/pack.c
index 5619d247..ee091384 100644
--- a/rogue/pack.c
+++ b/rogue/pack.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pack.c,v 1.7 2003/08/07 09:37:39 agc Exp $ */
+/* $NetBSD: pack.c,v 1.8 2007/12/27 23:53:00 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)pack.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: pack.c,v 1.7 2003/08/07 09:37:39 agc Exp $");
+__RCSID("$NetBSD: pack.c,v 1.8 2007/12/27 23:53:00 dholland Exp $");
#endif
#endif /* not lint */
@@ -110,18 +110,18 @@ pick_up(row, col, status)
*status = 1;
if (levitate) {
- message("you're floating in the air!", 0);
+ messagef(0, "you're floating in the air!");
return((object *) 0);
}
obj = object_at(&level_objects, row, col);
if (!obj) {
- message("pick_up(): inconsistent", 1);
+ messagef(1, "pick_up(): inconsistent");
return(obj);
}
if ( (obj->what_is == SCROL) &&
(obj->which_kind == SCARE_MONSTER) &&
obj->picked_up) {
- message("the scroll turns to dust as you pick it up", 0);
+ messagef(0, "the scroll turns to dust as you pick it up");
dungeon[row][col] &= (~OBJECT);
vanish(obj, 0, &level_objects);
*status = 0;
@@ -138,7 +138,7 @@ pick_up(row, col, status)
return(obj); /* obj will be free_object()ed in caller */
}
if (pack_count(obj) >= MAX_PACK_COUNT) {
- message("pack too full", 1);
+ messagef(1, "pack too full");
return((object *) 0);
}
dungeon[row][col] &= ~(OBJECT);
@@ -156,29 +156,29 @@ drop()
char desc[DCOLS];
if (dungeon[rogue.row][rogue.col] & (OBJECT | STAIRS | TRAP)) {
- message("there's already something there", 0);
+ messagef(0, "there's already something there");
return;
}
if (!rogue.pack.next_object) {
- message("you have nothing to drop", 0);
+ messagef(0, "you have nothing to drop");
return;
}
if ((ch = pack_letter("drop what?", ALL_OBJECTS)) == CANCEL) {
return;
}
if (!(obj = get_letter_object(ch))) {
- message("no such item.", 0);
+ messagef(0, "no such item.");
return;
}
if (obj->in_use_flags & BEING_WIELDED) {
if (obj->is_cursed) {
- message(curse_message, 0);
+ messagef(0, "%s", curse_message);
return;
}
unwield(rogue.weapon);
} else if (obj->in_use_flags & BEING_WORN) {
if (obj->is_cursed) {
- message(curse_message, 0);
+ messagef(0, "%s", curse_message);
return;
}
mv_aquatars();
@@ -186,7 +186,7 @@ drop()
print_stats(STAT_ARMOR);
} else if (obj->in_use_flags & ON_EITHER_HAND) {
if (obj->is_cursed) {
- message(curse_message, 0);
+ messagef(0, "%s", curse_message);
return;
}
un_put_on(obj);
@@ -205,9 +205,8 @@ drop()
take_from_pack(obj, &rogue.pack);
}
place_at(obj, rogue.row, rogue.col);
- (void) strcpy(desc, "dropped ");
- get_desc(obj, desc+8);
- message(desc, 0);
+ get_desc(obj, desc, sizeof(desc));
+ messagef(0, "dropped %s", desc);
(void) reg_move();
}
@@ -257,7 +256,9 @@ next_avail_ichar()
}
obj = rogue.pack.next_object;
while (obj) {
- ichars[(obj->ichar - 'a')] = 1;
+ if (obj->ichar >= 'a' && obj->ichar <= 'z') {
+ ichars[(obj->ichar - 'a')] = 1;
+ }
obj = obj->next_object;
}
for (i = 0; i < 26; i++) {
@@ -283,12 +284,12 @@ pack_letter(prompt, mask)
unsigned short tmask = mask;
if (!mask_pack(&rogue.pack, mask)) {
- message("nothing appropriate", 0);
+ messagef(0, "nothing appropriate");
return(CANCEL);
}
for (;;) {
- message(prompt, 0);
+ messagef(0, "%s", prompt);
for (;;) {
ch = rgetchar();
@@ -320,19 +321,18 @@ take_off()
if (rogue.armor) {
if (rogue.armor->is_cursed) {
- message(curse_message, 0);
+ messagef(0, "%s", curse_message);
} else {
mv_aquatars();
obj = rogue.armor;
unwear(rogue.armor);
- (void) strcpy(desc, "was wearing ");
- get_desc(obj, desc+12);
- message(desc, 0);
+ get_desc(obj, desc, sizeof(desc));
+ messagef(0, "was wearing %s", desc);
print_stats(STAT_ARMOR);
(void) reg_move();
}
} else {
- message("not wearing any", 0);
+ messagef(0, "not wearing any");
}
}
@@ -344,7 +344,7 @@ wear()
char desc[DCOLS];
if (rogue.armor) {
- message("your already wearing some", 0);
+ messagef(0, "you're already wearing some");
return;
}
ch = pack_letter("wear what?", ARMOR);
@@ -353,17 +353,16 @@ wear()
return;
}
if (!(obj = get_letter_object(ch))) {
- message("no such item.", 0);
+ messagef(0, "no such item.");
return;
}
if (obj->what_is != ARMOR) {
- message("you can't wear that", 0);
+ messagef(0, "you can't wear that");
return;
}
obj->identified = 1;
- (void) strcpy(desc, "wearing ");
- get_desc(obj, desc + 8);
- message(desc, 0);
+ get_desc(obj, desc, sizeof(desc));
+ messagef(0, "wearing %s", desc);
do_wear(obj);
print_stats(STAT_ARMOR);
(void) reg_move();
@@ -396,7 +395,7 @@ wield()
char desc[DCOLS];
if (rogue.weapon && rogue.weapon->is_cursed) {
- message(curse_message, 0);
+ messagef(0, "%s", curse_message);
return;
}
ch = pack_letter("wield what?", WEAPON);
@@ -405,22 +404,20 @@ wield()
return;
}
if (!(obj = get_letter_object(ch))) {
- message("No such item.", 0);
+ messagef(0, "No such item.");
return;
}
if (obj->what_is & (ARMOR | RING)) {
- sprintf(desc, "you can't wield %s",
+ messagef(0, "you can't wield %s",
((obj->what_is == ARMOR) ? "armor" : "rings"));
- message(desc, 0);
return;
}
if (obj->in_use_flags & BEING_WIELDED) {
- message("in use", 0);
+ messagef(0, "in use");
} else {
unwield(rogue.weapon);
- (void) strcpy(desc, "wielding ");
- get_desc(obj, desc + 9);
- message(desc, 0);
+ get_desc(obj, desc, sizeof(desc));
+ messagef(0, "wielding %s", desc);
do_wield(obj);
(void) reg_move();
}
@@ -458,18 +455,20 @@ call_it()
return;
}
if (!(obj = get_letter_object(ch))) {
- message("no such item.", 0);
+ messagef(0, "no such item.");
return;
}
if (!(obj->what_is & (SCROL | POTION | WAND | RING))) {
- message("surely you already know what that's called", 0);
+ messagef(0, "surely you already know what that's called");
return;
}
id_table = get_id_table(obj);
- if (get_input_line("call it:","",buf,id_table[obj->which_kind].title,1,1)) {
+ if (get_input_line("call it:", "", buf, sizeof(buf),
+ id_table[obj->which_kind].title, 1, 1)) {
id_table[obj->which_kind].id_status = CALLED;
- (void) strcpy(id_table[obj->which_kind].title, buf);
+ (void) strlcpy(id_table[obj->which_kind].title, buf,
+ sizeof(id_table[obj->which_kind].title));
}
}
@@ -565,23 +564,18 @@ kick_into_pack()
{
object *obj;
char desc[DCOLS];
- short n, stat;
+ short stat;
if (!(dungeon[rogue.row][rogue.col] & OBJECT)) {
- message("nothing here", 0);
+ messagef(0, "nothing here");
} else {
if ((obj = pick_up(rogue.row, rogue.col, &stat)) != NULL) {
- get_desc(obj, desc);
+ get_desc(obj, desc, sizeof(desc));
if (obj->what_is == GOLD) {
- message(desc, 0);
+ messagef(0, "%s", desc);
free_object(obj);
} else {
- n = strlen(desc);
- desc[n] = '(';
- desc[n+1] = obj->ichar;
- desc[n+2] = ')';
- desc[n+3] = 0;
- message(desc, 0);
+ messagef(0, "%s(%c)", desc, obj->ichar);
}
}
if (obj || (!stat)) {
generated by cgit v1.2.3-56-ge451 (git 2.39.0) at 2024-05-19 22:43:01 +0000