Browse Source

Changed SFX loading path

Thomas Buck 11 years ago
parent
commit
60d5a1397b
3 changed files with 14 additions and 7 deletions
  1. 1
    0
      ChangeLog
  2. 9
    5
      README.md
  3. 4
    2
      src/OpenRaider.cpp

+ 1
- 0
ChangeLog View File

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

+ 9
- 5
README.md View File

4
 
4
 
5
 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...
5
 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...
6
 
6
 
7
+Currently, my focus is on building and running under Mac OS X.
8
+However, my changes should not break the Linux "buildability" :)
9
+
7
 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).
10
 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).
11
+If you don't install XQuartz, Mac OS X should prompt you to do so on the first launch of OpenRaider.
8
 
12
 
9
-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!
13
+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!
10
 
14
 
11
 ## Configuration
15
 ## Configuration
12
 
16
 
28
 
32
 
29
     sudo port install zlib cmake libsdl libsdl_ttf
33
     sudo port install zlib cmake libsdl libsdl_ttf
30
 
34
 
31
-You also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
32
-
33
-To get Sound, you need [freealut](https://github.com/vancegroup/freealut). Get, compile and install it like this:
35
+cmake is only needed for [freealut](https://github.com/vancegroup/freealut), which you'll need to enable sound output.
36
+Get, compile and install freealut like this:
34
 
37
 
35
     git clone git@github.com:vancegroup/freealut.git
38
     git clone git@github.com:vancegroup/freealut.git
36
     mkdir build
39
     mkdir build
39
     make
42
     make
40
     sudo make install
43
     sudo make install
41
 
44
 
45
+You'll also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server.
46
+
42
 ## Building
47
 ## Building
43
 
48
 
44
 If you installed the dependencies using MacPorts, you'll need to have `/opt/local/bin` in your `$PATH` before you can execute make.
49
 If you installed the dependencies using MacPorts, you'll need to have `/opt/local/bin` in your `$PATH` before you can execute make.
47
 Just run `make debug` and run `bin/debug/OpenRaider` for a debug build.
52
 Just run `make debug` and run `bin/debug/OpenRaider` for a debug build.
48
 `make release` builds a release binary.
53
 `make release` builds a release binary.
49
 `make bundle` creates a Mac App Bundle that also runs the setup script, if necessary.
54
 `make bundle` creates a Mac App Bundle that also runs the setup script, if necessary.
50
-`make bundle-image` packs the App Bundle into a DMG ready for distribution.
51
 
55
 
52
 ## Usage
56
 ## Usage
53
 
57
 

+ 4
- 2
src/OpenRaider.cpp View File

1071
 		{
1071
 		{
1072
 		case TR_VERSION_2:
1072
 		case TR_VERSION_2:
1073
 		case TR_VERSION_3:
1073
 		case TR_VERSION_3:
1074
-			snprintf(altSfx, 255, "%s.sfx", filename);
1075
-			print(true, "Loading alternate SFX for TR2 or TR3 pak...\n");
1074
+            // Now loads eg. "tr3/MAIN.SFX" instead of "tr3/SHORE.TR2.sfx"
1075
+            filename[len - j] = '\0';
1076
+			snprintf(altSfx, 255, "%sMAIN.SFX", filename);
1077
+			print(true, "Loading alternate SFX for TR2 or TR3 pak at %sMAIN.SFX\n", filename);
1076
 
1078
 
1077
 			m_tombraider.loadSFX(altSfx);
1079
 			m_tombraider.loadSFX(altSfx);
1078
 			break;
1080
 			break;

Loading…
Cancel
Save