OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Exposed some skymist variables to zscript. Created zscript levellocals functions ChangeSkyMist(TextureID skymist, bool usemist = true), SetSkyFog(int density), and SetThickFog(float distance, float multiplier), so people aren't tied to MAPINFO for such things.

Browse source
This commit is contained in:
Dileep V. Reddy 2025-05-18 17:48:32 -06:00 • committed by Ricardo Luís Vaz Silva
commit 95164cce51
4 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gamedata/g_mapinfo.cpp
View file

@ -1588,7 +1588,9 @@ DEFINE_MAP_OPTION(thickfogmultiplier, false)
{
parse.ParseAssign();
parse.sc.MustGetFloat();
info->thickfogmultiplier = (float)parse.sc.Float;
// [DVR] Negative multiplier does have a crazy saturated-white effect, like a nuke blastfront
// Could be useful for something some day
if ((float)parse.sc.Float > 0.0) info->thickfogmultiplier = (float)parse.sc.Float;
}
DEFINE_MAP_OPTION(pixelratio, false)

28
src/scripting/vmthunks.cpp
View file

@ -1742,11 +1742,39 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, SetXOffset, SetXOffset)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_INT(skymist);
PARAM_BOOL(usemist);
self->skymisttexture = FSetTextureID(skymist);
if (usemist)
{
self->flags3 |= LEVEL3_SKYMIST;
}
else
{
self->flags3 &= ~LEVEL3_SKYMIST;
}
InitSkyMap(self);
return 0;
}
DEFINE_ACTION_FUNCTION(FLevelLocals, SetSkyFog)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_INT(fogdensity);
self->skyfog = fogdensity;
InitSkyMap(self);
return 0;
}
DEFINE_ACTION_FUNCTION(FLevelLocals, SetThickFog)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_FLOAT(distance);
PARAM_FLOAT(multiplier);
self->thickfogdistance = distance;
if (multiplier > 0.0) self->thickfogmultiplier = multiplier;
return 0;
}
DEFINE_ACTION_FUNCTION(FLevelLocals, StartIntermission)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);

1
wadsrc/static/zscript/constants.zs
View file

@ -1420,6 +1420,7 @@ enum ELevelFlags
LEVEL3_LIGHTCREATED = 0x00080000, // a light had been created in the last frame
LEVEL3_NOFOGOFWAR = 0x00100000, // disables effect of r_radarclipper CVAR on this map
LEVEL3_SECRET = 0x00200000, // level is a secret level
LEVEL3_SKYMIST = 0x00400000, // level skyfog uses the skymist texture
};
// [RH] Compatibility flags.

7
wadsrc/static/zscript/doombase.zs
View file

@ -389,6 +389,7 @@ struct LevelInfo native
native readonly String NextSecretMap;
native readonly String SkyPic1;
native readonly String SkyPic2;
native readonly String SkyMistPic;
native readonly String F1Pic;
native readonly int cluster;
native readonly int partime;
@ -404,6 +405,7 @@ struct LevelInfo native
native readonly int musicorder;
native readonly float skyspeed1;
native readonly float skyspeed2;
native readonly float skymistspeed;
native readonly int cdtrack;
native readonly double gravity;
native readonly double aircontrol;
@ -496,8 +498,10 @@ struct LevelLocals native
native readonly int musicorder;
native readonly TextureID skytexture1;
native readonly TextureID skytexture2;
native readonly TextureID skymisttexture;
native float skyspeed1;
native float skyspeed2;
native float skymistspeed;
native int total_secrets;
native int found_secrets;
native int total_items;
@ -592,6 +596,9 @@ struct LevelLocals native
native String GetChecksum() const;
native void ChangeSky(TextureID sky1, TextureID sky2 );
native void ChangeSkyMist(TextureID skymist, bool usemist = true);
native void SetSkyFog(int fogdensity);
native void SetThickFog(float distance, float multiplier);
native void ForceLightning(int mode = 0, sound tempSound = "");
native clearscope Thinker CreateClientsideThinker(class<Thinker> type, int statnum = Thinker.STAT_DEFAULT);