From a88a03e26e6dadc66af08e043a170e9ddbd2413e Mon Sep 17 00:00:00 2001
From: ? <zeno@attnam.com>
Date: Mon, 25 Feb 2019 18:42:17 +0100
Subject: [PATCH] 3D:: key names for 3D actions in shmup

---
 shmup.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/shmup.cpp b/shmup.cpp
index 38a16505..4c3d6fb1 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -76,6 +76,14 @@ namespace multi {
     "drop Dead Orb", "center the map on me", "Orb power (target: mouse)",
     "Orb power (target: facing)"
     };
+
+  vector<string> playercmds_shmup3 = {
+    "rotate up", "rotate down", "rotate left", "rotate right",
+    "move up", "move right", "move down", "move left", 
+    "throw a knife", "face the pointer", "throw at the pointer", 
+    "drop Dead Orb", "center the map on me", "Orb power (target: mouse)",
+    "Orb power (target: facing)"
+    };
   
   vector<string> playercmds_turn = {
     "move up-right", "move up-left", "move down-right", "move down-left", 
@@ -91,6 +99,13 @@ namespace multi {
     "world overview", "review your quest", "inventory", "main menu"
     };
 
+  vector<string> pancmds3 = {
+    "look up", "look right", "look down", "look left",
+    "rotate left", "rotate right", "home",
+    "world overview", "review your quest", "inventory", "main menu",
+    "scroll forward", "scroll backward"
+    };
+
 #define SHMUPAXES_BASE 4
 #define SHMUPAXES ((SHMUPAXES_BASE) + 4 * (MAXPLAYER))
 #define SHMUPAXES_CUR ((SHMUPAXES_BASE) + 4 * playercfg)
@@ -428,12 +443,12 @@ struct shmup_configurer {
     }
 
   void handleConfig(int sym, int uni) {
-    auto& cmdlist = shmupcfg ? playercmds_shmup : playercmds_turn;
+    auto& cmdlist = shmupcfg ? (DIM == 3 ? playercmds_shmup3 : playercmds_shmup) : playercmds_turn;
     
     #if CAP_SDL
     if(uni == '1') pushScreen(key_configurer(1, cmdlist));
     else if(uni == '2') pushScreen(key_configurer(2, cmdlist));
-    else if(uni == 'p') pushScreen(key_configurer(3, pancmds));
+    else if(uni == 'p') pushScreen(key_configurer(3, DIM == 3 ? pancmds3 : pancmds));
     else if(uni == '3') pushScreen(key_configurer(4, cmdlist));
     else if(uni == '4') pushScreen(key_configurer(5, cmdlist));
     else if(uni == '5') pushScreen(key_configurer(6, cmdlist));