From bbf9693d114d11df15b8e9157a134733e4aa49bd Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 12:15:17 +0000 Subject: * Remove SS_INFESTING and PM_SPINTERMISSION since they were not used * Merge SS_WALLCLIMBINGCEILING and EF_WALLCLIMBCEILING * Remove ui_emoticons, using the value of cg_emoticons for both contexts. * Add PM_Paralyzed() to get rid of all the silly >= PM_DEAD comparisons * Don't allow players to taunt while dead * Fix full ammo check in reload (oops) * Fiddle with bg_lib.h _MAX/_MIN defines, fix min(), add [u]intX_t typedefs * Remove non-functional cgame command (thanks Amanieu for spotting) --- src/ui/ui_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui') diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index df295a4e..dc483add 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -122,7 +122,7 @@ static cvarTable_t cvarTable[ ] = { &ui_serverStatusTimeOut, "ui_serverStatusTimeOut", "7000", CVAR_ARCHIVE}, { &ui_textWrapCache, "ui_textWrapCache", "1", CVAR_ARCHIVE }, { &ui_developer, "ui_developer", "0", CVAR_ARCHIVE | CVAR_CHEAT }, - { &ui_emoticons, "ui_emoticons", "1", CVAR_LATCH | CVAR_ARCHIVE }, + { &ui_emoticons, "cg_emoticons", "1", CVAR_LATCH | CVAR_ARCHIVE }, }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); -- cgit