From c3915edb54c0852bc518507a15d651171da111fd Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Wed, 1 Jun 2005 12:26:22 +0000 Subject: [PATCH] (hidd,peek): Rename hidden command to peek. This prevents a conflict in the info files with HIDDEN option. --- include/prototypes.h | 2 +- info/Commands/hidden.t | 5 ----- info/Commands/peek.t | 5 +++++ info/Commands/setsector.t | 4 ++-- src/lib/commands/Makefile | 18 +++++++++--------- src/lib/commands/{hidd.c => peek.c} | 13 +++++++++++-- src/lib/player/empmod.c | 11 ++++++++++- 7 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 info/Commands/hidden.t create mode 100644 info/Commands/peek.t rename src/lib/commands/{hidd.c => peek.c} (86%) diff --git a/include/prototypes.h b/include/prototypes.h index b988d7f2..2cf82278 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -137,7 +137,6 @@ int give(void); int grin(void); int hard(void); int head(void); -int hidd(void); int improve(void); int info(void); int land(void); @@ -184,6 +183,7 @@ int path(void); int payo(void); int pboa(void); int pdump(void); +int peek(void); int plan(void); int play(void); int powe(void); diff --git a/info/Commands/hidden.t b/info/Commands/hidden.t deleted file mode 100644 index 41edd3c9..00000000 --- a/info/Commands/hidden.t +++ /dev/null @@ -1,5 +0,0 @@ -.TH Command HIDDEN -.NA hidden "Display some deity-only statistics for sectors" -.LV Expert -.SY "hidden " -.SA "Deity" diff --git a/info/Commands/peek.t b/info/Commands/peek.t new file mode 100644 index 00000000..fb7ba771 --- /dev/null +++ b/info/Commands/peek.t @@ -0,0 +1,5 @@ +.TH Command PEEK +.NA peek "Display some deity-only statistics for sectors" +.LV Expert +.SY "peek " +.SA "Deity" diff --git a/info/Commands/setsector.t b/info/Commands/setsector.t index 744fa7b5..e8a35315 100644 --- a/info/Commands/setsector.t +++ b/info/Commands/setsector.t @@ -2,5 +2,5 @@ .NA setsector "Change stats of a sector" .LV Expert .SY "setsector " -You can change anything that appears in dump or hidden (I think). -.SA "give, setresource, edit, Deity" +You can change anything that appears in dump or peek (I think). +.SA "give, setresource, edit, dump, peek, Deity" diff --git a/src/lib/commands/Makefile b/src/lib/commands/Makefile index 0205293e..15a6eee9 100644 --- a/src/lib/commands/Makefile +++ b/src/lib/commands/Makefile @@ -40,11 +40,11 @@ OBJS = acce.o add.o anti.o arm.o army.o assa.o atta.o bdes.o best.o boar.o \ coas.o coll.o comm.o cons.o conv.o coun.o cuto.o decl.o deli.o demo.o \ desi.o disa.o dist.o drop.o dump.o echo.o edit.o enab.o enli.o \ expl.o fina.o flash.o flee.o fly.o foll.o forc.o fort.o fuel.o give.o \ - grin.o hard.o head.o hidd.o improve.o info.o land.o laun.o lboard.o \ - ldump.o ledg.o leve.o load.o look.o lost.o lstat.o lten.o map.o \ - marc.o mark.o mfir.o mine.o miss.o mobq.o mobu.o mora.o move.o \ - name.o nati.o navi.o ndump.o new.o newe.o news.o nuke.o offe.o offs.o \ - orde.o orig.o para.o path.o payo.o pboa.o pdump.o plan.o play.o \ + grin.o hard.o head.o improve.o info.o land.o laun.o lboard.o ldump.o \ + ledg.o leve.o load.o look.o lost.o lstat.o lten.o map.o marc.o mark.o \ + mfir.o mine.o miss.o mobq.o mobu.o mora.o move.o name.o nati.o navi.o \ + ndump.o new.o newe.o news.o nuke.o offe.o offs.o orde.o orig.o para.o \ + path.o payo.o pboa.o peek.o pdump.o plan.o play.o \ powe.o prod.o pstat.o rada.o rang.o rea.o real.o reco.o reje.o rela.o \ repa.o repo.o rese.o reso.o retr.o rout.o sabo.o sail.o sate.o scra.o \ scut.o sdump.o sect.o sell.o set.o setres.o setsect.o shar.o shark.o \ @@ -60,13 +60,13 @@ NTOBJS = acce.obj add.obj anti.obj arm.obj army.obj assa.obj atta.obj \ deli.obj demo.obj desi.obj disa.obj dist.obj drop.obj \ dump.obj echo.obj edit.obj enab.obj enli.obj expl.obj fina.obj \ flash.obj flee.obj fly.obj foll.obj forc.obj fort.obj fuel.obj \ - give.obj grin.obj hard.obj head.obj hidd.obj improve.obj info.obj \ + give.obj grin.obj hard.obj head.obj improve.obj info.obj \ land.obj laun.obj lboard.obj ldump.obj ledg.obj leve.obj load.obj \ look.obj lost.obj lstat.obj lten.obj map.obj marc.obj mark.obj \ mfir.obj mine.obj miss.obj mobq.obj mobu.obj mora.obj move.obj \ - name.obj nati.obj navi.obj ndump.obj new.obj newe.obj \ - news.obj nuke.obj offe.obj offs.obj orde.obj orig.obj para.obj \ - path.obj payo.obj pboa.obj pdump.obj plan.obj play.obj powe.obj \ + name.obj nati.obj navi.obj ndump.obj new.obj newe.obj news.obj \ + nuke.obj offe.obj offs.obj orde.obj orig.obj para.obj path.obj \ + payo.obj pboa.obj pdump.obj peek.obj plan.obj play.obj powe.obj \ prod.obj pstat.obj rada.obj rang.obj rea.obj real.obj reco.obj \ reje.obj rela.obj repa.obj repo.obj rese.obj reso.obj retr.obj \ rout.obj sabo.obj sail.obj sate.obj scra.obj scut.obj sdump.obj \ diff --git a/src/lib/commands/hidd.c b/src/lib/commands/peek.c similarity index 86% rename from src/lib/commands/hidd.c rename to src/lib/commands/peek.c index f3a4c459..efaf74bc 100644 --- a/src/lib/commands/hidd.c +++ b/src/lib/commands/peek.c @@ -25,7 +25,7 @@ * * --- * - * hidd.c: Do a hidden values report (deity) + * peek.c: Show hidden values report (deity) * * Known contributors to this file: * Jeff Wallace, 1989 @@ -40,14 +40,23 @@ #include "nsc.h" #include "nat.h" #include "commands.h" +#include "version.h" /* need to OBSOLETE hidden command */ int -hidd(void) +peek(void) { struct sctstr sect; int nsect; struct nstr_sect nstr; +#if EMP_VERS_MINOR == 2 && EMP_VERS_PATCH <= 22 + /* + * OBSOLETE + * Can be removed once hidden command is removed from empmod.c + */ + if (player->argp[0][0] == 'h') + pr("The hidden command has been renamed to peek, use peek in the future\n"); +#endif if (!snxtsct(&nstr, player->argp[1])) return RET_SYN; prdate(); diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c index d9e6bb58..019160f4 100644 --- a/src/lib/player/empmod.c +++ b/src/lib/player/empmod.c @@ -40,6 +40,8 @@ #include "nat.h" #include "file.h" #include "commands.h" +#include "version.h" /* need to OBSOLETE hidden command */ + struct cmndstr player_coms[] = { /* command form cost addr permit */ @@ -118,7 +120,13 @@ struct cmndstr player_coms[] = { {"harden ", 2, hard, C_MOD, NORM + MONEY + CAP}, {"help ", 0, info, 0, VIS}, {"headlines [days]", 0, head, C_MOD, VIS}, - {"hidden ", 0, hidd, 0, GOD}, +#if EMP_VERS_MINOR == 2 && EMP_VERS_PATCH <= 22 + /* + * OBSOLETE + * once hidden command is removed, also remove the hidden code in peek.c + */ + {"hidden ", 0, peek, 0, GOD}, +#endif {"improve ", 1, improve, C_MOD, NORM + MONEY + CAP}, {"info ", 0, info, 0, VIS}, @@ -181,6 +189,7 @@ struct cmndstr player_coms[] = { {"pbmap [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"pboard ", 3, pboa, C_MOD, NORM + MONEY + CAP}, {"pdump []", 0, pdump, 0, NORM}, + {"peek ", 0, peek, 0, GOD}, {"plane ", 0, plan, 0, NORM}, {"players", 0, play, 0, VIS}, {"pmap [s|l|p|*|h]", 0, map, C_MOD, NORM},