aboutsummaryrefslogtreecommitdiff
path: root/taipan.c
diff options
context:
space:
mode:
Diffstat (limited to 'taipan.c')
-rw-r--r--taipan.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/taipan.c b/taipan.c
index 933fd2f..36993bc 100644
--- a/taipan.c
+++ b/taipan.c
@@ -251,10 +251,9 @@ void backspace() {
}
*/
-/* get an inventory item, return its index into items[].
- if allow_all is true, allows '*', which is used for
- 'throw cargo' in sea_battle. */
-extern unsigned char get_item(unsigned char allow_all);
+
+extern unsigned char get_item_port(void);
+extern unsigned char get_item_battle(void);
/*
rewritten in asm, in timed_getch.s, here's the original:
@@ -1319,7 +1318,7 @@ char sea_battle(char id, int num_ships) {
print_msg(M_what_shall_i_throw);
cprint_taipan_prompt();
- choice = get_item(1);
+ choice = get_item_battle();
if(choice < 4) {
gotox0y(6);
@@ -3082,7 +3081,7 @@ char what_do_you_wish_me_to(char *buy_or_sell) {
print_msg(M_me_to);
cputs(buy_or_sell);
cprint_taipan_prompt();
- return get_item(0);
+ return get_item_port();
}
#ifdef CART_TARGET
# pragma code-name (pop)
@@ -3093,6 +3092,7 @@ void buy(void) {
unsigned long afford, amount;
choice = what_do_you_wish_me_to("buy");
+ if(choice == 5) return;
for (;;) {
gotoxy(31, 21);
@@ -3152,6 +3152,7 @@ void sell(void) {
unsigned long amount;
choice = what_do_you_wish_me_to("sell");
+ if(choice == 5) return;
for (;;) {
gotox0y22();