Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Forgot to load snd/music.lua into packfile.

Browse Source
This commit is contained in:
Allanis 2013-06-16 01:12:59 +01:00
parent 25cd9e3ae5
commit 234a73635c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/Makefile
View File

@ -55,7 +55,7 @@ endif
DATA_AI = $(shell find ../scripts/ai/ -name '*.lua') DATA_AI = $(shell find ../scripts/ai/ -name '*.lua')
DATA_GFX = $(shell find ../gfx/ -name '*.png') DATA_GFX = $(shell find ../gfx/ -name '*.png')
DATA_XML = $(shell find ../dat/ -name '*.xml' -o -name '*.ttf') DATA_XML = $(shell find ../dat/ -name '*.xml' -o -name '*.ttf')
DATA_SND = $(shell find ../snd/ -name '*.ogg' -o -name '*.wav') DATA_SND = $(shell find ../snd/ -name '*.ogg' -o -name '*.wav') ../snd/music.lua
DATA_MISN = $(shell find ../dat/missions/ -name '*.lua') DATA_MISN = $(shell find ../dat/missions/ -name '*.lua')
DATA = data DATA = data
DATAFILES = $(VERSIONFILE) $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) DATAFILES = $(VERSIONFILE) $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN)

2
snd/music.lua
View File

@ -6,7 +6,7 @@
-- takeoff - player took off. -- takeoff - player took off.
-- combat - Player just got a hostile on screen. -- combat - Player just got a hostile on screen.
-- idle - Current playing music ran out. -- idle - Current playing music ran out.
--]]-- ]]--
last = "idle" last = "idle"
function choose(str) function choose(str)
if str == "load" then if str == "load" then

2
src/music.c
View File

@ -372,7 +372,7 @@ static int music_luaInit(void) {
music_lua = luaL_newstate(); music_lua = luaL_newstate();
luaL_openlibs(music_lua); //luaL_openlibs(music_lua);
lua_loadSpace(music_lua, 1); // Space and time are readonly. lua_loadSpace(music_lua, 1); // Space and time are readonly.
lua_loadTime(music_lua, 1); lua_loadTime(music_lua, 1);