diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg index 6bae1494f5f6ae140adc33b0a072cc70f754a25a..952ce6969188c0e8e0c2ad27a04d6815942bcd92 100644 --- a/extras/conf/SRB2-22.cfg +++ b/extras/conf/SRB2-22.cfg @@ -6491,7 +6491,7 @@ thingtypes centerHitbox = true; flagsvaluetext = "Height"; angletext = "Pitch/Yaw"; - fixedrotation = 1; + parametertext = "Degrees?"; } 1706 { @@ -6551,6 +6551,8 @@ thingtypes height = 160; unflippable = true; centerHitbox = true; + angletext = "Pitch/Yaw"; + parametertext = "Degrees?"; } 1714 { diff --git a/src/p_setup.c b/src/p_setup.c index deb308da22ea5bd45837f8848baba8e1c9e41d67..4faba13581f87a865cc8df18ef7491157a0ec88d 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -6627,8 +6627,8 @@ static void P_ConvertBinaryThingTypes(void) case 1713: //Hoop (Customizable) { UINT16 oldangle = mapthings[i].angle; - mapthings[i].angle = ((oldangle >> 8)*360)/256; - mapthings[i].pitch = ((oldangle & 255)*360)/256; + mapthings[i].angle = (mapthings[i].extrainfo == 1) ? oldangle - 90 : ((oldangle >> 8)*360)/256; + mapthings[i].pitch = (mapthings[i].extrainfo == 1) ? oldangle / 360 : ((oldangle & 255)*360)/256; mapthings[i].args[0] = (mapthings[i].type == 1705) ? 96 : (mapthings[i].options & 0xF)*16 + 32; mapthings[i].options &= ~0xF; mapthings[i].type = 1713;