From e810071cfce79d62874c1d3f0c38ae7d6542ba4d Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 18 May 2014 09:55:42 +0000 Subject: [PATCH] LunaCON: add read-only variable 'Numsprites', r/w userdef member .mouseaiming. git-svn-id: https://svn.eduke32.com/eduke32@4475 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/lunatic/con_lang.lua | 1 + polymer/eduke32/source/lunatic/defs_common.lua | 1 + polymer/eduke32/source/lunatic/dynsymlist | 1 + polymer/eduke32/source/lunatic/dynsymlist_m32 | 1 + polymer/eduke32/source/lunatic/lunacon.lua | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 5b3fa28f8..c86a7b2a0 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -856,6 +856,7 @@ local UserdefLabels = { lockout = UDRO".lockout", m_player_skill = UDRO".m_player_skill", m_volume_number = UDRO".m_volume_number", + mouseaiming = UD".mouseaiming", pause_on = UDRO".pause_on", player_skill = UD".player_skill", mouseflip = UDRO".mouseflip", diff --git a/polymer/eduke32/source/lunatic/defs_common.lua b/polymer/eduke32/source/lunatic/defs_common.lua index c02dbe2dc..653e1f6fa 100644 --- a/polymer/eduke32/source/lunatic/defs_common.lua +++ b/polymer/eduke32/source/lunatic/defs_common.lua @@ -376,6 +376,7 @@ enum { ffi.cdef(maybe_strip_const("const int16_t numsectors, numwalls;")) ffi.cdef[[ +const int32_t Numsprites; const int32_t numyaxbunches; // XXX const int32_t totalclock; int32_t randomseed; // DEPRECATED diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index c5ee4e148..109dc7992 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -11,6 +11,7 @@ sprite; tsprite; spriteext; +Numsprites; numsectors; numwalls; numyaxbunches; diff --git a/polymer/eduke32/source/lunatic/dynsymlist_m32 b/polymer/eduke32/source/lunatic/dynsymlist_m32 index 78815cdfa..89f673f29 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist_m32 +++ b/polymer/eduke32/source/lunatic/dynsymlist_m32 @@ -11,6 +11,7 @@ sprite; tsprite; spriteext; +Numsprites; numsectors; numwalls; numyaxbunches; diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua index 46f804085..9d85438c4 100644 --- a/polymer/eduke32/source/lunatic/lunacon.lua +++ b/polymer/eduke32/source/lunatic/lunacon.lua @@ -385,7 +385,7 @@ local function new_initial_gvartab() numsectors = RO "_gv.numsectors", NUMSECTORS = RO "_gv.numsectors", NUMWALLS = RO "_gv.numwalls", - -- TODO: Numsprites + Numsprites = RO "_gv.Numsprites", randomseed = RW "_gv.randomseed", totalclock = RO "_gv.totalclock",