zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-08-09 18:08:21 -04:00
commit 20552fb2b9
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/events.cpp
View file

@ -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;

13
src/scripting/thingdef_data.cpp
View file

@ -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;
}

24
wadsrc/static/compatibility.txt
View file

@ -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

1
wadsrc/static/shaders/glsl/main.fp
View file

@ -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);

2
wadsrc/static/zscript/base.txt
View file

@ -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