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

Make extended commands return defined flags

Browse Source 
Instead of returning 0 or 1, we'll now use ECMD_OK or ECMD_TURN.
These have the same meaning as the hardcoded numbers; ECMD_TURN
means the command uses a turn.

In future, could add eg. a flag denoting "user cancelled command"
or "command failed", and should clear eg. the cmdq.

Mostly this was simply replacing return values with the defines
in the extended commands, so hopefully I didn't break anything.
This commit is contained in:
Pasi Kallinen
2021-12-30 18:46:30 +02:00
parent 511ce70309
commit d53cd28d46
46 changed files with 821 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/o_init.c
View File

@@ -606,7 +606,7 @@ choose_disco_sort(
return n;
}
/* the '\' command - show discovered object types */
/* the #known command - show discovered object types */
int
dodiscovered(void) /* free after Robert Viduya */
{
@@ -622,7 +622,7 @@ dodiscovered(void) /* free after Robert Viduya */
if (iflags.menu_requested) {
if (choose_disco_sort(1) < 0)
return 0;
return ECMD_OK;
}
alphabyclass = (flags.discosort == 'c');
alphabetized = (flags.discosort == 'a' || alphabyclass);
@@ -722,7 +722,7 @@ dodiscovered(void) /* free after Robert Viduya */
}
destroy_nhwindow(tmpwin);
return 0;
return ECMD_OK;
}
/* lower case let_to_name() output, which differs from def_oc_syms[].name */
@@ -737,7 +737,7 @@ oclass_to_name(char oclass, char *buf)
return buf;
}
/* the '`' command - show discovered object types for one class */
/* the #knownclass command - show discovered object types for one class */
int
doclassdisco(void)
{
@@ -760,7 +760,7 @@ doclassdisco(void)
if (iflags.menu_requested) {
if (choose_disco_sort(2) < 0)
return 0;
return ECMD_OK;
}
alphabetized = (flags.discosort == 'a' || flags.discosort == 'c');
lootsort = (flags.discosort == 's');
@@ -827,7 +827,7 @@ doclassdisco(void)
You(havent_discovered_any, "items");
if (tmpwin != WIN_ERR)
destroy_nhwindow(tmpwin);
return 0;
return ECMD_OK;
}
/* have player choose a class */
@@ -868,7 +868,7 @@ doclassdisco(void)
destroy_nhwindow(tmpwin);
}
if (!c)
return 0; /* player declined to make a selection */
return ECMD_OK; /* player declined to make a selection */
/*
* show discoveries for object class c
@@ -935,7 +935,7 @@ doclassdisco(void)
if (ct)
display_nhwindow(tmpwin, TRUE);
destroy_nhwindow(tmpwin);
return 0;
return ECMD_OK;
}
/* put up nameable subset of discoveries list as a menu */