From 5e0b0f920a1ce2befee384017f589c04c6206364 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Mon, 28 Sep 2015 22:46:35 +0200
Subject: [PATCH] Fixed your asset loading fuckups

---
 .../Models/{submarine2.mtl => Submarine2.mtl} |  0
 .../Models/{submarine2.obj => Submarine2.obj} |  2 +-
 src/game/Sound/Sound.cpp                      | 20 +++++++++----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename assets/Models/{submarine2.mtl => Submarine2.mtl} (100%)
 rename assets/Models/{submarine2.obj => Submarine2.obj} (99%)

diff --git a/assets/Models/submarine2.mtl b/assets/Models/Submarine2.mtl
similarity index 100%
rename from assets/Models/submarine2.mtl
rename to assets/Models/Submarine2.mtl
diff --git a/assets/Models/submarine2.obj b/assets/Models/Submarine2.obj
similarity index 99%
rename from assets/Models/submarine2.obj
rename to assets/Models/Submarine2.obj
index 5796eba..144e0ad 100644
--- a/assets/Models/submarine2.obj
+++ b/assets/Models/Submarine2.obj
@@ -1,6 +1,6 @@
 # Blender v2.75 (sub 0) OBJ File: 'submarine.blend'
 # www.blender.org
-mtllib submarine2.mtl
+mtllib Submarine2.mtl
 o Cube
 v -0.378953 -0.002680 -0.065172
 v 0.212611 0.044805 -0.044067
diff --git a/src/game/Sound/Sound.cpp b/src/game/Sound/Sound.cpp
index 972f71b..f98f8eb 100644
--- a/src/game/Sound/Sound.cpp
+++ b/src/game/Sound/Sound.cpp
@@ -26,7 +26,7 @@ ALuint dd::Sound::LoadFile(std::string path)
         return 0;
     }
 
-    fread(&m_Size, sizeof(unsigned long), 1, fp);
+    fread(&m_Size, 4*sizeof(char), 1, fp);
     fread(m_Type, sizeof(char), 4, fp);
     if (m_Type[0] != 'W' || m_Type[1] != 'A' || m_Type[2] != 'V' || m_Type[3]!= 'E') {
         LOG_ERROR("ERROR: Not WAVE-file");
@@ -40,13 +40,13 @@ ALuint dd::Sound::LoadFile(std::string path)
     }
 
     //READ THE DATA FROM WAVE-FILE
-    fread(&m_ChunkSize, sizeof(unsigned long), 1, fp);
-    fread(&m_FormatType, sizeof(short), 1, fp);
-    fread(&m_Channels, sizeof(short), 1, fp);
-    fread(&m_SampleRate, sizeof(unsigned long), 1, fp);
-    fread(&m_AvgBytesPerSec, sizeof(unsigned long), 1, fp);
-    fread(&m_BytesPerSample, sizeof(short), 1, fp);
-    fread(&m_BitsPerSample, sizeof(short), 1, fp);
+    fread(&m_ChunkSize, 4*sizeof(char), 1, fp);
+    fread(&m_FormatType, 2*sizeof(char), 1, fp);
+    fread(&m_Channels, 2*sizeof(char), 1, fp);
+    fread(&m_SampleRate, 4*sizeof(char), 1, fp);
+    fread(&m_AvgBytesPerSec, 4*sizeof(char), 1, fp);
+    fread(&m_BytesPerSample, 2*sizeof(char), 1, fp);
+    fread(&m_BitsPerSample, 2*sizeof(char), 1, fp);
 
     fread(m_Type, sizeof(char), 4, fp);
     if (m_Type[0] !='d' || m_Type[1] != 'a' || m_Type[2] != 't' || m_Type[3] != 'a') {
@@ -54,10 +54,10 @@ ALuint dd::Sound::LoadFile(std::string path)
         return 0;
     }
 
-    fread(&m_DataSize, sizeof(unsigned long), 1, fp);
+    fread(&m_DataSize, 4*sizeof(char), 1, fp);
 
     unsigned char* buf = new unsigned char[m_DataSize];
-    fread(buf, sizeof(unsigned char), m_DataSize, fp);
+    fread(buf, sizeof(char), m_DataSize, fp);
     fclose(fp);
 
     // Create buffer