scorched3d: updated to version 40.1c

This commit is contained in:
Matt Housh 2006-11-13 09:19:15 -06:00
parent 3f5d4a59d8
commit abec733744
4 changed files with 139 additions and 4 deletions

View File

@ -147,6 +147,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/accessories/v2missile/
-rw-r--r-- root/root usr/share/scorched3d/data/accessories/v2missile/v2missile.txt
-rw-r--r-- root/root usr/share/scorched3d/data/accessories/v2missile/yellow.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/accessories/white.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/acessories/
-rw-r--r-- root/root usr/share/scorched3d/data/ainames.txt
-rw-r--r-- root/root usr/share/scorched3d/data/autoexec.xml
drwxr-xr-x root/root usr/share/scorched3d/data/avatars/
@ -171,6 +172,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/avatars/
-rw-r--r-- root/root usr/share/scorched3d/data/avatars/yoda.gif
-rw-r--r-- root/root usr/share/scorched3d/data/fastestdisplay.xml
drwxr-xr-x root/root usr/share/scorched3d/data/fonts/
-rw-r--r-- root/root usr/share/scorched3d/data/fonts/VERA-COPYRIGHT.TXT
-rw-r--r-- root/root usr/share/scorched3d/data/fonts/test.ttf
-rw-r--r-- root/root usr/share/scorched3d/data/fonts/testout.ttf
-rw-r--r-- root/root usr/share/scorched3d/data/fonts/veramobd.ttf
@ -180,7 +182,10 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories.xml
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/50cal/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/black.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/boulders/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/brownboulders/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/bar1.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/builds1.bmp
@ -205,6 +210,8 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/house1-3burnt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/house1.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/house1burnt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/igloo.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/igloo.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/logcabin1.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/logcabin1burnt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/mainport.txt
@ -227,10 +234,27 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/store1burnt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/trailorhouse1.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/buildings/trailorhouse1burnt.txt
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/bullet/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/cactus/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/church1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/cityoffice/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/common/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/deer/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/factory1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/farm1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/fusionbarrel/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/gasstation1/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/green.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/grenade/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/house1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/logcabin1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/m7a3grenade/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/molten.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/napalm/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/9volt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/acidpod.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/acidpod.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/atom.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/brownrock1.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/brownrock2.txt
@ -250,6 +274,8 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/earth.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/earth.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/earth_half.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/fleshpod.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/fleshpod.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/fuelbarrel.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/medkit.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/mushroom.txt
@ -260,8 +286,25 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/rock2.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/rock3.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/rock4.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/satellite.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/satellite.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/smalloakburnt.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/objects/smalloakfall.txt
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/office3/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/officeplaza1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/people/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/people/male1_soldier.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/people/male1_soldier.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/people/male1_soldier_standing.txt
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/redhornet/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/remorcebomblet/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/shockbomblet/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/shockrocket/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/shotgun/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/skyscraper1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/smalloak/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/store1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/trailorhouse1/
drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/weapons/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/weapons/50cal.txt
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/accessories/weapons/bullet.txt
@ -335,7 +378,9 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/desertmesa.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/dirt.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/donuthills-pic.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/eventsatellitecrash.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/eventscargodrop.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/eventsflamespurt.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/farmland.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/farmlanda.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/halved.bmp
@ -389,6 +434,8 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/m
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placecity3.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placecityport.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placedesert.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placefleshpods.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placeigloo.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placemoon.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placeoak2_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/placeoak_bldg.xml
@ -419,6 +466,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/m
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texarizona_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texasianspring_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texcastle_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texchina_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texcity1_storm.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texcity1_summer.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texcity1_winter.xml
@ -431,6 +479,9 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/m
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texdefault_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texdenali_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texdesert.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texhell.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texice.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texice_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texmoon.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texnight_bldg.xml
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/landscapes/texsand_bldg.xml
@ -560,6 +611,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wic
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/lstrike.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/meteor.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/mgun.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/mirror.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/mountain.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/mshower.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/wicons/nblast.bmp
@ -669,9 +721,11 @@ drwxr-xr-x root/root usr/share/scorched3d/data/html/server/
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/logfiles.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/login.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/menu.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/message.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/mods.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/player.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/server.css
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/server.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settings.html
-rw-r--r-- root/root usr/share/scorched3d/data/html/server/talk.html
-rw-r--r-- root/root usr/share/scorched3d/data/keys.xml
@ -716,6 +770,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/denali.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/eventslightning.xml
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/eventsmeteor.xml
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/eventstest.xml
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/glaciation-pic.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/glaciation.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/half-mask-start.bmp
@ -872,6 +927,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/tanks/
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/CF-104/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/CF-104/104.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/CF-104/104.txt
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/CannonTower/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/a7v.ase
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/a7v.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/aat.ase
@ -915,6 +971,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/tanks/cannont/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/cannont/side.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/cannont/side2.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/cannont/top.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/cannontower/
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/death/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/death/black.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/death/chrome.bmp
@ -1058,6 +1115,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/tanks/sentrygun/
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/sonic/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/sonic/sonic.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/sonic/sonic.txt
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/sonicring/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/t55.ase
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/t55.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/t55b.bmp
@ -1100,6 +1158,10 @@ drwxr-xr-x root/root usr/share/scorched3d/data/tanks/towedartillery2/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/towedartillery2/tan.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/towedartillery2/towedartillery2.txt
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/towedartilleryb.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/tracksh.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/trackshv.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/tracksv.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/tracksvh.bmp
drwxr-xr-x root/root usr/share/scorched3d/data/tanks/turret2/
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/turret2/chrome.bmp
-rw-r--r-- root/root usr/share/scorched3d/data/tanks/turret2/missileturret.bmp

