zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of Lunatic updates. DONT_BUILD.

Browse source 
- LunaCON: support for setting userdef[].m_volume_number, getting .last_level
- bump con_lang.MAXEVENTS
- fix compilation of astub.c

git-svn-id: https://svn.eduke32.com/eduke32@4567 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-08-02 17:24:39 +00:00
parent b310eaef2c
commit 1486a2937b
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/astub.c
View file

@ -9860,8 +9860,8 @@ int32_t ExtPostStartupWindow(void)
{ {
extern const char luaJIT_BC_defs_m32[]; extern const char luaJIT_BC_defs_m32[];
i = L_RunString(&g_EmState, (char *)luaJIT_BC_defs_m32, 0, int32_t i = L_RunString(&g_EmState, (char *)luaJIT_BC_defs_m32, 0,
LUNATIC_DEFS_M32_BC_SIZE, "defs_m32.ilua"); LUNATIC_DEFS_M32_BC_SIZE, "defs_m32.ilua");
if (i != 0) if (i != 0)
{ {
Em_DestroyState(&g_EmState); Em_DestroyState(&g_EmState);

6
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -17,7 +17,6 @@ MAXGAMETYPES = 16
MAXSKILLS = 7 MAXSKILLS = 7
MAXEVENTS = 96 -- KEEPINSYNC with EVENT_* list
MAXSOUNDS = 4096 MAXSOUNDS = 4096
MAXSESSIONVARS = 8 -- KEEPINSYNC lunatic_game.c MAXSESSIONVARS = 8 -- KEEPINSYNC lunatic_game.c
@ -174,6 +173,8 @@ EVENT = {
-- EVENT_ANIMATEALLSPRITES = 97, -- internal -- EVENT_ANIMATEALLSPRITES = 97, -- internal
} }
MAXEVENTS = 97 -- KEEPINSYNC with above EVENT_* list
-- NOTE: negated values are not exported to the ffi.C namespace or CON. -- NOTE: negated values are not exported to the ffi.C namespace or CON.
-- See TWEAK_SFLAG below. -- See TWEAK_SFLAG below.
SFLAG = { SFLAG = {
@ -852,11 +853,12 @@ local UserdefLabels = {
fta_on = UD".fta_on", fta_on = UD".fta_on",
god = UDRO".god", god = UDRO".god",
idplayers = UDRO".idplayers", idplayers = UDRO".idplayers",
last_level = UDRO".lastlevel",
level_number = { UD".level_number", UD":set_level_number(%%s)", {0, MAXLEVELS-1} }, level_number = { UD".level_number", UD":set_level_number(%%s)", {0, MAXLEVELS-1} },
levelstats = UD".levelstats", levelstats = UD".levelstats",
lockout = UDRO".lockout", lockout = UDRO".lockout",
m_player_skill = UDRO".m_player_skill", m_player_skill = UDRO".m_player_skill",
m_volume_number = UDRO".m_volume_number", m_volume_number = { UD".m_volume_number", UD":set_m_volume_number(%%s)", {0, MAXVOLUMES} },
mouseaiming = UD".mouseaiming", mouseaiming = UD".mouseaiming",
pause_on = UDRO".pause_on", pause_on = UDRO".pause_on",
player_skill = UD".player_skill", player_skill = UD".player_skill",

8
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -1486,6 +1486,14 @@ local user_defs_mt = {
ud.volume_number = volume_number ud.volume_number = volume_number
end, end,
set_m_volume_number = function(ud, volume_number)
-- NOTE: allow volume_number==MAXVOLUMES.
if (not (volume_number==con_lang.MAXVOLUMES)) then
bcheck.volume_idx(volume_number)
end
ud.m_volume_number = volume_number
end,
set_level_number = function(ud, level_number) set_level_number = function(ud, level_number)
bcheck.level_idx(level_number) bcheck.level_idx(level_number)
ud.level_number = level_number ud.level_number = level_number

2
polymer/eduke32/source/lunatic/lunacon.lua
View file

@ -444,7 +444,7 @@ local function new_initial_gvartab()
} }
-- Reserved bits -- Reserved bits
gamevar.LOGO_FLAGS.rbits = bit.bnot(2097151) gamevar.LOGO_FLAGS.rbits = bit.bnot(0x001fffff)
for w=0,C.MAX_WEAPONS-1 do for w=0,C.MAX_WEAPONS-1 do
for i=1,#wmembers do for i=1,#wmembers do