diff options
| author | M. Kristall <mkpdev@gmail.com> | 2010-02-25 16:18:33 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:27 +0000 |
| commit | 8a75ae8f815a7e2067a8ebf19f20b39948d748ab (patch) | |
| tree | bac6fca807a8311011991ae9d261c3f3605add34 /src/game/g_main.c | |
| parent | 69f3a7fece69a9eee18e74f43b898a333d4969c6 (diff) | |
* Refactor emoticon code
* Remove some redundant code
* Make an error non-fatal
* Formatting fixes
Diffstat (limited to 'src/game/g_main.c')
| -rw-r--r-- | src/game/g_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 0e1df90e..0a2a37bd 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -582,7 +582,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) trap_LocateGameData( level.gentities, level.num_entities, sizeof( gentity_t ), &level.clients[ 0 ].ps, sizeof( level.clients[ 0 ] ) ); - level.emoticonCount = BG_LoadEmoticons( level.emoticons, NULL ); + level.emoticonCount = BG_LoadEmoticons( level.emoticons, MAX_EMOTICONS ); trap_SetConfigstring( CS_INTERMISSION, "0" ); |