diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:15:17 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:47 +0000 |
| commit | bbf9693d114d11df15b8e9157a134733e4aa49bd (patch) | |
| tree | ea3b93a16c0aca311400a8bc566d38b439a667fa /src/ui | |
| parent | 0dff9796f8a2921844e84eaa00a550a0b6dcac09 (diff) | |
* 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)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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] ); |