diff --git a/Readme.md b/Readme.md index 75da5ff..05770dc 100644 --- a/Readme.md +++ b/Readme.md @@ -58,7 +58,7 @@ This mod requires GZDoom 4.3 or later. - Hexen compatibility - Fancy titlemap - Semi-accurate UT sound behaviour - - Hacky cameratexture ammo counters for Pulsegun, Minigun, Flak Cannon and rocket launcher + - Hacky cameratexture ammo counters for Pulsegun, Minigun, Flak Cannon and rocket launcher (TEMPORARILY DISABLED DUE TO A MAJOR BUG) ## In progress diff --git a/zscript/ammoled.zsc b/zscript/ammoled.zsc index 0386fe8..8835425 100644 --- a/zscript/ammoled.zsc +++ b/zscript/ammoled.zsc @@ -8,6 +8,16 @@ Class PulseGunLED : Actor Actor base, digits[3], bar; transient PulseGun mygun; + Default + { + +NOGRAVITY; + +NOBLOCKMAP; + +NOINTERACTION; + +DONTSPLASH; + Radius .1; + Height 0; + } + override void PostBeginPlay() { SetOrigin((PULSELEDBASE+64,128,99),false); @@ -46,6 +56,16 @@ Class FlakCannonLED : Actor Actor base, digits[3]; transient FlakCannon mygun; + Default + { + +NOGRAVITY; + +NOBLOCKMAP; + +NOINTERACTION; + +DONTSPLASH; + Radius .1; + Height 0; + } + override void PostBeginPlay() { SetOrigin((FLAKLEDBASE+32,64,45),false); @@ -72,6 +92,16 @@ Class MinigunLED : Actor Actor base, digits[3]; transient Minigun mygun; + Default + { + +NOGRAVITY; + +NOBLOCKMAP; + +NOINTERACTION; + +DONTSPLASH; + Radius .1; + Height 0; + } + override void PostBeginPlay() { SetOrigin((MINILEDBASE+32,32,18),false); diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc index dd0206d..56f007b 100644 --- a/zscript/eightball.zsc +++ b/zscript/eightball.zsc @@ -307,7 +307,7 @@ Class UTRocketLauncher : UTWeapon } if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; ammoled.mygun = self; - TexMan.SetCameraToTexture(ammoled,"RAmmoLed",90); + //TexMan.SetCameraToTexture(ammoled,"RAmmoLed",90); } override void PostBeginPlay() diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc index ce69e3f..57138fd 100644 --- a/zscript/flakcannon.zsc +++ b/zscript/flakcannon.zsc @@ -650,7 +650,7 @@ Class FlakCannon : UTWeapon } if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; ammoled.mygun = self; - TexMan.SetCameraToTexture(ammoled,"FlakALed",90); + //TexMan.SetCameraToTexture(ammoled,"FlakALed",90); } action void A_Loading( bool first = false ) diff --git a/zscript/minigun.zsc b/zscript/minigun.zsc index 6453b14..7a15dd1 100644 --- a/zscript/minigun.zsc +++ b/zscript/minigun.zsc @@ -87,7 +87,7 @@ Class Minigun : UTWeapon } if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; ammoled.mygun = self; - TexMan.SetCameraToTexture(ammoled,"MiniALed",90); + //TexMan.SetCameraToTexture(ammoled,"MiniALed",90); } action void A_FireBullet( bool alt = false ) diff --git a/zscript/pulsegun.zsc b/zscript/pulsegun.zsc index 3b82284..7b56cc8 100644 --- a/zscript/pulsegun.zsc +++ b/zscript/pulsegun.zsc @@ -579,7 +579,7 @@ Class PulseGun : UTWeapon } if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; ammoled.mygun = self; - TexMan.SetCameraToTexture(ammoled,"PAmmoLed",90); + //TexMan.SetCameraToTexture(ammoled,"PAmmoLed",90); } override int, int, bool, bool GetClipAmount()