commands: Rename the command functions

[empserver] / src / lib / commands / surv.c

diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c
index 470d9212d1f11d0e9c36fcab9569404b19e0abc9..c8f9f7906060859b41208cbf70e183e2a9f8ab65 100644 (file)
--- a/src/lib/commands/surv.c
+++ b/src/lib/commands/surv.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1986
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -44,7 +45,7 @@ static char code_char(struct valstr, struct sctstr *sp);
  *
  */
 int
-surv(void)
+c_survey(void)
 {
     int nsect;
     struct nstr_sect nstr;
@@ -135,7 +136,9 @@ code_char(struct valstr val, struct sctstr *sp)
     int n;
     int large = val.val_type != NSC_CHAR && val.val_type != NSC_UCHAR;
 
-    nstr_exec_val(&val, player->cnum, sp, NSC_LONG);
+    nstr_eval(&val, player->cnum, sp, NSC_LONG);
+    if (CANT_HAPPEN(val.val_type != NSC_LONG))
+       return ' ';
     amt = val.val_as.lng;
     if (amt <= 0)
        return ' ';