Fixed: INHERITACTORPITCH was actually changed along with USEACTORPITCH...doesn't really make sense compatibility-wise but there it is. (reported by alekv)

This commit is contained in:
ZZYZX 2017-05-29 06:38:11 +03:00
parent d9d8c352a0
commit 7603e5fa30
3 changed files with 13 additions and 11 deletions

View file

@ -447,14 +447,15 @@ namespace CodeImp.DoomBuilder.Map
pitch = General.ClampAngle(newpitch); pitch = General.ClampAngle(newpitch);
switch(rendermode) switch (rendermode)
{ {
case ThingRenderMode.MODEL: case ThingRenderMode.MODEL:
ModelData md = General.Map.Data.ModeldefEntries[type]; float pmult = General.Map.Config.BuggyModelDefPitch ? 1 : -1;
if(md.InheritActorPitch || md.UseActorPitch) ModelData md = General.Map.Data.ModeldefEntries[type];
pitchrad = Angle2D.DegToRad((md.InheritActorPitch||!General.Map.Config.BuggyModelDefPitch) ? -pitch : pitch); if (md.InheritActorPitch || md.UseActorPitch)
else pitchrad = Angle2D.DegToRad(pmult * (md.InheritActorPitch ? -pitch : pitch));
pitchrad = 0; else
pitchrad = 0;
break; break;
case ThingRenderMode.FLATSPRITE: case ThingRenderMode.FLATSPRITE:
@ -581,9 +582,10 @@ namespace CodeImp.DoomBuilder.Map
switch(rendermode) switch(rendermode)
{ {
case ThingRenderMode.MODEL: case ThingRenderMode.MODEL:
ModelData md = General.Map.Data.ModeldefEntries[type]; float pmult = General.Map.Config.BuggyModelDefPitch ? 1 : -1;
ModelData md = General.Map.Data.ModeldefEntries[type];
rollrad = (md.UseActorRoll ? Angle2D.DegToRad(roll) : 0); rollrad = (md.UseActorRoll ? Angle2D.DegToRad(roll) : 0);
pitchrad = ((md.InheritActorPitch || md.UseActorPitch) ? Angle2D.DegToRad((md.InheritActorPitch || !General.Map.Config.BuggyModelDefPitch) ? -pitch : pitch) : 0); pitchrad = ((md.InheritActorPitch || md.UseActorPitch) ? Angle2D.DegToRad(pmult * (md.InheritActorPitch ? -pitch : pitch)) : 0);
break; break;
case ThingRenderMode.FLATSPRITE: case ThingRenderMode.FLATSPRITE:

View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2977")] [assembly: AssemblyVersion("2.3.0.2978")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("0e43985")] [assembly: AssemblyHash("d9d8c35")]

View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2977")] [assembly: AssemblyVersion("2.3.0.2978")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]