View File

@ -1 +1,2 @@
76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz
a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz
f275c62a98a9eb671a91b49f38567b56 scorched3d-freealut.patch

View File

@ -4,15 +4,17 @@
# Depends on: sdl_mixer, sdl_net, wxgtk, freealut
name=scorched3d
version=40
version=40.1c
release=1
source=(http://dl.sourceforge.net/$name/Scorched3D-$version-src.tar.gz)
source=(http://dl.sourceforge.net/$name/Scorched3D-$version-src.tar.gz \
$name-freealut.patch)
build() {
cd scorched
patch -p0 -i $SRC/$name-freealut.patch
./configure --prefix=/usr \
--datadir=/usr/share/$name
sed -i -e 's/\(^LIBS = .*\)/\1 -lalut/' src/scorched/Makefile
#sed -i -e 's/\(^LIBS = .*\)/\1 -lalut/' src/scorched/Makefile
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/share/$name/documentation

View File

@ -0,0 +1,70 @@
--- configure
+++ configure
@@ -4010,6 +4010,7 @@
CFLAGS="$CFLAGS `$FREEALUT_CONFIG --cflags`"
CXXFLAGS="$CXXFLAGS `$FREEALUT_CONFIG --cflags`"
+ LIBS="$LIBS `$FREEALUT_CONFIG --libs`"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- src/sound/SoundBufferStaticWav.cpp
+++ src/sound/SoundBufferStaticWav.cpp
@@ -57,44 +57,7 @@
SoundBuffer(fileName),
buffer_(0)
{
- unsigned int error;
-
- // Create a buffer
- alGetError();
- alGenBuffers(1, &buffer_);
- if ((error = alGetError()) != AL_NO_ERROR)
- {
- return;
- }
-
- // Load WAV
- void *data;
- ALenum format;
- ALsizei size;
- ALsizei freq;
- ALboolean loop;
-
-#ifdef __DARWIN__
- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq);
-#else
- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop);
-#endif
-
- if ((error = alGetError()) != AL_NO_ERROR)
- {
- return;
- }
-
- // Load WAV into buffer
- alBufferData(buffer_,format,data,size,freq);
- if ((error = alGetError()) != AL_NO_ERROR)
- {
- return;
- }
-
- // Delete WAV memory
- alutUnloadWAV(format,data,size,freq);
- if ((error = alGetError()) != AL_NO_ERROR)
+ if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE)
{
return;
}
--- src/sound/Sound.cpp
+++ src/sound/Sound.cpp
@@ -152,6 +152,7 @@
totalSources_.push_back(source);
availableSources_.push_back(source);
}
+ alutInitWithoutContext(NULL, NULL);
init_ = true;
return init_;