LunaCON: implement qgetsysstr/STR_VOLUMENAME.

git-svn-id: https://svn.eduke32.com/eduke32@3872 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-06-12 17:49:51 +00:00
parent 570d35dbaa
commit bbcf6d6353
3 changed files with 7 additions and 4 deletions

View file

@ -762,7 +762,9 @@ function _qgetsysstr(qdst, what, pli)
elseif (what == ffiC.STR_GAMETYPE) then elseif (what == ffiC.STR_GAMETYPE) then
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
ffi.copy(dst, "STR_VOLUMENAME: NYI") local vol = ffiC.ud.volume_number
assert(vol+0ULL < con_lang.MAXVOLUMES)
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)
end end

View file

@ -570,6 +570,7 @@ int32_t g_RETURN; // deprecated from Lua
-- INTERNAL VARIABLES/FUNCTIONS -- INTERNAL VARIABLES/FUNCTIONS
decl("map_t MapInfo[$*$];", con_lang.MAXVOLUMES+1, con_lang.MAXLEVELS) decl("map_t MapInfo[$*$];", con_lang.MAXVOLUMES+1, con_lang.MAXLEVELS)
decl("char EpisodeNames[$][33];", con_lang.MAXVOLUMES)
decl[[ decl[[
int32_t g_elCONSize; int32_t g_elCONSize;
@ -1741,9 +1742,8 @@ local event_funcs = {}
local gameevent_internal = gameevent_internal -- included in lunatic.c local gameevent_internal = gameevent_internal -- included in lunatic.c
-- gameevent(<event idx or string> [, flags], <event function>) -- gameevent(<event idx or string> [, flags], <event function>)
local function our_gameevent(event, flags, func) local function our_gameevent(event, flags, func)
if (ffiC.g_elCallDepth > 0) then bcheck.top_level("gameevent")
error("Invalid use of gameevent: must be called from top level", 2)
end
if (type(event) == "string") then if (type(event) == "string") then
if (event:sub(1,6) ~= "EVENT_") then if (event:sub(1,6) ~= "EVENT_") then
event = "EVENT_"..event event = "EVENT_"..event

View file

@ -108,6 +108,7 @@ g_elModules;
g_modDir; g_modDir;
MapInfo; MapInfo;
EpisodeNames;
kopen4loadfrommod; kopen4loadfrommod;