Set path to cfg files for Symbian version

Enable sound directly after init, not only when playing music.

src/OpenJazz.h

@@ -34,7 +34,6 @@
 #ifndef _OPENJAZZ_H
 #define _OPENJAZZ_H
 
-
 #ifndef EXTERN
 	#define EXTERN extern
 #endif
@@ -65,63 +64,71 @@
 #define F192 196608
 
 // Files
+#ifdef __SYMBIAN32__
+#ifdef UIQ3
+#define CONFIG_FILE "c:\\shared\\openjazz\\openjazz.cfg""
+#else
+#define CONFIG_FILE "c:\\data\\openjazz\\openjazz.cfg"
+#endif
+#else
 #define CONFIG_FILE "openjazz.cfg"
+#endif
 #define LOGO_FILE   "openjazz.000"
 #define LEVEL_FILE  "openjazz.tmp"
 
 #ifdef UPPERCASE_FILENAMES
-	#define F_FONTS        "FONTS.000"
+	#define F_FONTS        "FONTS.000"
 	#define F_MAINCHAR     "MAINCHAR.000"
 	#define F_MENU         "MENU.000"
 	#define F_PANEL        "PANEL.000"
 	#define F_SOUNDS       "SOUNDS.000"
-	#define F_BONUS        "BONUS.000"
+	#define F_BONUS        "BONUS.000"
 
-	#define F_BONUS_0SC    "BONUS.0SC"
-	#define F_END_0SC      "END.0SC"
-	#define F_INSTRUCT_0SC "INSTRUCT.0SC"
-	#define F_ORDER_0SC    "ORDER.0SC"
+	#define F_BONUS_0SC    "BONUS.0SC"
+	#define F_END_0SC      "END.0SC"
+	#define F_INSTRUCT_0SC "INSTRUCT.0SC"
+	#define F_ORDER_0SC    "ORDER.0SC"
 	#define F_STARTUP_0SC  "STARTUP.0SC"
 
 	#define F_MACRO        "MACRO.2"
 
-	#define F_FONT2_0FN    "FONT2.0FN"
-	#define F_FONTBIG_0FN  "FONTBIG.0FN"
-	#define F_FONTINY_0FN  "FONTINY.0FN"
-	#define F_FONTMN1_0FN  "FONTMN1.0FN"
-	#define F_FONTMN2_0FN  "FONTMN2.0FN"
-
+	#define F_FONT2_0FN    "FONT2.0FN"
+	#define F_FONTBIG_0FN  "FONTBIG.0FN"
+	#define F_FONTINY_0FN  "FONTINY.0FN"
+	#define F_FONTMN1_0FN  "FONTMN1.0FN"
+	#define F_FONTMN2_0FN  "FONTMN2.0FN"
+
 	// File path prefixes
 	#define F_BLOCKS       "BLOCKS"
-	#define F_BONUSMAP     "BONUSMAP"
+	#define F_BONUSMAP     "BONUSMAP"
 	#define F_LEVEL        "LEVEL"
 	#define F_PLANET       "PLANET"
 	#define F_SPRITES      "SPRITES"
 #else
-	#define F_FONTS        "fonts.000"
+	#define F_FONTS        "fonts.000"
 	#define F_MAINCHAR     "mainchar.000"
 	#define F_MENU         "menu.000"
 	#define F_PANEL        "panel.000"
 	#define F_SOUNDS       "sounds.000"
-	#define F_BONUS        "bonus.000"
+	#define F_BONUS        "bonus.000"
 
-	#define F_BONUS_0SC    "bonus.0sc"
-	#define F_END_0SC      "end.0sc"
-	#define F_INSTRUCT_0SC "instruct.0SC"
-	#define F_ORDER_0SC    "order.0SC"
+	#define F_BONUS_0SC    "bonus.0sc"
+	#define F_END_0SC      "end.0sc"
+	#define F_INSTRUCT_0SC "instruct.0SC"
+	#define F_ORDER_0SC    "order.0SC"
 	#define F_STARTUP_0SC  "startup.0sc"
 
 	#define F_MACRO        "macro.2"
 
-	#define F_FONT2_0FN    "font2.0fn"
-	#define F_FONTBIG_0FN  "fontbig.0fn"
-	#define F_FONTINY_0FN  "fontiny.0fn"
-	#define F_FONTMN1_0FN  "fontmn1.0fn"
-	#define F_FONTMN2_0FN  "fontmn2.0fn"
-
+	#define F_FONT2_0FN    "font2.0fn"
+	#define F_FONTBIG_0FN  "fontbig.0fn"
+	#define F_FONTINY_0FN  "fontiny.0fn"
+	#define F_FONTMN1_0FN  "fontmn1.0fn"
+	#define F_FONTMN2_0FN  "fontmn2.0fn"
+
 	// File path prefixes
 	#define F_BLOCKS       "blocks"
-	#define F_BONUSMAP     "bonusmap"
+	#define F_BONUSMAP     "bonusmap"
 	#define F_LEVEL        "level"
 	#define F_PLANET       "planet"
 	#define F_SPRITES      "sprites"
@@ -164,16 +171,16 @@
 #define MUL(x, y) (((x) * (y)) >> 10)
 #define DIV(x, y) (((x) << 10) / (y))
 
-
+
 // Enum
-
-enum LoopType {
-
-	NORMAL_LOOP, TYPING_LOOP, SET_KEY_LOOP, SET_JOYSTICK_LOOP
-
-};
-
-
+
+enum LoopType {
+
+	NORMAL_LOOP, TYPING_LOOP, SET_KEY_LOOP, SET_JOYSTICK_LOOP
+
+};
+
+
 // Datatype
 
 typedef int fixed;

src/io/sound.cpp

@@ -138,7 +138,8 @@ void openAudio () {
 
 	if (loadSounds(F_SOUNDS) != E_NONE) sounds = NULL;
 
-
+	// Start audio for sfx to work
+	SDL_PauseAudio(0);
 	return;
 
 }
@@ -225,7 +226,7 @@ void playMusic (const char * fileName) {
 
 	}
 
-	// Start the music playing
+	// Start the audio playing
 	SDL_PauseAudio(0);
 
 #endif
@@ -248,9 +249,9 @@ void stopMusic () {
 		musicFile = NULL;
 
 	}
-
+	SDL_PauseAudio(0);
 #endif
-
+	
 	return;
 
 }