(natarg): No caller distinguishes between the two different failure
values. Simplify to just one.
This commit is contained in:
parent
011f88fec8
commit
1ab98751cd
1 changed files with 11 additions and 1 deletions
|
|
@ -41,6 +41,16 @@
|
||||||
#include "prototypes.h"
|
#include "prototypes.h"
|
||||||
#include "optlist.h"
|
#include "optlist.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get nation argument.
|
||||||
|
* If ARG is not empty, use it, else prompt for input using PROMPT.
|
||||||
|
* If no input is provided, return -1.
|
||||||
|
* If the argument identifies a country, return its number. getnatp()
|
||||||
|
* can be assumed to succeed for this number.
|
||||||
|
* Else complain and return -1.
|
||||||
|
* If HIDDEN is enabled, countries not contacted are not eligible
|
||||||
|
* unless the player is a deity.
|
||||||
|
*/
|
||||||
int
|
int
|
||||||
natarg(char *arg, char *prompt)
|
natarg(char *arg, char *prompt)
|
||||||
{
|
{
|
||||||
|
|
@ -64,7 +74,7 @@ natarg(char *arg, char *prompt)
|
||||||
if (!player->god && !getcontact(getnatp(player->cnum), n)) {
|
if (!player->god && !getcontact(getnatp(player->cnum), n)) {
|
||||||
if (np->nat_stat != STAT_GOD) {
|
if (np->nat_stat != STAT_GOD) {
|
||||||
pr("Country '%s' has not been contacted.\n", arg);
|
pr("Country '%s' has not been contacted.\n", arg);
|
||||||
return -2;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue