Added Language selection, sound ON/OFF and fixed some memory leak

nop90 · May 30, 2016 · bd38ed1 · bd38ed1
1 parent ae9bd2b
commit bd38ed1
Show file tree

Hide file tree

Showing 22 changed files with 160 additions and 1,795 deletions.
diff --git a/data/images/logos/flags.png b/data/images/logos/flags.png
diff --git a/src/3ds/os_3ds.cpp b/src/3ds/os_3ds.cpp
@@ -76,3 +76,11 @@ int getLanguage(void)
 {
 	return language;
 }
+
+void setLanguage(int languageID)
+{
+	if (languageID>5) language = 1;
+	else if (languageID<1) language = 5;
+	else language = languageID;
+
+}
diff --git a/src/3ds/os_3ds.h b/src/3ds/os_3ds.h
@@ -51,6 +51,7 @@ int SDL_GetKeyState(void* p);
 void SDL_ShowCursor(int s);
 
 int getLanguage(void);
+void setLanguage(int languageID);
 
 
 #define SDLK_ESCAPE	KEY_SELECT

diff --git a/src/3ds/sound_3ds.cpp b/src/3ds/sound_3ds.cpp
@@ -11,8 +11,8 @@ bool soundEnabled;
 
 FSOUND_SAMPLE SFX[NUMSFX];
 
-int SFXMasterVolume = 255;
-int MasterVolume = 255;
+int SFXMasterVolume = 64;
+int MasterVolume = 64;
 int frequency=0;
 int channel;
 
@@ -132,7 +132,7 @@ void FSOUND_SetSFXMasterVolume(u8 previous_volson)
 
 void FSOUND_PlaySound(int chl,FSOUND_SAMPLE* s)
 {
-	if(!s || !s->used || !s->data || !soundEnabled)return;
+	if(!s || !s->used || !s->data || !soundEnabled || SFXMasterVolume == 0)return;
 
 	channel++;
 	channel%=7;
@@ -149,7 +149,7 @@ void FMUSIC_StopSong(FMUSIC_MODULE* s)
 void FMUSIC_PlaySong(FMUSIC_MODULE* s)
 {
 	int flag;
-	if(!s || !s->used || !s->data || !soundEnabled)return;
+	if(!s || !s->used || !s->data || !soundEnabled || SFXMasterVolume == 0)return;
 	flag = s->format;
 	if(s->loop) flag |= SOUND_REPEAT;
 	csndPlaySound(15, flag, 8000, 1.0, 0.0, (u32*)s->data, (u32*)s->data, s->size);

diff --git a/src/Audio.cpp b/src/Audio.cpp
@@ -41,10 +41,10 @@ Audio::~Audio() {
     }
 }
 
-void Audio::setVolume(int vol) {volume=vol*4;
+void Audio::setVolume(int vol) {volume=vol;
     if (previous_volume == -1) previous_volume = FMUSIC_GetMasterVolume(music);
     FMUSIC_SetMasterVolume(music, volume);}
-void Audio::setVolson(int volson) {FSOUND_SetSFXMasterVolume(volson*4);
+void Audio::setVolson(int volson) {FSOUND_SetSFXMasterVolume(volson);
    // for (int i = 0; i < 40; i++) Mix_VolumeChunk(sons[i], volson);
 }
 

diff --git a/src/Bouclier.cpp b/src/Bouclier.cpp
diff --git a/src/Caisse.cpp b/src/Caisse.cpp
@@ -12,7 +12,6 @@
 //#include <SDL/SDL_image.h>
 #include "3ds/os_3ds.h"
 
-
 #include "Menu.h"
 #include "Joueur.h"
 #include "Monde.h"
@@ -29,7 +28,18 @@ pousseX(0), pousseY(0), direction(N) {
     sy = ((type-1)/3)*h;
 }
 
-Caisse::~Caisse() {}
+Caisse::~Caisse() {
+	freeImages(); 
+}
+
+
+void Caisse::freeImages()
+{
+		if(suivant)	((Caisse*)suivant)->freeImages();
+		SDL_FreeSurface(image);
+		image = 0;
+}
+
 
 void Caisse::draw(SDL_Surface* gpScreen) {
     int phg[2];

diff --git a/src/Caisse.h b/src/Caisse.h
@@ -26,6 +26,7 @@ class Caisse : public Personnage {
         Caisse* getSuivant();
         bool pousse(Direction dir);
     private :
+		void freeImages();
         void bouge();
 
         Jeu* gpJeu;