Changed SFX loading path

ChangeLog

@@ -6,6 +6,7 @@
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
 	[ 20140105 ]
+	* Fixed the TR2 & TR3 SFX file loading to read the original MAIN.SFX
 	* Fixed strange Mouse Y-Axis Overflow bug
 	* Cleanup of Makefile
 

README.md

@@ -4,9 +4,13 @@
 
 This project aims to get OpenRaider in a more usable state, maybe one day even being able to play the old Tomb Raider games flawlessly...
 
+Currently, my focus is on building and running under Mac OS X.
+However, my changes should not break the Linux "buildability" :)
+
 If you just want to see OpenRaider doing something on your Mac, without installing any of the dependencies needed to build OpenRaider, install [XQuartz](http://xquartz.macosforge.org/trac) (if you don't have it already) and grab the Mac App Bundle from the [most recent release](https://github.com/xythobuz/OpenRaider/releases).
+If you don't install XQuartz, Mac OS X should prompt you to do so on the first launch of OpenRaider.
 
-It seems as if OpenRaider will currently only work on Little Endian platforms. This is not nice and will hopefully be fixed in the future!
+It seems as if OpenRaider will currently only work on Little-Endian platforms. This is not nice and will hopefully be fixed in the future!
 
 ## Configuration
 
@@ -28,9 +32,8 @@ On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts]
 
     sudo port install zlib cmake libsdl libsdl_ttf
 
-You also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
-
-To get Sound, you need [freealut](https://github.com/vancegroup/freealut). Get, compile and install it like this:
+cmake is only needed for [freealut](https://github.com/vancegroup/freealut), which you'll need to enable sound output.
+Get, compile and install freealut like this:
 
     git clone git@github.com:vancegroup/freealut.git
     mkdir build
@@ -39,6 +42,8 @@ To get Sound, you need [freealut](https://github.com/vancegroup/freealut). Get,
     make
     sudo make install
 
+You'll also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
+
 ## Building
 
 If you installed the dependencies using MacPorts, you'll need to have `/opt/local/bin` in your `$PATH` before you can execute make.
@@ -47,7 +52,6 @@ If you're using Bash, the MacPorts installer should have automatically edited yo
 Just run `make debug` and run `bin/debug/OpenRaider` for a debug build.
 `make release` builds a release binary.
 `make bundle` creates a Mac App Bundle that also runs the setup script, if necessary.
-`make bundle-image` packs the App Bundle into a DMG ready for distribution.
 
 ## Usage
 

src/OpenRaider.cpp

@@ -1071,8 +1071,10 @@ void OpenRaider::loadLevel(char *mapname)
 		{
 		case TR_VERSION_2:
 		case TR_VERSION_3:
-			snprintf(altSfx, 255, "%s.sfx", filename);
-			print(true, "Loading alternate SFX for TR2 or TR3 pak...\n");
+            // Now loads eg. "tr3/MAIN.SFX" instead of "tr3/SHORE.TR2.sfx"
+            filename[len - j] = '\0';
+			snprintf(altSfx, 255, "%sMAIN.SFX", filename);
+			print(true, "Loading alternate SFX for TR2 or TR3 pak at %sMAIN.SFX\n", filename);
 
 			m_tombraider.loadSFX(altSfx);
 			break;