dsda: flylook buttons

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs

@@ -88,6 +88,12 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 							$"P{port} Inventory Left",
 							$"P{port} Inventory Right",
 							$"P{port} Use Artifact",
+							$"P{port} Look Up",
+							$"P{port} Look Down",
+							$"P{port} Look Center",
+							$"P{port} Fly Up",
+							$"P{port} Fly Down",
+							$"P{port} Fly Center",
 						]);
 					}
 				}

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.IEmulator.cs

@@ -201,6 +201,24 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 						if (controller.IsPressed($"P{port} Use Artifact"))
 							players[i].Buttons |= LibDSDA.Buttons.ArtifactUse;
 
+						if (controller.IsPressed($"P{port} Look Up"))
+							players[i].Buttons |= LibDSDA.Buttons.LookUp;
+
+						if (controller.IsPressed($"P{port} Look Down"))
+							players[i].Buttons |= LibDSDA.Buttons.LookDown;
+
+						if (controller.IsPressed($"P{port} Look Center"))
+							players[i].Buttons |= LibDSDA.Buttons.LookCenter;
+
+						if (controller.IsPressed($"P{port} Fly Up"))
+							players[i].Buttons |= LibDSDA.Buttons.FlyUp;
+
+						if (controller.IsPressed($"P{port} Fly Down"))
+							players[i].Buttons |= LibDSDA.Buttons.FlyDown;
+
+						if (controller.IsPressed($"P{port} Fly Center"))
+							players[i].Buttons |= LibDSDA.Buttons.FlyCenter;
+
 						if (_syncSettings.InputFormat is ControllerType.Hexen)
 						{
 							if (controller.IsPressed($"P{port} Jump"))

src/BizHawk.Emulation.Cores/Computers/Doom/LibDSDA.cs

@@ -23,20 +23,26 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 			Indetermined = 0b00010000, // no IWAD found.
 		}
 
-		public enum Buttons : byte
+		public enum Buttons : int
 		{
-			None           = 0b00000000,
+			None           = 0b0000000000000000,
-			Fire           = 0b00000001,
+			Fire           = 0b0000000000000001,
-			Use            = 0b00000010,
+			Use            = 0b0000000000000010,
-			ChangeWeapon   = 0b00000100,
+			ChangeWeapon   = 0b0000000000000100,
-			WeaponMask     = 0b00111000,
+			WeaponMask     = 0b0000000000111000,
-			InventoryLeft  = 0b00001000,
+			InventoryLeft  = 0b0000000000001000,
-			InventoryRight = 0b00010000,
+			InventoryRight = 0b0000000000010000,
-			InventorySkip  = 0b00100000,
+			InventorySkip  = 0b0000000000100000,
-			ArtifactUse    = 0b01000000,
+			ArtifactUse    = 0b0000000001000000,
-			EndPlayer      = 0b01000000,
+			LookUp         = 0b0000000010000000,
-			Jump           = 0b10000000,
+			LookDown       = 0b0000000100000000,
-			ArtifactMask   = 0b00111111,
+			LookCenter     = 0b0000001000000000,
+			FlyUp          = 0b0000010000000000,
+			FlyDown        = 0b0000100000000000,
+			FlyCenter      = 0b0001000000000000,
+			EndPlayer      = 0b0000000001000000,
+			Jump           = 0b0000000010000000,
+			ArtifactMask   = 0b0000000000111111,
 		}
 
 		[StructLayout(LayoutKind.Sequential)]

waterbox/dsda/BizhawkInterface.c

@@ -2,6 +2,7 @@
 
 bool foundIWAD = false;
 bool wipeDone = true;
+int lookHeld[4] = { 0 };
 int lastButtons[4] = { 0 };
 AutomapButtons last_buttons = { 0 };
 
@@ -111,46 +112,83 @@ void automap_inputs(AutomapButtons buttons)
   last_buttons = buttons;
 }
 
