shithub: choc

Info  •  Files  •  Log  •  Branches

Fix player exit message in Hexen, and add note to player exit code in
Heretic.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2425

--- a/src/heretic/d_net.c

+++ b/src/heretic/d_net.c

@@ -55,13 +55,13 @@

     player_num = player - players;

-    // Do this the same way as Vanilla Doom does, to allow dehacked

-    // replacements of this message

+    // Note:

+    // The Heretic source code does this, which doesn't actually work.

+    // As a result, the exit message is never seen.

-    strncpy(exitmsg, DEH_String("Player 1 left the game"), sizeof(exitmsg));

-    exitmsg[sizeof(exitmsg) - 1] = '\0';

-

+    strcpy(exitmsg, "PLAYER 1 LEFT THE GAME");

     exitmsg[7] += player_num;

+    players[consoleplayer].message = exitmsg;

     playeringame[player_num] = false;

     players[consoleplayer].message = exitmsg;

--- a/src/hexen/d_net.c

+++ b/src/hexen/d_net.c

@@ -34,6 +34,8 @@

 #include "i_timer.h"

 #include "i_video.h"

 #include "h2def.h"

+#include "p_local.h"

+#include "s_sound.h"

 #include "deh_main.h"

@@ -57,16 +59,10 @@

     player_num = player - players;

-    /* TODO

-    // Do this the same way as Vanilla Doom does, to allow dehacked

-    // replacements of this message

-

-    strncpy(exitmsg, DEH_String("Player 1 left the game"), sizeof(exitmsg));

-    exitmsg[sizeof(exitmsg) - 1] = '\0';

-

+    strcpy(exitmsg, "PLAYER 1 LEFT THE GAME");

     exitmsg[7] += player_num;

-    players[consoleplayer].message = exitmsg;

-*/

+    P_SetMessage(&players[consoleplayer], exitmsg, true);

+    S_StartSound(NULL, SFX_CHAT);

     playeringame[player_num] = false;