From f4eb9088523aef3946f02cd45953d14760c598c6 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Sun, 15 Sep 2013 20:24:11 +0000
Subject: Hopefully complete implementation of player names and Strife player
 chat features, which work differently than they did in DOOM.

If working properly, then this fully completes Chocolate Strife, aside
from any presently unknown issues.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2646
---
 src/strife/d_main.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/strife/d_main.c')

diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 51782b43..01e560a2 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -160,8 +160,7 @@ static boolean main_loop_started = false;
 static int comport = 0;
 
 // fraggle 06/03/11 [STRIFE]: Multiplayer nickname?
-
-static char *nickname = NULL;
+char *nickname = NULL;
 
 void D_ConnectNetGame(void);
 void D_CheckNetGame(void);
@@ -415,10 +414,15 @@ void D_BindVariables(void)
     M_BindStrifeControls(); // haleyjd 09/01/10: [STRIFE]
     M_BindChatControls(MAXPLAYERS);
 
-    key_multi_msgplayer[0] = HUSTR_KEYGREEN;
-    key_multi_msgplayer[1] = HUSTR_KEYINDIGO;
-    key_multi_msgplayer[2] = HUSTR_KEYBROWN;
-    key_multi_msgplayer[3] = HUSTR_KEYRED;
+    // haleyjd 20130915: Strife chat keys
+    key_multi_msgplayer[0] = '1';
+    key_multi_msgplayer[1] = '2';
+    key_multi_msgplayer[2] = '3';
+    key_multi_msgplayer[3] = '4';
+    key_multi_msgplayer[4] = '5';
+    key_multi_msgplayer[5] = '6';
+    key_multi_msgplayer[6] = '7';
+    key_multi_msgplayer[7] = '8';
 
 #ifdef FEATURE_MULTIPLAYER
     NET_BindVariables();
-- 
cgit v1.2.3