From 0a74a878e1e825191ab762631ff0624167dd9de6 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 7 Jun 2017 05:56:35 +0000 Subject: [PATCH] Rename savegame.lua to lunasave.lua to avoid a collision with savegame.cpp. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@6145 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 2 +- source/duke3d/src/lunatic/_defs_game.lua | 2 +- source/duke3d/src/lunatic/dynsymlist_game.lds | 2 +- source/duke3d/src/lunatic/{savegame.lua => lunasave.lua} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename source/duke3d/src/lunatic/{savegame.lua => lunasave.lua} (100%) diff --git a/GNUmakefile b/GNUmakefile index a9664839b..8ebe29ab7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -478,7 +478,7 @@ ifneq (0,$(LUNATIC)) randgen.lua \ stat.lua \ control.lua \ - savegame.lua \ + lunasave.lua \ fs.lua \ LUNATIC_EDITOR_LUA_OBJS = \ diff --git a/source/duke3d/src/lunatic/_defs_game.lua b/source/duke3d/src/lunatic/_defs_game.lua index 1b483ac23..2ee7e8198 100644 --- a/source/duke3d/src/lunatic/_defs_game.lua +++ b/source/duke3d/src/lunatic/_defs_game.lua @@ -2311,7 +2311,7 @@ local CON_MODULE_NAME = "_CON\0" -- Set up Lunatic gamevar serialization. do - local savegame = require("savegame") + local savegame = require("lunasave") -- Callback for: const char *(int32_t *slenptr, int32_t levelnum); ffiC.El_SerializeGamevars = function(slenptr, levelnum) diff --git a/source/duke3d/src/lunatic/dynsymlist_game.lds b/source/duke3d/src/lunatic/dynsymlist_game.lds index 48b9e0319..821186ad0 100644 --- a/source/duke3d/src/lunatic/dynsymlist_game.lds +++ b/source/duke3d/src/lunatic/dynsymlist_game.lds @@ -203,7 +203,7 @@ luaJIT_BC_v; luaJIT_BC_dump; luaJIT_BC_dis_x86; luaJIT_BC_dis_x64; -luaJIT_BC_savegame; +luaJIT_BC_lunasave; luaJIT_BC_fs; rand_jkiss_u32; diff --git a/source/duke3d/src/lunatic/savegame.lua b/source/duke3d/src/lunatic/lunasave.lua similarity index 100% rename from source/duke3d/src/lunatic/savegame.lua rename to source/duke3d/src/lunatic/lunasave.lua