commit 058f3872542e4c5ba0d297cf3cff40c1c2295bbe Author: Matt Housh <jaeger@crux.nu> Date: Fri Jan 11 19:04:52 2008 -0600 scorched3d: updated to version 41.1 diff --git a/scorched3d/.footprint b/scorched3d/.footprint index 2b82933..63876af 100644 --- a/scorched3d/.footprint +++ b/scorched3d/.footprint @@ -1,6 +1,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/scorched3d +-rwxr-xr-x root/root usr/bin/scorched3dc +-rwxr-xr-x root/root usr/bin/scorched3ds drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/scorched3d/ drwxr-xr-x root/root usr/share/scorched3d/data/ @@ -152,29 +154,30 @@ drwxr-xr-x root/root usr/share/scorched3d/data/acessories/ -rw-r--r-- root/root usr/share/scorched3d/data/autoexec.xml drwxr-xr-x root/root usr/share/scorched3d/data/avatars/ -rw-r--r-- root/root usr/share/scorched3d/data/avatars/agreement.txt --rw-r--r-- root/root usr/share/scorched3d/data/avatars/animal.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/baby.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/bavia.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/computer.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/daisy.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/fish.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/flower.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/floyd.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/heart.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/lips.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/mxpx.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/pint.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/player.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/prot.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/termin.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/vader.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/web.gif --rw-r--r-- root/root usr/share/scorched3d/data/avatars/yoda.gif +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/animal.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/baby.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/bavia.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/computer.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/daisy.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/fish.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/flower.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/floyd.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/heart.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/lips.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/mxpx.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/pint.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/player.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/prot.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/termin.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/vader.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/web.png +-rw-r--r-- root/root usr/share/scorched3d/data/avatars/yoda.png +-rw-r--r-- root/root usr/share/scorched3d/data/custominfo.xml -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/vera.ttf -rw-r--r-- root/root usr/share/scorched3d/data/fonts/veramobd.ttf drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/ @@ -519,6 +522,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/meshes/fight -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/singlenormal.xml -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/singletarget.xml -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/tankais.xml +-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/tankaiweaponsets.xml drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/explode/ -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/textures/explode/acid00_1.bmp @@ -698,6 +702,8 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/playera.bmp -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/playera2.bmp -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/scorched.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/scorched.jpg +-rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/scorcheda.jpg -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/target.bmp -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/wait.bmp -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/weapon.bmp @@ -712,7 +718,12 @@ drwxr-xr-x root/root usr/share/scorched3d/data/globalmods/apoc/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/globalmods/globalmods.txt drwxr-xr-x root/root usr/share/scorched3d/data/html/ drwxr-xr-x root/root usr/share/scorched3d/data/html/server/ +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/applet.html -rw-r--r-- root/root usr/share/scorched3d/data/html/server/banned.html +drwxr-xr-x root/root usr/share/scorched3d/data/html/server/binary/ +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/binary/Applet.jar +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/binary/Applet.java +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/binary/EventStreamReader.java -rw-r--r-- root/root usr/share/scorched3d/data/html/server/footer.html -rw-r--r-- root/root usr/share/scorched3d/data/html/server/game.html -rw-r--r-- root/root usr/share/scorched3d/data/html/server/header.html @@ -726,8 +737,14 @@ drwxr-xr-x root/root usr/share/scorched3d/data/html/server/ -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/html/server/sessions.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingsall.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingslandscape.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingsmain.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingsmenu.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingsmod.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/settingsplayers.html +-rw-r--r-- root/root usr/share/scorched3d/data/html/server/stats.html -rw-r--r-- root/root usr/share/scorched3d/data/keys.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes.xml drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/ @@ -746,7 +763,6 @@ drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/ -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/boidsf18.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/boidsgulls.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/boidsparrot.xml --rw-r--r-- root/root usr/share/scorched3d/data/landscapes/boidst38.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/canyon-pic.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/canyon.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/cavern-pic.bmp @@ -787,6 +803,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/ -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/islands-pic.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/nomask.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/oldstyle-pic.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/landscapes/optionstest.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/parking.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/parkinga.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/path.bmp @@ -794,7 +811,6 @@ drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/ -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/picture-none.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placeburntpine.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placedenali.xml --rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placenone.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placeoak.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placeoak2.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/placepalm.xml @@ -838,6 +854,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/landscapes/ -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/texvulcano.xml -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/valley-mask.bmp -rw-r--r-- root/root usr/share/scorched3d/data/landscapes/valley-pic.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/mediumdisplay.xml drwxr-xr-x root/root usr/share/scorched3d/data/meshes/ drwxr-xr-x root/root usr/share/scorched3d/data/meshes/ah64d/ -rw-r--r-- root/root usr/share/scorched3d/data/meshes/ah64d/ah64.bmp @@ -894,15 +911,23 @@ drwxr-xr-x root/root usr/share/scorched3d/data/meshes/t38/ -rw-r--r-- root/root usr/share/scorched3d/data/meshes/wind.ase -rw-r--r-- root/root usr/share/scorched3d/data/meshes/wrap.ase -rw-r--r-- root/root usr/share/scorched3d/data/modinfo.xml +-rw-r--r-- root/root usr/share/scorched3d/data/music.xml +drwxr-xr-x root/root usr/share/scorched3d/data/music/ +-rw-r--r-- root/root usr/share/scorched3d/data/music/mix3_loop1.ogg +-rw-r--r-- root/root usr/share/scorched3d/data/music/mix3_loop2.ogg +-rw-r--r-- root/root usr/share/scorched3d/data/music/mix3_loop3.ogg -rw-r--r-- root/root usr/share/scorched3d/data/mysql.xml --rw-r--r-- root/root usr/share/scorched3d/data/pgprunetables.sql --rw-r--r-- root/root usr/share/scorched3d/data/pgsql.xml --rw-r--r-- root/root usr/share/scorched3d/data/pgstatstables.sql -rw-r--r-- root/root usr/share/scorched3d/data/playernames.txt -rw-r--r-- root/root usr/share/scorched3d/data/prunetables.sql -rw-r--r-- root/root usr/share/scorched3d/data/random.no -rw-r--r-- root/root usr/share/scorched3d/data/safedisplay.xml -rw-r--r-- root/root usr/share/scorched3d/data/server.xml +drwxr-xr-x root/root usr/share/scorched3d/data/shaders/ +-rw-r--r-- root/root usr/share/scorched3d/data/shaders/land.fshader +-rw-r--r-- root/root usr/share/scorched3d/data/shaders/land.vshader +-rw-r--r-- root/root usr/share/scorched3d/data/shaders/water.fshader +-rw-r--r-- root/root usr/share/scorched3d/data/shaders/water.license +-rw-r--r-- root/root usr/share/scorched3d/data/shaders/water.vshader -rw-r--r-- root/root usr/share/scorched3d/data/singlecustom.xml -rw-r--r-- root/root usr/share/scorched3d/data/singleeasy.xml -rw-r--r-- root/root usr/share/scorched3d/data/singlehard.xml @@ -922,6 +947,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/talk/polish/ -rw-r--r-- root/root usr/share/scorched3d/data/talk/talk1.txt -rw-r--r-- root/root usr/share/scorched3d/data/talk/talk2.txt -rw-r--r-- root/root usr/share/scorched3d/data/tankais.xml +-rw-r--r-- root/root usr/share/scorched3d/data/tankaiweaponsets.xml -rw-r--r-- root/root usr/share/scorched3d/data/tanks.xml drwxr-xr-x root/root usr/share/scorched3d/data/tanks/ drwxr-xr-x root/root usr/share/scorched3d/data/tanks/CF-104/ @@ -1196,35 +1222,116 @@ drwxr-xr-x root/root usr/share/scorched3d/data/textures/bordershield/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/bordershield/hit.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/clearsky.bmp drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/ --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_10.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_4.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_5.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_6.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_7.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_8.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp00_9.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp01_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp01_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp01_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp02_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp02_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp02_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp03_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp03_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp03_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp04_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp04_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp04_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_1.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_2.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_3.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_4.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_5.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_6.bmp --rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/exp05_7.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion0/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion0/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion1/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion1/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion2/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion2/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion3/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0006.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0010.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0014.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion3/exp0020.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion4/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion4/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion5/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion5/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion6/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion6/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion7/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0002.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0006.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0010.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0014.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0018.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0022.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion7/exp0024.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/explosion8/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/explosion8/exp0040.bmp +drwxr-xr-x root/root usr/share/scorched3d/data/textures/explode/trans/ +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0004.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0008.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0012.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0016.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0020.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0024.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0028.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0032.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0036.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0040.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0044.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/explode/trans/trans0048.bmp drwxr-xr-x root/root usr/share/scorched3d/data/textures/flame/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/flame/flame01.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/flame/flame02.bmp @@ -1259,6 +1366,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/textures/flame/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/flame/flame31.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/flame/flame32.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/flame/flame33.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/foam.png -rw-r--r-- root/root usr/share/scorched3d/data/textures/glow1.bmp drwxr-xr-x root/root usr/share/scorched3d/data/textures/landscape/ drwxr-xr-x root/root usr/share/scorched3d/data/textures/landscape/arizona/ @@ -1322,6 +1430,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/textures/landscape/default/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/cubemap.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/detail.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/magma-small.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/normal_map.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/rockside.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/scorch.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/shore.bmp @@ -1331,6 +1440,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/textures/landscape/default/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/texture3.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/texture4.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/water.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/default/waternight.bmp drwxr-xr-x root/root usr/share/scorched3d/data/textures/landscape/denali/ -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/denali/cloud1.bmp -rw-r--r-- root/root usr/share/scorched3d/data/textures/landscape/denali/cubemap.bmp @@ -1638,26 +1748,40 @@ drwxr-xr-x root/root usr/share/scorched3d/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/windows/aim.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/aima.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/arrow.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/arrow_d.png +-rw-r--r-- root/root usr/share/scorched3d/data/windows/arrow_r.png +-rw-r--r-- root/root usr/share/scorched3d/data/windows/arrow_s.png +-rw-r--r-- root/root usr/share/scorched3d/data/windows/arrow_u.png -rw-r--r-- root/root usr/share/scorched3d/data/windows/arrowi.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/backdrop.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/backdrop.jpg +-rw-r--r-- root/root usr/share/scorched3d/data/windows/bar1.png +-rw-r--r-- root/root usr/share/scorched3d/data/windows/bar2.png -rw-r--r-- root/root usr/share/scorched3d/data/windows/bomb.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/bomba.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/book.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/camera.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/cameraa.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/client.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/cog.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/coga.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/diff.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/diffa.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/display.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/donate.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/exclaim.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/exclaim.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/help.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/helpa.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/hiscore.png -rw-r--r-- root/root usr/share/scorched3d/data/windows/island.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/island.ico +-rw-r--r-- root/root usr/share/scorched3d/data/windows/key.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/keya.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/logotiled.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/mask.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/move.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/ok.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/noentry.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/ok.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/plan.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/plana.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/planaa.bmp @@ -1666,11 +1790,13 @@ drwxr-xr-x root/root usr/share/scorched3d/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/windows/playera2.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/pointer.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/pointera.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/question.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/question.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/save.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/scorched.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/scorched.gif --rw-r--r-- root/root usr/share/scorched3d/data/windows/scorcheda.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/scorched.jpg +-rw-r--r-- root/root usr/share/scorched3d/data/windows/scorched.png +-rw-r--r-- root/root usr/share/scorched3d/data/windows/scorcheda.jpg +-rw-r--r-- root/root usr/share/scorched3d/data/windows/scorcheda.png -rw-r--r-- root/root usr/share/scorched3d/data/windows/screen.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/screena.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/server.bmp @@ -1678,6 +1804,7 @@ drwxr-xr-x root/root usr/share/scorched3d/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/windows/settinga.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/sound.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/sounda.bmp +-rw-r--r-- root/root usr/share/scorched3d/data/windows/splash.gif -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank-cus.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank-easy.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank-hard.bmp @@ -1685,11 +1812,10 @@ drwxr-xr-x root/root usr/share/scorched3d/data/windows/ -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank2.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/tank2.ico +-rw-r--r-- root/root usr/share/scorched3d/data/windows/tank2s.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/target.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/triangle.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/wait.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/waita.bmp --rw-r--r-- root/root usr/share/scorched3d/data/windows/warn.gif +-rw-r--r-- root/root usr/share/scorched3d/data/windows/warn.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/weapon.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/weapona.bmp -rw-r--r-- root/root usr/share/scorched3d/data/windows/weapona2.bmp diff --git a/scorched3d/.md5sum b/scorched3d/.md5sum index 03bbc14..2bc9e39 100644 --- a/scorched3d/.md5sum +++ b/scorched3d/.md5sum @@ -1,2 +1,2 @@ -263d2c1be168860d783426c4d6c7060c Scorched3D-40.1d-src.tar.gz -f275c62a98a9eb671a91b49f38567b56 scorched3d-freealut.patch +81d9d39748e77c56a9a6bce608169baa Scorched3D-41.1-src.tar.gz +48af0988f70d1eb1eddf71a9ec1fb0bc scorched3d-41.1-gljpg.patch diff --git a/scorched3d/Pkgfile b/scorched3d/Pkgfile index 995e1ec..0af8416 100644 --- a/scorched3d/Pkgfile +++ b/scorched3d/Pkgfile @@ -1,20 +1,19 @@ # Description: A 3D recreation of the classic DOS game Scorched Earth # URL: http://www.scorched3d.co.uk/ # Maintainer: Matt Housh, jaeger at crux dot nu -# Depends on: sdl_mixer, sdl_net, wxgtk, freealut +# Depends on: sdl_mixer, sdl_net, wxgtk, freealut, fftw name=scorched3d -version=40.1d +version=41.1 release=1 source=(http://dl.sourceforge.net/$name/Scorched3D-$version-src.tar.gz \ - $name-freealut.patch) + $name-$version-gljpg.patch) build() { cd scorched - patch -p0 -i $SRC/$name-freealut.patch + patch -i $SRC/$name-$version-gljpg.patch src/GLEXT/GLJpg.cpp ./configure --prefix=/usr \ --datadir=/usr/share/$name - #sed -i -e 's/\(^LIBS = .*\)/\1 -lalut/' src/scorched/Makefile make make DESTDIR=$PKG install rm -rf $PKG/usr/share/$name/documentation diff --git a/scorched3d/scorched3d-41.1-gljpg.patch b/scorched3d/scorched3d-41.1-gljpg.patch new file mode 100644 index 0000000..feef3e7 --- /dev/null +++ b/scorched3d/scorched3d-41.1-gljpg.patch @@ -0,0 +1,13 @@ +--- GLJpg.cpp.orig 2008-01-11 16:04:25.000000000 -0600 ++++ GLJpg.cpp 2008-01-11 16:04:40.000000000 -0600 +@@ -20,7 +20,9 @@ + + #include <stdio.h> + #include <math.h> +-#include <jpeglib.h> ++extern "C" { ++ #include <jpeglib.h> ++} + #include <common/Defines.h> + #include <GLEXT/GLJpg.h> + diff --git a/scorched3d/scorched3d-freealut.patch b/scorched3d/scorched3d-freealut.patch deleted file mode 100644 index 19be920..0000000 --- a/scorched3d/scorched3d-freealut.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- 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_;