zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

LunaCON: player[].loogcnt, userdef[].color, minor fixes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4732 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-11-07 22:07:10 +00:00
parent 76d60511bc
commit 0cc9f05b8b
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -646,7 +646,7 @@ local PlayerLabels = {
access_incs = PL".access_incs", access_incs = PL".access_incs",
numloogs = DISABLED_PL".numloogs", numloogs = DISABLED_PL".numloogs",
loogcnt = DISABLED_PL".loogcnt", loogcnt = PL".loogcnt",
scream_voice = { PL".scream_voice" }, scream_voice = { PL".scream_voice" },
last_weapon = PL".last_weapon", last_weapon = PL".last_weapon",
@ -841,6 +841,7 @@ local UserdefLabels = {
camerasprite = UDRO".camerasprite", camerasprite = UDRO".camerasprite",
cashman = UDRO".cashman", cashman = UDRO".cashman",
clipping = UD".noclip", -- NAME clipping = UD".noclip", -- NAME
color = UD".color",
const_visibility = UD".const_visibility", const_visibility = UD".const_visibility",
crosshair = UD".crosshair", crosshair = UD".crosshair",
crosshairscale = UDRO".crosshairscale", crosshairscale = UDRO".crosshairscale",

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

@ -926,7 +926,7 @@ function _qgetsysstr(qdst, what, pli)
ffi.copy(dst, "multiplayer not yet implemented") -- TODO_MP ffi.copy(dst, "multiplayer not yet implemented") -- TODO_MP
elseif (what == ffiC.STR_VOLUMENAME) then elseif (what == ffiC.STR_VOLUMENAME) then
local vol = ffiC.ud.volume_number 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])) ffi.copy(dst, ffiC.EpisodeNames[vol], ffi.sizeof(ffiC.EpisodeNames[0]))
else else
error("unknown system string ID "..what, 2) error("unknown system string ID "..what, 2)

2
polymer/eduke32/source/lunatic/test/gamearray.con
View file

@ -106,6 +106,8 @@ onevent EVENT_ENTERLEVEL
ifvarn asdsz NEWASDSZ state error ifvarn asdsz NEWASDSZ state error
redefinequote 500 [%d]: qwe=%d, qwe1=%d, asd=%d, asd1=%d 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 setvar i 0
whilevarvarn i -1 whilevarvarn i -1
{ {