zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 11:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: rename con.peractorvar to simply con.actorvar.

Browse source 
NOTE: I'm committing this from my git clone again. If this works OK,
everything is in good order again. If not, I hope that I won't damage
the SVN repo. *Runs away...*

git-svn-id: https://svn.eduke32.com/eduke32@3798 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-05-20 19:58:54 +00:00
parent 314f87691b
commit d966ed7de1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1768,7 +1768,7 @@ local function kopen4load(fn, searchfirst)
end end
-- Common serialization function for gamearray and peractorvar. -- Common serialization function for gamearray and actorvar.
local function serialize_array(ar, strtab) local function serialize_array(ar, strtab)
for i,v in pairs(ar) do for i,v in pairs(ar) do
if (type(i)=="number") then if (type(i)=="number") then
@ -1936,7 +1936,7 @@ local gamearray_methods = {
end, end,
_serialize = function(gar) _serialize = function(gar)
local strtab = { OUR_NAME..".peractorvar(", tostring(gar._size), ",{" } local strtab = { OUR_NAME..".actorvar(", tostring(gar._size), ",{" }
return serialize_array(gar, strtab) return serialize_array(gar, strtab)
end, end,
} }
@ -1969,7 +1969,7 @@ local gamearray_mt = {
__metatable = "serializeable", __metatable = "serializeable",
} }
-- Common constructor helper for gamearray and peractorvar. -- Common constructor helper for gamearray and actorvar.
local function set_values_from_table(ar, values) local function set_values_from_table(ar, values)
if (values ~= nil) then if (values ~= nil) then
for i,v in pairs(values) do for i,v in pairs(values) do
@ -2003,7 +2003,7 @@ end
-- Per-actor variable. -- Per-actor variable.
local peractorvar_methods = { local actorvar_methods = {
--- Serialization --- --- Serialization ---
_get_require = function(acv) _get_require = function(acv)
@ -2011,19 +2011,19 @@ local peractorvar_methods = {
end, end,
_serialize = function(acv) _serialize = function(acv)
local strtab = { OUR_NAME..".peractorvar(", tostring(acv._defval), ",{" } local strtab = { OUR_NAME..".actorvar(", tostring(acv._defval), ",{" }
return serialize_array(acv, strtab) return serialize_array(acv, strtab)
end, end,
} }
-- XXX: How about types other than numbers? -- XXX: How about types other than numbers?
local peractorvar_mt = { local actorvar_mt = {
__index = function(acv, idx) __index = function(acv, idx)
if (type(idx)=="number") then if (type(idx)=="number") then
check_sprite_idx(idx) check_sprite_idx(idx)
return acv._defval return acv._defval
else else
return peractorvar_methods[idx] return actorvar_methods[idx]
end end
end, end,
@ -2048,7 +2048,7 @@ local peractorvar_mt = {
-- <initval>: default value for per-actor variable. -- <initval>: default value for per-actor variable.
-- <values>: optional, a table of <spritenum>=value -- <values>: optional, a table of <spritenum>=value
function peractorvar(initval, values) function actorvar(initval, values)
local acv = setmetatable({ _defval=initval }, peractorvar_mt) local acv = setmetatable({ _defval=initval }, actorvar_mt)
return set_values_from_table(acv, values) return set_values_from_table(acv, values)
end end

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

@ -1175,7 +1175,7 @@ function Cmd.gamevar(identifier, initval, flags)
-- TODO: Write gamevar system on the Lunatic side and hook it up. -- TODO: Write gamevar system on the Lunatic side and hook it up.
-- TODO: per-player gamevars -- TODO: per-player gamevars
if (bit.band(flags, GVFLAG.PERX_MASK)==GVFLAG.PERACTOR) then if (bit.band(flags, GVFLAG.PERX_MASK)==GVFLAG.PERACTOR) then
addcodef("%s=_con.peractorvar(%d)", gv.name, initval) addcodef("%s=_con.actorvar(%d)", gv.name, initval)
else else
addcodef("%s=%d", gv.name, initval) addcodef("%s=%d", gv.name, initval)
end end