diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 27119b5a8..008ec933c 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -646,7 +646,7 @@ local PlayerLabels = { access_incs = PL".access_incs", numloogs = DISABLED_PL".numloogs", - loogcnt = DISABLED_PL".loogcnt", + loogcnt = PL".loogcnt", scream_voice = { PL".scream_voice" }, last_weapon = PL".last_weapon", @@ -841,6 +841,7 @@ local UserdefLabels = { camerasprite = UDRO".camerasprite", cashman = UDRO".cashman", clipping = UD".noclip", -- NAME + color = UD".color", const_visibility = UD".const_visibility", crosshair = UD".crosshair", crosshairscale = UDRO".crosshairscale", diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua index 0e5a91f04..1a94ac838 100644 --- a/polymer/eduke32/source/lunatic/control.lua +++ b/polymer/eduke32/source/lunatic/control.lua @@ -926,7 +926,7 @@ function _qgetsysstr(qdst, what, pli) ffi.copy(dst, "multiplayer not yet implemented") -- TODO_MP elseif (what == ffiC.STR_VOLUMENAME) then local vol = ffiC.ud.volume_number - bcheck.volume_number(vol) + bcheck.volume_idx(vol) ffi.copy(dst, ffiC.EpisodeNames[vol], ffi.sizeof(ffiC.EpisodeNames[0])) else error("unknown system string ID "..what, 2) diff --git a/polymer/eduke32/source/lunatic/test/gamearray.con b/polymer/eduke32/source/lunatic/test/gamearray.con index de1a85550..88a2313f5 100644 --- a/polymer/eduke32/source/lunatic/test/gamearray.con +++ b/polymer/eduke32/source/lunatic/test/gamearray.con @@ -106,6 +106,8 @@ onevent EVENT_ENTERLEVEL ifvarn asdsz NEWASDSZ state error redefinequote 500 [%d]: qwe=%d, qwe1=%d, asd=%d, asd1=%d + redefinequote 501 Because C-CON can't qsprintf into an uninitialized one + setvar i 0 whilevarvarn i -1 {