zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 08:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: slightly cleaner weapondata_t access.

Browse source 
Also, for the embedded translator: don't warn on unrecognized command line opt.

git-svn-id: https://svn.eduke32.com/eduke32@3590 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-03-21 10:20:20 +00:00
parent 904a26e045
commit 700d9cef0c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -377,6 +377,10 @@ typedef struct {
int32_t shade; int32_t shade;
} hudweapon_t; } hudweapon_t;
typedef
]].. WEAPONDATA_STRUCT ..[[
weapondata_t;
typedef typedef
]].. PROJECTILE_STRUCT ..[[ ]].. PROJECTILE_STRUCT ..[[
projectile_t; projectile_t;
@ -394,10 +398,6 @@ typedef struct {
int16_t sect; int16_t sect;
} camera_t; } camera_t;
typedef struct {
]] .. table.concat(con_lang.wdata_members, ';')..';' .. [[
} weapondata_t;
enum enum
{ {
MAXMOUSEBUTTONS = 10, MAXMOUSEBUTTONS = 10,
@ -738,7 +738,7 @@ end
local actor_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(ACTOR_STRUCT))) local actor_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(ACTOR_STRUCT)))
local player_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(DUKEPLAYER_STRUCT))) local player_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(DUKEPLAYER_STRUCT)))
local projectile_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(PROJECTILE_STRUCT))) local projectile_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(PROJECTILE_STRUCT)))
local weapondata_ptr_ct = ffi.typeof("$ *", ffi.typeof(strip_const(WEAPONDATA_STRUCT))) local weapondata_ptr_ct = ffi.typeof("$ *", ffi.typeof((strip_const(WEAPONDATA_STRUCT):gsub(" _"," "))))
local con_action_ct = ffi.typeof("con_action_t") local con_action_ct = ffi.typeof("con_action_t")
local con_move_ct = ffi.typeof("con_move_t") local con_move_ct = ffi.typeof("con_move_t")
local con_ai_ct = ffi.typeof("con_ai_t") local con_ai_ct = ffi.typeof("con_ai_t")
@ -936,7 +936,7 @@ local weapondata_mt = {
end end
end end
ffi.cast(weapondata_ptr_ct, wd)['_'..member] = val ffi.cast(weapondata_ptr_ct, wd)[member] = val
end, end,
} }
ffi.metatype("weapondata_t", weapondata_mt) ffi.metatype("weapondata_t", weapondata_mt)

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

@ -3171,7 +3171,7 @@ local function handle_cmdline_arg(str)
ok = true ok = true
end end
if (not ok) then if (not ffi and not ok) then
printf("Warning: Unrecognized option %s", str) printf("Warning: Unrecognized option %s", str)
end end
end end