Skip to content

Commit 22049b2

Browse files
authored
Allow freelook in dsdademos (#741)
1 parent af2fe50 commit 22049b2

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

prboom2/src/dsda/excmd.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,11 @@ dboolean dsda_AllowJumping(void) {
6464
}
6565

6666
dboolean dsda_FreeAim(void) {
67-
return (allow_incompatibility && dsda_IntConfig(dsda_config_freelook))
67+
return ((allow_incompatibility || dsda_AllowCasualExCmdFeatures())
68+
&& dsda_IntConfig(dsda_config_freelook))
6869
|| map_info.flags & MI_ALLOW_FREE_LOOK;
6970
}
7071

71-
dboolean dsda_AllowFreeLook(void) {
72-
return dsda_FreeAim() || dsda_AllowCasualExCmdFeatures();
73-
}
74-
7572
void dsda_ReadExCmd(ticcmd_t* cmd, const byte** p) {
7673
const byte* demo_p = *p;
7774

prboom2/src/dsda/excmd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dboolean dsda_ExCmdDemo(void);
3636
void dsda_EnableCasualExCmdFeatures(void);
3737
dboolean dsda_AllowCasualExCmdFeatures(void);
3838
dboolean dsda_AllowJumping(void);
39-
dboolean dsda_AllowFreeLook(void);
4039
dboolean dsda_FreeAim(void);
4140
void dsda_ReadExCmd(ticcmd_t* cmd, const byte** p);
4241
void dsda_WriteExCmd(char** p, ticcmd_t* cmd);

prboom2/src/g_game.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ void G_BuildTiccmd(ticcmd_t* cmd)
809809
if (players[consoleplayer].mo && players[consoleplayer].mo->pitch && !dsda_MouseLook())
810810
dsda_QueueExCmdLook(XC_LOOK_RESET);
811811

812-
if (dsda_AllowFreeLook())
812+
if (dsda_FreeAim())
813813
{
814814
short look;
815815

0 commit comments

Comments
 (0)