Merge pull request #205 from HiGuyMB/slightly-better-chat

Make chat work on lobby and close with esc
MBU-Team · Mar 10, 2024 · 42d2403 · 42d2403
2 parents e4be897 + 18de2c0
commit 42d2403
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/game/marble/client/scripts/default.bind.cs b/game/marble/client/scripts/default.bind.cs
@@ -7,6 +7,10 @@
    moveMap.delete();
 new ActionMap(moveMap);
 
+if ( isObject( LobbyMap ) )
+   LobbyMap.delete();
+new ActionMap(LobbyMap);
+
 $screenShotMode = true;
 
 function screenShotMode()
@@ -544,7 +548,10 @@ function cycleDebugRenderMode(%val)
 
 function pauseOrEscape()
 {
-	if (isObject(EditorGui) && Canvas.getContent() == EditorGui.getId())
+	if (newMessageHud.isAwake())
+	{
+		Canvas.popDialog(newMessageHud);
+	} else if (isObject(EditorGui) && Canvas.getContent() == EditorGui.getId())
 	{
 		Editor.close("PlayGui");
 		Canvas.setContent(RootGui);
@@ -612,6 +619,10 @@ function clearInputs()
 GlobalActionMap.bindCmd(keyboard, "ctrl 4", "", "setVideoMode(800,600,32,0);");
 GlobalActionMap.bindCmd(keyboard, "alt t", "", "reloadMaterials();");
 
+// LobbyMap:
+// keyboard
+LobbyMap.bind(keyboard, "t", GlobalChat);
+
 // MoveMap:
 // keyboard
 moveMap.bind(keyboard, "F8", dropCameraAtPlayer);

diff --git a/game/marble/client/scripts/playGui.cs b/game/marble/client/scripts/playGui.cs
@@ -78,6 +78,12 @@
    %this.setPowerUp( "" );
    %this.setBlastBar();
 
+   if (newMessageHud.isAwake())
+   {
+      schedule(10, 0, deactivateKeyboard);
+      NMH_Type.schedule(10, makeFirstResponder, true);
+   }
+
    // hack town - pause if system UI is active
    if ($Client::SystemUIActive && !GamePauseGui.isAwake() && !$GameEndNoAllowPause)
    {

diff --git a/game/marble/client/ui/chathud/newChatHud.cs b/game/marble/client/ui/chathud/newChatHud.cs
@@ -90,6 +90,8 @@ function newChatHud_UpdateIndicatorPosition()
 
 function newChatHud_AddLine(%line)
 {
+	echo("CHAT: " @ stripChars(%line, "\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\cp\co"));
+
 	if(!isObject($NewChatSO))
 		newChatHud_Init();
 

diff --git a/game/marble/client/ui/chathud/newMessageHud.cs b/game/marble/client/ui/chathud/newMessageHud.cs
@@ -8,6 +8,9 @@
 function newMessageHud::onSleep(%this)
 {
 	commandtoserver('stopTalking');
+
+	activateKeyboard();
+	NMH_Type.makeFirstResponder(false);
 }
 
 

diff --git a/game/marble/client/ui/lobbyGui.gui b/game/marble/client/ui/lobbyGui.gui
@@ -179,11 +179,27 @@ function LobbyGui::show(%this)
    %this.checkDemoTime();
 }
 
+function LobbyGui::onWake( %this )
+{
+   LobbyMap.push();
+
+   newChatHud.resize(
+      0,
+      0,
+      getWord(RootGui.extent, 0),
+      getWord(RootGui.extent, 1)
+   );
+   RootGui.add(newChatHud);
+   RootGui.pushToBack(RootCenterCtrl);
+}
+
 function LobbyGui::onSleep( %this )
 {
    // To fix it so if you have this up when game starts it will be an overlay
    // on the play GUI -pw
    LobbyPopupDlg.hide();
+   LobbyMap.pop();
+   RootGui.remove(newChatHud);
 }
 
 // set the correct game state if we are out of demo time.  return true if we