diff --git a/.hgignore b/.hgignore index b202373..3b4215e 100644 --- a/.hgignore +++ b/.hgignore @@ -5,6 +5,8 @@ recursos/* bin/* obj/* Debug/* +Release/* +data/* *.suo *.sdf *.opensdf diff --git a/data.jrf b/data.jrf index 7da3b2d..c7b0687 100755 Binary files a/data.jrf and b/data.jrf differ diff --git a/jsound.cpp b/jsound.cpp index 7c8f9a2..c2ce9d0 100755 --- a/jsound.cpp +++ b/jsound.cpp @@ -22,7 +22,6 @@ void JS_LoadMusic(char *musicFilename) SDL_RWops *rw = SDL_RWFromMem(buffer, filesize); music = Mix_LoadMUS_RW(rw, 1); - } void JS_SetMusicVolume(int volume) { diff --git a/main.cpp b/main.cpp index 32391f5..7f1e8f5 100755 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include "jgame.h" #include "jdraw8.h" +#include "jsound.h" #include "jfile.h" #include "info.h" #include "modulegame.h" @@ -31,6 +32,7 @@ int main( int argc, char* args[] ) { JG_Init(); JD8_Init("Aventures En Egipte"); + JS_Init(); Info info; info.num_habitacio = 1; @@ -60,6 +62,7 @@ int main( int argc, char* args[] ) { } JF_Quit(); + JS_Finalize(); JD8_Quit(); JG_Finalize(); diff --git a/modulesequence.cpp b/modulesequence.cpp index 0e842a9..23fe904 100755 --- a/modulesequence.cpp +++ b/modulesequence.cpp @@ -3,6 +3,7 @@ #include "jgame.h" #include "jdraw8.h" #include "jinput.h" +#include "jsound.h" #include #include @@ -73,6 +74,9 @@ const int minim( const int a, const int b ) { void ModuleSequence::doIntro() { JG_SetUpdateTicks(1000); + JS_LoadMusic("00000003.xm"); + JS_PlayMusic(-1); + JD8_Surface gfx = JD8_LoadSurface( "logo.gif" ); JD8_Palette pal = JD8_LoadPalette( "logo.gif" ); JD8_SetScreenPalette( pal );