-void player_input(struct PackedPlayerInput *inputs, int playerId)
+void player_input(struct PackedPlayerInput *src, int id)
 {
-  local_cmds[playerId].forwardmove = inputs->RunSpeed;
+  int lspeed = 0;
-  local_cmds[playerId].sidemove    = inputs->StrafingSpeed;
+  int look = 0;
-  local_cmds[playerId].lookfly     = inputs->FlyLook;
+  int flyheight = 0;
-  local_cmds[playerId].arti        = inputs->ArtifactUse; // use specific artifact (also jump/die)
+  int buttons = src->Buttons & EXTRA_BUTTON_MASK;
-  local_cmds[playerId].angleturn   = inputs->TurningSpeed;
-  local_cmds[playerId].buttons     = inputs->Buttons & REGULAR_BUTTON_MASK;
-
   player_t *player = &players[consoleplayer];
-  char extraButtons = inputs->Buttons & EXTRA_BUTTON_MASK;
+  ticcmd_t *dest = &local_cmds[id];
+
+  dest->forwardmove = src->RunSpeed;
+  dest->sidemove    = src->StrafingSpeed;
+  dest->lookfly     = src->FlyLook;
+  dest->arti        = src->ArtifactUse; // use specific artifact (also jump/die)
+  dest->angleturn   = src->TurningSpeed;
+  dest->buttons     = src->Buttons & REGULAR_BUTTON_MASK;
 
   // explicitly select artifact through in-game GUI
-  if (extraButtons & INVENTORY_LEFT && !(lastButtons[playerId] & INVENTORY_LEFT))
+  if (buttons & INVENTORY_LEFT && !(lastButtons[id] & INVENTORY_LEFT))
     InventoryMoveLeft ();
 
-  if (extraButtons & INVENTORY_RIGHT && !(lastButtons[playerId] & INVENTORY_RIGHT))
+  if (buttons & INVENTORY_RIGHT && !(lastButtons[id] & INVENTORY_RIGHT))
     InventoryMoveRight();
 
-  if (extraButtons & INVENTORY_SKIP && !(lastButtons[playerId] & INVENTORY_SKIP))
+  if (buttons & INVENTORY_SKIP && !(lastButtons[id] & INVENTORY_SKIP))
   { /* TODO */ }
 
-  if (extraButtons & ARTIFACT_USE && !(lastButtons[playerId] & ARTIFACT_USE))
+  /* THE REST IS COPYPASTE FROM G_BuildTiccmd()!!! */
+
+  if (buttons & ARTIFACT_USE && !(lastButtons[id] & ARTIFACT_USE))
   {
     // use currently selected artifact
     if (inventory)
     {
       player->readyArtifact = player->inventory[inv_ptr].type;
       inventory = false;
-      local_cmds[playerId].arti &= ~AFLAG_MASK; // leave jump/die intact, zero out the rest
+      dest->arti &= ~AFLAG_MASK; // leave jump/die intact, zero out the rest
     }
     else
     {
-      local_cmds[playerId].arti |= player->inventory[inv_ptr].type & AFLAG_MASK;
+      dest->arti |= player->inventory[inv_ptr].type & AFLAG_MASK;
     }
   }
 
-  if (local_cmds[playerId].buttons & BT_CHANGE)
+  // look/fly up/down/center keys override analog value
+  if (buttons & LOOK_DOWN || buttons & LOOK_UP)
+    ++lookHeld[id];
+  else
+    lookHeld[id] = 0;
+
+  if (lookHeld[id] < SLOWTURNTICS)
+    lspeed = 1;
+  else
+    lspeed = 2;
+
+  if (buttons & LOOK_UP)     look      =  lspeed;
+  if (buttons & LOOK_DOWN)   look      = -lspeed;
+  if (buttons & LOOK_CENTER) look      = TOCENTER;
+  if (buttons & FLY_UP)      flyheight =  5; // note that the actual flyheight will be twice this
+  if (buttons & FLY_DOWN)    flyheight = -5;
+  if (buttons & FLY_CENTER)
   {
-    int newweapon = inputs->WeaponSelect - 1;
+    flyheight = TOCENTER;
+    look      = TOCENTER;
+  }
+
+  if (player->playerstate == PST_LIVE /*&& !dsda_FreeAim()*/)
+  {
+      if (look < 0) look += 16;
+      dest->lookfly = look;
+  }
+  if (flyheight < 0) flyheight += 16;
+  dest->lookfly |= flyheight << 4;
+
+  // weapon selection
+  if (dest->buttons & BT_CHANGE)
+  {
+    int newweapon = src->WeaponSelect - 1;
 
     if (!demo_compatibility)
     {
@@ -165,10 +203,10 @@ void player_input(struct PackedPlayerInput *inputs, int playerId)
         newweapon = wp_chainsaw;
     }
 
-    local_cmds[playerId].buttons |= (newweapon) << BT_WEAPONSHIFT;
+    dest->buttons |= (newweapon) << BT_WEAPONSHIFT;
   }
 
-  lastButtons[playerId] = extraButtons;
+  lastButtons[id] = buttons;
 }
 
 ECL_EXPORT void dsda_get_audio(int *n, void **buffer)

waterbox/dsda/BizhawkInterface.h

@@ -91,6 +91,8 @@ extern fixed_t scale_ftom;
 #define PALETTE_SIZE 256
 uint32_t _convertedPaletteBuffer[PALETTE_SIZE];
 
+#define SLOWTURNTICS 6
+
 enum ExtraButtons
 {
   REGULAR_BUTTON_MASK = 0b0000000000000111,