diff --git a/src/events.cpp b/src/events.cpp index 2649bf162..cca0a9398 100755 --- a/src/events.cpp +++ b/src/events.cpp @@ -762,6 +762,7 @@ void DStaticEventHandler::WorldThingDamaged(AActor* actor, AActor* inflictor, AA return; FWorldEvent e = E_SetupWorldEvent(); e.Thing = actor; + e.Inflictor = inflictor; e.Damage = damage; e.DamageSource = source; e.DamageType = mod; diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index f7b84f21b..274c865bf 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -1267,3 +1267,16 @@ DEFINE_ACTION_FUNCTION(FStringStruct, LastIndexOf) ACTION_RETURN_INT(self->LastIndexOf(substr)); } +DEFINE_ACTION_FUNCTION(FStringStruct, ToUpper) +{ + PARAM_SELF_STRUCT_PROLOGUE(FString); + self->ToUpper(); + return 0; +} + +DEFINE_ACTION_FUNCTION(FStringStruct, ToLower) +{ + PARAM_SELF_STRUCT_PROLOGUE(FString); + self->ToLower(); + return 0; +} diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 485991a07..ee676b051 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -689,6 +689,30 @@ EBDAC00E9D25D884B2C8F4B1F0390539 // doom2.wad map21 setsectorspecial 93 0 setwalltexture 582 back top ZIMMER3 } +20251EDA21B2F2ECF6FF5B8BBC00B26C // Doom II, MAP29 +{ + // Missing textures on teleporters + setwalltexture 405 back bot SUPPORT3 + setwalltexture 406 back bot SUPPORT3 + setwalltexture 407 back bot SUPPORT3 + setwalltexture 408 back bot SUPPORT3 + setwalltexture 516 back bot SUPPORT3 + setwalltexture 517 back bot SUPPORT3 + setwalltexture 518 back bot SUPPORT3 + setwalltexture 519 back bot SUPPORT3 + setwalltexture 524 back bot SUPPORT3 + setwalltexture 525 back bot SUPPORT3 + setwalltexture 526 back bot SUPPORT3 + setwalltexture 527 back bot SUPPORT3 + setwalltexture 1146 back bot SUPPORT3 + setwalltexture 1147 back bot SUPPORT3 + setwalltexture 1148 back bot SUPPORT3 + setwalltexture 1149 back bot SUPPORT3 + setwalltexture 1138 back bot SUPPORT3 + setwalltexture 1139 back bot SUPPORT3 + setwalltexture 1140 back bot SUPPORT3 + setwalltexture 1141 back bot SUPPORT3 +} ABC4EB5A1535ECCD0061AD14F3547908 // Plutonia Experiment, map26 { setsectorspecial 156 0 diff --git a/wadsrc/static/shaders/glsl/main.fp b/wadsrc/static/shaders/glsl/main.fp index 2fb762bad..cab4f5d9b 100644 --- a/wadsrc/static/shaders/glsl/main.fp +++ b/wadsrc/static/shaders/glsl/main.fp @@ -220,6 +220,7 @@ float diffuseContribution(vec3 lightDirection, vec3 normal) float pointLightAttenuation(vec4 lightpos, float lightcolorA) { float attenuation = max(lightpos.w - distance(pixelpos.xyz, lightpos.xyz),0.0) / lightpos.w; + if (attenuation == 0.0) return 0.0; #ifdef SUPPORTS_SHADOWMAPS float shadowIndex = abs(lightcolorA) - 1.0; attenuation *= shadowmapAttenuation(lightpos, shadowIndex); diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index b2fd9c6c8..b7607d555 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -658,6 +658,8 @@ struct StringStruct native native String Filter(); native int IndexOf(String substr, int startIndex = 0) const; native int LastIndexOf(String substr) const; + native void ToUpper(); + native void ToLower(); } class SectorEffect : Thinker native