Don't use conditional compilation to time out obsolete stuff. Do it

by hand.

diff --git a/src/lib/commands/peek.c b/src/lib/commands/peek.c
index efaf74bc2462320b35d02ecfdf2b40736a4218f4..de51e02d9a08202d98054450ce09dcc0d824f3c7 100644 (file)
--- a/src/lib/commands/peek.c
+++ b/src/lib/commands/peek.c
@@ -49,14 +49,13 @@ peek(void)
     int nsect;
     struct nstr_sect nstr;
 
     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");
     /* 
      * 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();
     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 019160f48be1b849b2263989599f0fd90f7f8f4f..ac1de40f33d222224b5b33cfaf890b221514887a 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -120,13 +120,11 @@ struct cmndstr player_coms[] = {
     {"harden <PLANES> <NUM>", 2, hard, C_MOD, NORM + MONEY + CAP},
     {"help <topic>", 0, info, 0, VIS},
     {"headlines [days]", 0, head, C_MOD, VIS},
     {"harden <PLANES> <NUM>", 2, hard, C_MOD, NORM + MONEY + CAP},
     {"help <topic>", 0, info, 0, VIS},
     {"headlines [days]", 0, head, C_MOD, VIS},

-#if EMP_VERS_MINOR == 2 && EMP_VERS_PATCH <= 22

     /* 
      * OBSOLETE
      * once hidden command is removed, also remove the hidden code in peek.c
      */
     {"hidden <SECTS>", 0, peek, 0, GOD},
     /* 
      * OBSOLETE
      * once hidden command is removed, also remove the hidden code in peek.c
      */
     {"hidden <SECTS>", 0, peek, 0, GOD},

-#endif

     {"improve <road|rail|defense> <SECTS> <NUM>", 1, improve, C_MOD,
      NORM + MONEY + CAP},
     {"info <topic>", 0, info, 0, VIS},
     {"improve <road|rail|defense> <SECTS> <NUM>", 1, improve, C_MOD,
      NORM + MONEY + CAP},
     {"info <topic>", 0, info, 0, VIS},