Temporarily removed CDDA tracks

6 files changed, 11 insertions, 11 deletions

diff --git a/Source/Airport.geany b/Source/Airport.geany
index bed0171..32e07a5 100644
--- a/Source/Airport.geany
+++ b/Source/Airport.geany
@@ -28,7 +28,7 @@ long_line_behaviour=1
 long_line_column=120
 
 [files]
-current_page=4
+current_page=41
 FILE_NAME_0=6076;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4
 FILE_NAME_1=266;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4
 FILE_NAME_2=4018;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.c;0;4
@@ -70,7 +70,7 @@ FILE_NAME_37=752;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial
 FILE_NAME_38=831;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.h;0;4
 FILE_NAME_39=3384;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.h;0;4
 FILE_NAME_40=1066;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.h;0;4
-FILE_NAME_41=2364;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4
+FILE_NAME_41=592;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4
 FILE_NAME_42=623;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FLEVEL3.PLT;0;4
 
 [VTE]
diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf
index 405858e..1a64341 100755
--- a/Source/Exe/AIRPORT.elf
+++ b/Source/Exe/AIRPORT.elf
diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso
index 003f98b..7516b99 100644
--- a/Source/Exe/AIRPORT.iso
+++ b/Source/Exe/AIRPORT.iso
diff --git a/Source/Makefile b/Source/Makefile
index 84f0f2b..5596d79 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -11,7 +11,7 @@ GNU_SIZE = mipsel-unknown-elf-size
 
 # Custom define flags for GCC
 DEFINE= -DFIXMATH_FAST_SIN -D_PAL_MODE_
-DEFINE += -DPSXSDK_DEBUG
+#DEFINE += -DPSXSDK_DEBUG
 DEFINE +=  -DNO_CDDA
 DEFINE +=  -DNO_INTRO
 
@@ -125,8 +125,8 @@ SPRITE_OBJECTS += $(addprefix $(OBJ_FONTS_PATH)/,	INTROFNT.TIM			\
 # ------------------------------------
 
 $(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso $(MUSIC_TRACKS)
-	mkpsxiso $< $@ $(LICENSE_FILE) -s $(addprefix --track=, $(MUSIC_TRACKS))
-#~ 	mkpsxiso $< $@ $(LICENSE_FILE)
+#~ 	mkpsxiso $< $@ $(LICENSE_FILE) -s $(addprefix --track=, $(MUSIC_TRACKS))
+	mkpsxiso $< $@ $(LICENSE_FILE) -s
 # $(PROJECT).cue is automatically generated by mkpsxiso
 
 rebuild:
diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user
index 267e270..dc09951 100644
--- a/Source/MapEditor/MapEditor.pro.user
+++ b/Source/MapEditor/MapEditor.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.7.2, 2018-11-23T15:01:21. -->
+<!-- Written by QtCreator 4.7.2, 2018-11-24T13:04:29. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -65,7 +65,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.0 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.0 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5120.gcc_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -312,7 +312,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">MapEditor.pro</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">/home/xavier/Airport/Source/MapEditor</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Release</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git a/Source/Sfx.h b/Source/Sfx.h
index e87570f..f04fc2e 100644
--- a/Source/Sfx.h
+++ b/Source/Sfx.h
@@ -13,11 +13,11 @@
  /* *************************************
  * 	Structs and enums
  * *************************************/
-typedef enum t_musicTracks
+typedef enum
 {
 	INTRO_TRACK = 2,
-	GAMEPLAY_TRACK1 = 3,
-	GAMEPLAY_TRACK2 = 4,
+	GAMEPLAY_TRACK1,
+	GAMEPLAY_TRACK2,
 	GAMEPLAY_FIRST_TRACK = GAMEPLAY_TRACK1,
 	GAMEPLAY_LAST_TRACK = GAMEPLAY_TRACK2
 }MUSIC_TRACKS;