Added other missing bits

Author: wcabus

src/DoomSharp.Core/DoomGame.cs

@@ -1096,8 +1096,8 @@ private void ArbitrateNetStart()
                         return;
                     }
 
-                    StartSkill = (SkillLevel)(netBuffer.RetransmitFrom & 15);
-                    _game.DeathMatch = ((netBuffer.RetransmitFrom & 0xc0) >> 6) != 0;
+                StartSkill = (SkillLevel)(netBuffer.RetransmitFrom & 15);
+                _game.DeathMatch = (netBuffer.RetransmitFrom & 0xc0) >> 6;
                     var nomonsters = (netBuffer.RetransmitFrom & 0x20) > 0;
                     var respawnparm = (netBuffer.RetransmitFrom & 0x10) > 0;
                     StartMap = netBuffer.StartTic & 0x3f;
@@ -1119,9 +1119,9 @@ private void ArbitrateNetStart()
                 for (i = 0; i < _network.DoomCom.NumNodes; i++)
                 {
                     netBuffer.RetransmitFrom = (byte)StartSkill;
-                    if (_game.DeathMatch)
+                    if (_game.DeathMatch != 0)
                     {
-                        netBuffer.RetransmitFrom |= (byte)((_game.DeathMatch ? 1 : 0) << 6);
+                        netBuffer.RetransmitFrom |= (byte)(_game.DeathMatch << 6);
                     }
                     //if (nomonsters)
                     //    netbuffer->retransmitfrom |= 0x20;

src/DoomSharp.Core/GameLogic/CheatSequence.cs

@@ -0,0 +1,135 @@
+namespace DoomSharp.Core.GameLogic;
+
+/// <summary>
+/// Cheat sequence checking - port of m_cheat.c from the original DOOM source.
+/// Uses the SCRAMBLE bit-shuffling algorithm to encode cheat sequences.
+/// </summary>
+public class CheatSequence
+{
+    private static bool _firstTime = true;
+    private static readonly byte[] CheatXlateTable = new byte[256];
+
+    private readonly byte[] _sequence;
+    private int _position;
+
+    /// <summary>
+    /// Create a cheat sequence from a plaintext string.
+    /// The string is encoded using the SCRAMBLE algorithm.
+    /// Use '\x01' as a placeholder for parameter characters (digits typed by user).
+    /// Use no special suffix for sequences without parameters.
+    /// </summary>
+    public CheatSequence(string cheatString)
+    {
+        // Encode the cheat string using SCRAMBLE, then add 0xff terminator
+        // Parameter placeholder bytes (0x01) are kept as-is
+        _sequence = new byte[cheatString.Length + 1];
+        for (var i = 0; i < cheatString.Length; i++)
+        {
+            var c = (byte)cheatString[i];
+            _sequence[i] = c == 0x01 ? c : Scramble(c);
+        }
+        _sequence[cheatString.Length] = 0xff; // end marker
+
+        _position = 0;
+    }
+
+    /// <summary>
+    /// The SCRAMBLE macro from the original source - shuffles bits of a byte.
+    /// </summary>
+    private static byte Scramble(int a)
+    {
+        return (byte)(
+            ((a & 1) << 7) +
+            ((a & 2) << 5) +
+            (a & 4) +
+            ((a & 8) << 1) +
+            ((a & 16) >> 1) +
+            (a & 32) +
+            ((a & 64) >> 5) +
+            ((a & 128) >> 7)
+        );
+    }
+
+    /// <summary>
+    /// Check if the given key advances or completes the cheat sequence.
+    /// Returns true if the full cheat has been entered.
+    /// Port of cht_CheckCheat from m_cheat.c.
+    /// </summary>
+    public bool CheckCheat(char key)
+    {
+        if (_firstTime)
+        {
+            _firstTime = false;
+            for (var i = 0; i < 256; i++)
+            {
+                CheatXlateTable[i] = Scramble(i);
+            }
+        }
+
+        if (_sequence[_position] == 0)
+        {
+            // Parameter position - store the raw key
+            _sequence[_position] = (byte)key;
+            _position++;
+        }
+        else if (CheatXlateTable[(byte)key] == _sequence[_position])
+        {
+            _position++;
+        }
+        else
+        {
+            _position = 0;
+        }
+
+        if (_sequence[_position] == 1)
+        {
+            // Hit a parameter marker - advance past it
+            _position++;
+        }
+        else if (_sequence[_position] == 0xff)
+        {
+            // Completed the sequence
+            _position = 0;
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Extract parameter characters that were captured during sequence entry.
+    /// Port of cht_GetParam from m_cheat.c.
+    /// </summary>
+    public void GetParam(char[] buffer)
+    {
+        var p = 0;
+
+        // Skip past the encoded prefix to find the parameter bytes
+        // In the sequence, parameters were originally 0x01 markers that got
+        // replaced with 0x00 (zeroed) then filled with user keystrokes
+        // Find the first 0x01 in the original sequence (which is now after the encoded chars)
+        while (_sequence[p] != 1)
+        {
+            p++;
+        }
+
+        // Skip the 0x01 marker
+        p++;
+
+        // Copy parameter bytes into the buffer and zero them out
+        var bufIdx = 0;
+        do
+        {
+            var c = _sequence[p];
+            buffer[bufIdx] = (char)c;
+            _sequence[p] = 0;
+            bufIdx++;
+            p++;
+        } while (buffer[bufIdx - 1] != 0 && _sequence[p] != 0xff);
+
+        if (_sequence[p] == 0xff)
+        {
+            buffer[bufIdx] = '\0';
+        }
+    }
+}

src/DoomSharp.Core/GameLogic/GameController.cs

@@ -38,11 +38,11 @@ public class GameController
 
     private int _keyUp = (int)Keys.UpArrow;
     private int _keyDown = (int)Keys.DownArrow;
-    private int _keyStrafeLeft = 'A';
-    private int _keyStrafeRight = 'D';
-    private int _keyFire = ' ';
-    private int _keyUse = (int)Keys.Enter;
-    private int _keyStrafe = (int)Keys.LAlt;
+    private int _keyStrafeLeft = ',';
+    private int _keyStrafeRight = '.';
+    private int _keyFire = (int)Keys.RCtrl;
+    private int _keyUse = ' ';
+    private int _keyStrafe = (int)Keys.RAlt;
     private int _keySpeed = (int)Keys.RShift;
 
     private int _mouseButtonFire = 0;
@@ -230,6 +230,7 @@ public GameController()
 
     public SkillLevel GameSkill { get; set; }
     public bool RespawnMonsters { get; set; }
+    public bool RespawnParm { get; set; }
     public bool FastParm { get; set; }
     public bool NoMonsters { get; set; }
     public int GameEpisode { get; set; }
@@ -247,7 +248,7 @@ public GameController()
 
     public bool ViewActive { get; set; }
 
-    public bool DeathMatch { get; set; }
+    public int DeathMatch { get; set; }
     public bool NetGame { get; set; } = false;
     public bool[] PlayerInGame { get; } = new bool[Constants.MaxPlayers];
     public Player[] Players { get; } = new Player[Constants.MaxPlayers];
@@ -615,7 +616,7 @@ private void DoReborn(int player)
             Players[player].MapObject!.Player = null;
 
             // spawn at random spot if in death match 
-            if (DeathMatch)
+            if (DeathMatch != 0)
             {
                 DeathMatchSpawnPlayer(player);
                 return;
@@ -664,8 +665,9 @@ private void DoPlayDemo()
         var skill = (SkillLevel)_demoData[_demoDataIdx++];
         var episode = _demoData[_demoDataIdx++];
         var map = _demoData[_demoDataIdx++];
-        DeathMatch = _demoData[_demoDataIdx++] != 0;
+        DeathMatch = _demoData[_demoDataIdx++];
         var respawnparm = _demoData[_demoDataIdx++] != 0;
+        RespawnParm = respawnparm;
         FastParm = _demoData[_demoDataIdx++] != 0;
         NoMonsters = _demoData[_demoDataIdx++] != 0;
         ConsolePlayer = _demoData[_demoDataIdx++];
@@ -702,11 +704,11 @@ public void DoNewGame()
         DemoPlayback = false;
         NetDemo = false;
         NetGame = false;
-        DeathMatch = false;
+        DeathMatch = 0;
         PlayerInGame[1] = PlayerInGame[2] = PlayerInGame[3] = false;
-        //respawnparm = false;
-        //fastparm = false;
-        //nomonsters = false;
+        RespawnParm = false;
+        FastParm = false;
+        NoMonsters = false;
         ConsolePlayer = 0;
         InitNew(_d_skill, _d_episode, _d_map);
         GameAction = GameAction.Nothing;
@@ -762,7 +764,7 @@ public void InitNew(SkillLevel skill, int episode, int map)
 
         DoomRandom.ClearRandom();
 
-        if (skill == SkillLevel.Nightmare || RespawnMonsters)
+        if (skill == SkillLevel.Nightmare || RespawnParm)
             RespawnMonsters = true;
         else
             RespawnMonsters = false;
@@ -898,7 +900,7 @@ private void BeginRecording()
         _demoData[_demoDataIdx++] = (byte)GameSkill;
         _demoData[_demoDataIdx++] = (byte)GameEpisode;
         _demoData[_demoDataIdx++] = (byte)GameMap;
-        _demoData[_demoDataIdx++] = (byte)(DeathMatch ? 1 : 0);
+        _demoData[_demoDataIdx++] = (byte)DeathMatch;
         _demoData[_demoDataIdx++] = 0; // respawnparam
         _demoData[_demoDataIdx++] = 0; // fastparm;
         _demoData[_demoDataIdx++] = 0; // nomonsters;
@@ -1005,11 +1007,11 @@ public bool CheckDemoStatus()
             DemoPlayback = false;
             NetDemo = false;
             NetGame = false;
-            DeathMatch = false;
+            DeathMatch = 0;
             PlayerInGame[1] = PlayerInGame[2] = PlayerInGame[3] = false;
-            //respawnparm = false;
-            //fastparm = false;
-            //nomonsters = false;
+            RespawnParm = false;
+            FastParm = false;
+            NoMonsters = false;
             ConsolePlayer = 0;
             DoomGame.Instance.AdvanceDemo();
             return true;
@@ -1112,8 +1114,8 @@ public void P_Ticker()
 
     private void RespawnSpecials()
     {
-        // only respawn items in deathmatch
-        if (!DeathMatch)
+        // only respawn items in deathmatch 2 (altdeath)
+        if (DeathMatch != 2)
         {
             return;
         }
@@ -1423,7 +1425,7 @@ private void P_SpawnPlayer(MapThing mthing)
         P_SetupPlayerSprites(p);
 
         // give all cards in death match mode
-        if (DeathMatch)
+        if (DeathMatch != 0)
         {
             for (i = 0; i < (int)KeyCardType.NumberOfKeyCards; i++)
             {
@@ -1661,7 +1663,7 @@ private void P_SpawnMapThing(MapThing mapThing)
         {
             // save spots for respawning in network games
             _playerStarts[mapThing.Type - 1] = mapThing;
-            if (!DeathMatch)
+            if (DeathMatch == 0)
             {
                 P_SpawnPlayer(mapThing);
             }
@@ -1696,7 +1698,7 @@ private void P_SpawnMapThing(MapThing mapThing)
         }
 
         // don't spawn keycards and players in deathmatch
-        if (DeathMatch && (moInfo.Value.Flags & MapObjectFlag.MF_NOTDMATCH) != 0)
+        if (DeathMatch != 0 && (moInfo.Value.Flags & MapObjectFlag.MF_NOTDMATCH) != 0)
         {
             return;
         }
@@ -4053,7 +4055,7 @@ private void SetupLevel(int episode, int map, int playerMask, SkillLevel skillLe
         P_LoadThings(lumpNum + MapLumps.Things);
 
         // if deathmatch, randomly spawn the active players
-        if (DeathMatch)
+        if (DeathMatch != 0)
         {
             for (var i = 0; i < Constants.MaxPlayers; i++)
             {
@@ -5704,7 +5706,7 @@ public bool HandleEvent(InputEvent currentEvent)
         if (GameState == GameState.Level && 
             currentEvent.Type == EventType.KeyDown &&
             currentEvent.Data1 == (int)Keys.F12 && 
-            (SingleDemo || !DeathMatch))
+            (SingleDemo || DeathMatch == 0))
         {
             // spy mode 
             do

src/DoomSharp.Core/GameLogic/Player.cs

@@ -663,7 +663,7 @@ public bool GiveAmmo(AmmoType ammo, int num)
     public bool GiveWeapon(WeaponType weapon, bool dropped)
     {
         var game = DoomGame.Instance.Game;
-        if (game.NetGame && game.DeathMatch && !dropped)
+        if (game.NetGame && game.DeathMatch != 2 && !dropped)
         {
             // leave placed weapons forever on net games
             if (WeaponOwned[(int)weapon])
@@ -674,7 +674,7 @@ public bool GiveWeapon(WeaponType weapon, bool dropped)
             BonusCount += GameController.BonusAdd;
             WeaponOwned[(int)weapon] = true;
 
-            if (game.DeathMatch)
+            if (game.DeathMatch != 0)
             {
                 GiveAmmo(WeaponInfo.GetByType(weapon).Ammo, 5);
             }

src/DoomSharp.Core/GameLogic/State.cs

@@ -344,7 +344,7 @@ private static void ActionSaw(ActionParams actionParams)
         DoomGame.Instance.Sound.StartSound(player.MapObject, SoundType.sfx_sawhit);
 
         // turn to face target
-        player.MapObject.Angle = DoomGame.Instance.Renderer.PointToAngle2(
+        angle = DoomGame.Instance.Renderer.PointToAngle2(
                 player.MapObject.X,
                 player.MapObject.Y,
                 lineTarget.X,

src/DoomSharp.Core/GameLogic/Trigger.cs

@@ -1351,8 +1351,11 @@ public static bool DonutEvent(Line line)
             var s2 = s1.Lines[0].GetNextSector(s1)!;
             for (var i = 0; i < s2.LineCount; i++)
             {
-                if ((s2.Lines[i].Flags & Constants.Line.TwoSided) == 0 ||
-                    s2.Lines[i].BackSector == s1)
+                // NOTE: Original C code has a bug here: (!s2->lines[i]->flags & ML_TWOSIDED)
+                // Due to C operator precedence, ! binds tighter than &, so this evaluates as
+                // ((!flags) & ML_TWOSIDED) which is always false for non-zero flags.
+                // We replicate the vanilla bug for demo compatibility by omitting the two-sided check.
+                if (s2.Lines[i].BackSector == s1)
                 {
                     continue;
                 }

src/DoomSharp.Core/Networking/DoomCommunication.cs

@@ -26,7 +26,7 @@ public class DoomCommunication
     // Flag: 1 = send a backup tic in every packet.
     public short ExtraTics { get; set; }
     // Flag: 1 = deathmatch.
-    public bool DeathMatch { get; set; }
+    public short DeathMatch { get; set; }
     // Flag: -1 = new game, 0-5 = load savegame
     public short SaveGame { get; set; }
     public short Episode { get; set; }	// 1-3

src/DoomSharp.Core/Networking/NetworkController.cs

@@ -13,7 +13,7 @@ public void Initialize()
         DoomGame.Instance.Game.NetGame = false;
         DoomCom.Id = Constants.DoomComId;
         DoomCom.NumPlayers = DoomCom.NumNodes = 1;
-        DoomCom.DeathMatch = false;
+        DoomCom.DeathMatch = 0;
         DoomCom.ConsolePlayer = 0;
 
         // when multiplayer: setup netsend/netget functions

src/DoomSharp.Core/UI/HudController.cs

@@ -436,7 +436,7 @@ public bool HandleEvent(InputEvent currentEvent)
         {
             _messageOn = true;
             _messageCounter = MessageTimeout;
-            return true;
+            return true; // eat the key, matching original HU_Responder
         }
 
         return false;