From 4b1bd2babe3c5b37648b987d16225d9f111205ce Mon Sep 17 00:00:00 2001 From: Michael Levin Date: Sat, 3 Oct 2009 11:24:47 +0000 Subject: * Reworked the dialog code a bit, removed some redundancies * Commented out the CMD_* dialog long messages -- probably never accessed from the GUI! * Converted some more prints into MN_* messages * Introduced a two-argument 'servermenu' to pass arguments to CG_Menu() -- menus can refer to classes etc now * Converted UI 'Disable Warning Dialogs' to a multi-item ('no', 'print to console', 'yes') * Removed some unused dialogs --- src/game/bg_public.h | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/game/bg_public.h') diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 3c753092..c645f915 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -592,21 +592,30 @@ typedef enum MN_A_NOEROOM, MN_A_TOOCLOSE, MN_A_NOOVMND_EVOLVE, + MN_A_TEAMCHANGEBUILDTIMER, + MN_A_EVOLVEBUILDTIMER, + MN_A_CANTEVOLVE, + MN_A_EVOLVEWALLWALK, + MN_A_UNKNOWNCLASS, + MN_A_CLASSNOTSPAWN, + MN_A_CLASSNOTALLOWED, + MN_A_CLASSNOTATSTAGE, //shared build MN_B_NOROOM, MN_B_NORMAL, + MN_B_CANNOT, + MN_B_SUDDENDEATH, + MN_B_REVOKED, + MN_B_SURRENDER, //alien build - MN_A_SPWNWARN, // not currently used MN_A_ONEOVERMIND, + MN_A_ONEHOVEL, MN_A_NOBP, MN_A_NOCREEP, MN_A_NOOVMND, - MN_A_ONEHOVEL, MN_A_HOVEL_EXIT, - MN_A_TEAMCHANGEBUILDTIMER, - MN_A_EVOLVEBUILDTIMER, //human stuff MN_H_SPAWN, @@ -615,10 +624,14 @@ typedef enum MN_H_NOSLOTS, MN_H_NOFUNDS, MN_H_ITEMHELD, + MN_H_TEAMCHANGEBUILDTIMER, MN_H_NOENERGYAMMOHERE, MN_H_NOARMOURYHERE, MN_H_NOROOMBSUITON, MN_H_NOROOMBSUITOFF, + MN_H_ARMOURYBUILDTIMER, + MN_H_DEADTOCLASS, + MN_H_UNKNOWNSPAWNITEM, //human build MN_H_NOPOWERHERE, @@ -626,11 +639,7 @@ typedef enum MN_H_NOTPOWERED, MN_H_NODCC, MN_H_ONEREACTOR, - MN_H_TNODEWARN, // not currently used - MN_H_RPTNOREAC, MN_H_RPTPOWERHERE, - MN_H_TEAMCHANGEBUILDTIMER, - MN_H_ARMOURYBUILDTIMER } dynMenu_t; // animations -- cgit