diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 60f62bdc2..354de57d5 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -172,7 +172,7 @@ ifneq (0,$(LUNATIC)) $(OBJ)/luaJIT_BC_randgen.$o \ $(OBJ)/luaJIT_BC_stat.$o \ $(OBJ)/luaJIT_BC_bitar.$o \ - $(OBJ)/luaJIT_BC_con.$o + $(OBJ)/luaJIT_BC_control.$o # now, take care of having the necessary symbols (sector, wall, etc.) in the # executable no matter what the debugging level diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index 802d805b7..c56a36293 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -577,7 +577,7 @@ end --== Custom operations for BUILD data structures ==-- -- declares struct action and struct move, and their ID-wrapped types -- con_action_t and con_move_t -local con = require("con") +local con = require("control") -- All-zero action and move local nullac, nullmv = ffi.new("const struct action"), ffi.new("const struct move") diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index fee92a145..10b023dd0 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -44,7 +44,7 @@ luaJIT_BC_geom; luaJIT_BC_randgen; luaJIT_BC_stat; luaJIT_BC_bitar; -luaJIT_BC_con; +luaJIT_BC_control; rand_jkiss_u32; rand_jkiss_dbl;