Fixed scripts

cmake/setup.sh

@@ -3,7 +3,6 @@
 echo "Setting up OpenRaider for user $USER..."
 mkdir -p ~/.OpenRaider
 cp data/OpenRaider.init ~/.OpenRaider/
-cp data/custom.cfg ~/.OpenRaider/
 mkdir -p ~/.OpenRaider/paks
 mkdir -p ~/.OpenRaider/music
 mkdir -p ~/.OpenRaider/data

cmake/setup_mac.sh

@@ -4,7 +4,6 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
     echo "Setting up OpenRaider for user $USER..."
     mkdir -p ~/.OpenRaider
     cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
-    cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
     mkdir -p ~/.OpenRaider/paks
     mkdir -p ~/.OpenRaider/music
     mkdir -p ~/.OpenRaider/data

data/OpenRaider.init

@@ -1,48 +1,25 @@
-# This is the OpenRaider RC file
-#####################################
-
-[Video.OpenGL]
-Driver=/usr/lib/libGL.so.1
-Width=1280
-Height=720
-Font=~/.OpenRaider/data/test.ttf
-
-[Audio.OpenAL]
-Enable=true
-
-[Input.Mouse]
-SensitivityX=1.0
-SensitivityY=1.0
-
-[OpenRaider.Engine]
-PakDir=~/.OpenRaider/paks/
-AudioDir=~/.OpenRaider/music/
-HomeDir=~/.OpenRaider/data/
-
-DisplayFPS=false
-MapDebug=false
-ModelDebug=false
-DumpTexture=false
-
-#Script=tr3/tombPC.dat
-#Music=tr4/039_TR4_Title_Q10.wav
-#Music=tr4/103_A3_Out_Night.wav
-#Music=tr4/108_A8_Coastal.wav
-
-[OpenRaider.Console]
-bind +console 96
-bind +forward 119
-bind +backward 115
-bind +jump 32
-bind +crouch 99
-bind +left 97
-bind +right 100
-#bind +attack 122
-
-#r_light 1				# Enable GL Lighting
-#r_fog 1				# Enable depth fog
-#r_particle 1				# Enable particle test
-#r_portal 1				# Enable portal rendering
-
-# Support for external configs
-@include ~/.OpenRaider/custom.cfg
+# OpenRaider configuration file
+
+set basedir   "~/.OpenRaider"
+set pakdir    "$(basedir)/paks"
+set audiodir  "$(basedir)/music"
+set datadir   "$(basedir)/data"
+set font      "$(datadir)/test.ttf"
+
+set gldriver  "/usr/lib/libGL.so.1" # Not needed for Mac!
+set size      "1280x720"
+
+set audio     true # Enable Audio Output
+set volume    0.5
+
+set mouse_x   1.0
+set mouse_y   1.0
+
+bind console  96
+bind forward  119
+bind backward 115
+bind jump     32
+bind crouch   99
+bind left     97
+bind right    100
+# bind attack   122

src/CMakeLists.txt

@@ -22,7 +22,7 @@ if (APPLE)
     set (SRCS ${SRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/custom.cfg" "../data/OpenRaider.init" "../data/test.ttf")
+    set (MAC_DATA "../data/OpenRaider.init" "../data/test.ttf")
     set (MAC_DATA ${MAC_DATA} "../data/snow.tga" "../data/snow2.tga" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (SRCS ${SRCS} ${MAC_DATA})