zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-28 22:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exports sky textures to ZScript (readonly, needs setter function due to the setup required) and speeds, along with a ChangeSky function for setting the textures.

Browse source
This commit is contained in:
Marisa Kirisame 2018-01-26 19:46:08 +01:00 committed by Christoph Oelckers
parent 8cfb1cba7c
commit 92547028f3
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/g_level.cpp
View file

@ -2028,6 +2028,10 @@ DEFINE_FIELD(FLevelLocals, F1Pic)
DEFINE_FIELD(FLevelLocals, maptype) DEFINE_FIELD(FLevelLocals, maptype)
DEFINE_FIELD(FLevelLocals, Music) DEFINE_FIELD(FLevelLocals, Music)
DEFINE_FIELD(FLevelLocals, musicorder) DEFINE_FIELD(FLevelLocals, musicorder)
DEFINE_FIELD(FLevelLocals, skytexture1)
DEFINE_FIELD(FLevelLocals, skytexture2)
DEFINE_FIELD(FLevelLocals, skyspeed1)
DEFINE_FIELD(FLevelLocals, skyspeed2)
DEFINE_FIELD(FLevelLocals, total_secrets) DEFINE_FIELD(FLevelLocals, total_secrets)
DEFINE_FIELD(FLevelLocals, found_secrets) DEFINE_FIELD(FLevelLocals, found_secrets)
DEFINE_FIELD(FLevelLocals, total_items) DEFINE_FIELD(FLevelLocals, total_items)
@ -2093,3 +2097,19 @@ CCMD(skyfog)
} }
} }
//==========================================================================
//
// ZScript counterpart to ACS ChangeSky, uses TextureIDs
//
//==========================================================================
DEFINE_ACTION_FUNCTION(FLevelLocals, ChangeSky)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_INT(sky1);
PARAM_INT(sky2);
sky1texture = self->skytexture1 = FSetTextureID(sky1);
sky2texture = self->skytexture2 = FSetTextureID(sky2);
R_InitSkyMap();
return 0;
}

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

@ -591,6 +591,10 @@ struct LevelLocals native
native readonly int maptype; native readonly int maptype;
native readonly String Music; native readonly String Music;
native readonly int musicorder; native readonly int musicorder;
native readonly TextureID skytexture1;
native readonly TextureID skytexture2;
native float skyspeed1;
native float skyspeed2;
native int total_secrets; native int total_secrets;
native int found_secrets; native int found_secrets;
native int total_items; native int total_items;
@ -641,6 +645,8 @@ struct LevelLocals native
native String GetChecksum() const; native String GetChecksum() const;
native void ChangeSky( TextureID sky1, TextureID sky2 );
String TimeFormatted(bool totals = false) String TimeFormatted(bool totals = false)
{ {
int sec = Thinker.Tics2Seconds(totals? totaltime : time); int sec = Thinker.Tics2Seconds(totals? totaltime : time);