Add violin.

FIx hotkey loading after new notes added
ideal-fire · Aug 21, 2018 · 171328b · 171328b
1 parent f6669bd
commit 171328b
Show file tree

Hide file tree

Showing 31 changed files with 9 additions and 5 deletions.
diff --git a/bin/assets/Free/Scripts/init.lua b/bin/assets/Free/Scripts/init.lua
@@ -237,4 +237,7 @@ addTripleNotes("assets/Proprietary/Sound/flute_%d.wav",16,"assets/Proprietary/Im
 addSingleNote("assets/Proprietary/Sound/festive_%d.wav",19,"assets/Proprietary/Images/festive.png");
 
 -- Add guitar notes
-addTripleNotes("assets/Proprietary/Sound/spanish_guitar_%d.wav",20,"assets/Proprietary/Images/guitar.png","assets/Proprietary/Images/guitarSharp.png","assets/Proprietary/Images/guitarFlat.png",'G');
+addTripleNotes("assets/Proprietary/Sound/spanish_guitar_%d.wav",20,"assets/Proprietary/Images/guitar.png","assets/Proprietary/Images/guitarSharp.png","assets/Proprietary/Images/guitarFlat.png",'G');
+
+-- Add violin notes
+addTripleNotes("assets/Proprietary/Sound/violin_%d.wav",23,"assets/Proprietary/Images/violin.png","assets/Proprietary/Images/violinSharp.png","assets/Proprietary/Images/violinFlat.png",'V');
diff --git a/bin/assets/Proprietary/Images/violin.png b/bin/assets/Proprietary/Images/violin.png
diff --git a/bin/assets/Proprietary/Images/violinFlat.png b/bin/assets/Proprietary/Images/violinFlat.png
diff --git a/bin/assets/Proprietary/Images/violinSharp.png b/bin/assets/Proprietary/Images/violinSharp.png
diff --git a/bin/assets/Proprietary/Sound/violin_0.wav b/bin/assets/Proprietary/Sound/violin_0.wav
diff --git a/bin/assets/Proprietary/Sound/violin_1.wav b/bin/assets/Proprietary/Sound/violin_1.wav
diff --git a/bin/assets/Proprietary/Sound/violin_10.wav b/bin/assets/Proprietary/Sound/violin_10.wav
diff --git a/bin/assets/Proprietary/Sound/violin_11.wav b/bin/assets/Proprietary/Sound/violin_11.wav
diff --git a/bin/assets/Proprietary/Sound/violin_12.wav b/bin/assets/Proprietary/Sound/violin_12.wav
diff --git a/bin/assets/Proprietary/Sound/violin_13.wav b/bin/assets/Proprietary/Sound/violin_13.wav
diff --git a/bin/assets/Proprietary/Sound/violin_14.wav b/bin/assets/Proprietary/Sound/violin_14.wav
diff --git a/bin/assets/Proprietary/Sound/violin_15.wav b/bin/assets/Proprietary/Sound/violin_15.wav
diff --git a/bin/assets/Proprietary/Sound/violin_16.wav b/bin/assets/Proprietary/Sound/violin_16.wav
diff --git a/bin/assets/Proprietary/Sound/violin_17.wav b/bin/assets/Proprietary/Sound/violin_17.wav
diff --git a/bin/assets/Proprietary/Sound/violin_18.wav b/bin/assets/Proprietary/Sound/violin_18.wav
diff --git a/bin/assets/Proprietary/Sound/violin_19.wav b/bin/assets/Proprietary/Sound/violin_19.wav
diff --git a/bin/assets/Proprietary/Sound/violin_2.wav b/bin/assets/Proprietary/Sound/violin_2.wav
diff --git a/bin/assets/Proprietary/Sound/violin_20.wav b/bin/assets/Proprietary/Sound/violin_20.wav
diff --git a/bin/assets/Proprietary/Sound/violin_21.wav b/bin/assets/Proprietary/Sound/violin_21.wav
diff --git a/bin/assets/Proprietary/Sound/violin_22.wav b/bin/assets/Proprietary/Sound/violin_22.wav
diff --git a/bin/assets/Proprietary/Sound/violin_23.wav b/bin/assets/Proprietary/Sound/violin_23.wav
diff --git a/bin/assets/Proprietary/Sound/violin_24.wav b/bin/assets/Proprietary/Sound/violin_24.wav
diff --git a/bin/assets/Proprietary/Sound/violin_25.wav b/bin/assets/Proprietary/Sound/violin_25.wav
diff --git a/bin/assets/Proprietary/Sound/violin_3.wav b/bin/assets/Proprietary/Sound/violin_3.wav
diff --git a/bin/assets/Proprietary/Sound/violin_4.wav b/bin/assets/Proprietary/Sound/violin_4.wav
diff --git a/bin/assets/Proprietary/Sound/violin_5.wav b/bin/assets/Proprietary/Sound/violin_5.wav
diff --git a/bin/assets/Proprietary/Sound/violin_6.wav b/bin/assets/Proprietary/Sound/violin_6.wav
diff --git a/bin/assets/Proprietary/Sound/violin_7.wav b/bin/assets/Proprietary/Sound/violin_7.wav
diff --git a/bin/assets/Proprietary/Sound/violin_8.wav b/bin/assets/Proprietary/Sound/violin_8.wav
diff --git a/bin/assets/Proprietary/Sound/violin_9.wav b/bin/assets/Proprietary/Sound/violin_9.wav
diff --git a/src/main.c b/src/main.c
@@ -35,8 +35,8 @@ todo - script button
 #include "nathanList.h"
 
 ///////////////////////////////////////
-#define VERSIONNUMBER 1
-#define VERSIONSTRING "v1.0"
+#define VERSIONNUMBER 2
+#define VERSIONSTRING "v1.1"
 //////////////////
 #define SETTINGSVERSION 1
 #define HOTKEYVERSION 1
@@ -407,8 +407,9 @@ void loadHotkeys(){
 		fread(&_tempReadVersion,sizeof(u8),1,fp);
 		if (_tempReadVersion>=1){
 			int i;
-			fread(&totalNotes,sizeof(u16),1,fp);
-			for (i=0;i<totalNotes;++i){
+			u16 _readTotalNotes;
+			fread(&_readTotalNotes,sizeof(u16),1,fp);
+			for (i=0;i<_readTotalNotes;++i){
 				fread(&(noteHotkeys[i]),sizeof(SDL_Keycode),1,fp);
 			}
 			u16 _readTotalUI;