From 234a73635caa01e8edd9d98071ba4fd17fc9d61e Mon Sep 17 00:00:00 2001 From: Allanis Date: Sun, 16 Jun 2013 01:12:59 +0100 Subject: [PATCH] [Fix] Forgot to load snd/music.lua into packfile. --- bin/Makefile | 2 +- snd/music.lua | 2 +- src/music.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 1a1d274..225ba8d 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -55,7 +55,7 @@ endif DATA_AI = $(shell find ../scripts/ai/ -name '*.lua') DATA_GFX = $(shell find ../gfx/ -name '*.png') 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 = data DATAFILES = $(VERSIONFILE) $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) diff --git a/snd/music.lua b/snd/music.lua index ca5a44e..b8a8f1d 100644 --- a/snd/music.lua +++ b/snd/music.lua @@ -6,7 +6,7 @@ -- takeoff - player took off. -- combat - Player just got a hostile on screen. -- idle - Current playing music ran out. ---]]-- +]]-- last = "idle" function choose(str) if str == "load" then diff --git a/src/music.c b/src/music.c index a1b5646..564f882 100644 --- a/src/music.c +++ b/src/music.c @@ -372,7 +372,7 @@ static int music_luaInit(void) { music_lua = luaL_newstate(); - luaL_openlibs(music_lua); + //luaL_openlibs(music_lua); lua_loadSpace(music_lua, 1); // Space and time are readonly. lua_loadTime(music_lua, 1);