From b805e10058904be7ed7bfa8673dbe250b3957d7f Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Sun, 6 Sep 2020 19:03:17 +0930
Subject: [PATCH] Let analog control schemes control objectplace like standard
control schemes
---
src/g_game.h | 3 ++-
src/m_cheat.c | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/g_game.h b/src/g_game.h
index c8abe560c..26f60e125 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -18,6 +18,7 @@
#include "doomstat.h"
#include "d_event.h"
#include "g_demo.h"
+#include "m_cheat.h" // objectplacing
extern char gamedatafilename[64];
extern char timeattackfolder[64];
@@ -64,7 +65,7 @@ typedef enum {
CS_STANDARD,
CS_SIMPLE = CS_LMAOGALOG|CS_STANDARD,
} controlstyle_e;
-#define G_ControlStyle(ssplayer) (cv_directionchar[(ssplayer)-1].value == 3 ? CS_LMAOGALOG : ((cv_analog[(ssplayer)-1].value ? CS_LMAOGALOG : 0) | (cv_directionchar[(ssplayer)-1].value ? CS_STANDARD : 0)))
+#define G_ControlStyle(ssplayer) (cv_directionchar[(ssplayer)-1].value == 3 ? CS_LMAOGALOG : ((!objectplacing && cv_analog[(ssplayer)-1].value ? CS_LMAOGALOG : 0) | (cv_directionchar[(ssplayer)-1].value ? CS_STANDARD : 0)))
#define P_ControlStyle(player) ((((player)->pflags & PF_ANALOGMODE) ? CS_LMAOGALOG : 0) | (((player)->pflags & PF_DIRECTIONCHAR) ? CS_STANDARD : 0))
extern consvar_t cv_autobrake, cv_autobrake2;
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 3a2bf79a8..2fe4552ff 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1298,8 +1298,7 @@ void OP_ObjectplaceMovement(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
- if (!player->climbing && (netgame || !cv_analog[0].value || (player->pflags & PF_SPINNING)))
- player->drawangle = player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
+ player->drawangle = player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
ticruned++;
if (!(cmd->angleturn & TICCMD_RECEIVED))
--
GitLab