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

[Add] Allow missions to interact with music subsystem.

Browse Source
This commit is contained in:
Allanis 2013-12-06 20:52:35 +00:00
parent 6c4007f5cb
commit 4176b20749
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dat/missions/emp_collective05.lua
View File

@ -174,6 +174,10 @@ function final_talk()
-- ESS Trinity becomes collective now. -- ESS Trinity becomes collective now.
trinity:setFaction("Collective") trinity:setFaction("Collective")
-- Some music.
music.load("galacticbattle")
music.play()
final_fight = 3 final_fight = 3
misn.timerStart("final_talk", rnd.int(4000, 5000)) misn.timerStart("final_talk", rnd.int(4000, 5000))
else if final_fight == 3 then else if final_fight == 3 then

2
src/misn_lua.c
View File

@ -22,6 +22,7 @@
#include "player.h" #include "player.h"
#include "ltime.h" #include "ltime.h"
#include "xml.h" #include "xml.h"
#include "music.h"
#include "misn_lua.h" #include "misn_lua.h"
/* Similar to lua vars, but with less variety. */ /* Similar to lua vars, but with less variety. */
@ -167,6 +168,7 @@ int misn_loadLibs(lua_State* L) {
lua_loadTk(L); lua_loadTk(L);
lua_loadHook(L); lua_loadHook(L);
lua_loadPilot(L, 0); lua_loadPilot(L, 0);
lua_loadMusic(L, 0);
return 0; return 0;
} }