Repositories / curblaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d393d3f)
Data path handling.
authorlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Thu, 28 May 2009 18:33:27 +0000 (18:33 +0000)
committerlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Thu, 28 May 2009 18:33:27 +0000 (18:33 +0000)
git-svn-id: svn+ssh://svn/var/repos/curfender@805 bc5cbbab-a4ec-0310-bb52-ff3d296db539

data/boom.ogg [moved from boom.ogg with 100% similarity] patch | blob | blame | history
data/dropoff.ogg [moved from dropoff.ogg with 100% similarity] patch | blob | blame | history
data/laser.ogg [moved from laser.ogg with 100% similarity] patch | blob | blame | history
data/pickup.ogg [moved from pickup.ogg with 100% similarity] patch | blob | blame | history
data/shot.ogg [moved from shot.ogg with 100% similarity] patch | blob | blame | history
data/warning.ogg [moved from warning.ogg with 100% similarity] patch | blob | blame | history
main.cpp patch | blob | blame | history

diff --git a/boom.ogg b/data/boom.ogg
similarity index 100%
rename from boom.ogg
rename to data/boom.ogg
diff --git a/dropoff.ogg b/data/dropoff.ogg
similarity index 100%
rename from dropoff.ogg
rename to data/dropoff.ogg
diff --git a/laser.ogg b/data/laser.ogg
similarity index 100%
rename from laser.ogg
rename to data/laser.ogg
diff --git a/pickup.ogg b/data/pickup.ogg
similarity index 100%
rename from pickup.ogg
rename to data/pickup.ogg
diff --git a/shot.ogg b/data/shot.ogg
similarity index 100%
rename from shot.ogg
rename to data/shot.ogg
diff --git a/warning.ogg b/data/warning.ogg
similarity index 100%
rename from warning.ogg
rename to data/warning.ogg
diff --git a/main.cpp b/main.cpp
index 7b5ebf4..4e74f49 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <time.h>
 #include <cstdio>
 #include <math.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include "SDL/SDL.h"
 #include "SDL/SDL_mixer.h"
@@ -1234,6 +1236,9 @@ int main(){
 
     char *env_tty;
     env_tty = getenv("SSH_TTY");
+    
+    struct stat datatest;
+    
     if(env_tty == NULL){
 
       SDL_Init(SDL_INIT_AUDIO);
@@ -1243,12 +1248,22 @@ int main(){
         exit(1);
       }
 
-      shotsound = Mix_LoadWAV("shot.ogg");
-      boomsound = Mix_LoadWAV("boom.ogg");
-      dropoffsound = Mix_LoadWAV("dropoff.ogg");
-      pickupsound = Mix_LoadWAV("pickup.ogg");
-      lasersound = Mix_LoadWAV("laser.ogg");
-      warningsound = Mix_LoadWAV("warning.ogg");
+      
+      if(stat("data/boom.ogg", &datatest)==0){
+        shotsound = Mix_LoadWAV("data/shot.ogg");
+        boomsound = Mix_LoadWAV("data/boom.ogg");
+        dropoffsound = Mix_LoadWAV("data/dropoff.ogg");
+        pickupsound = Mix_LoadWAV("data/pickup.ogg");
+        lasersound = Mix_LoadWAV("data/laser.ogg");
+        warningsound = Mix_LoadWAV("data/warning.ogg");
+      } else {
+        shotsound = Mix_LoadWAV("/usr/share/curfender/data/shot.ogg");
+        boomsound = Mix_LoadWAV("/usr/share/curfender/data/boom.ogg");
+        dropoffsound = Mix_LoadWAV("/usr/share/curfender/data/dropoff.ogg");
+        pickupsound = Mix_LoadWAV("/usr/share/curfender/data/pickup.ogg");
+        lasersound = Mix_LoadWAV("/usr/share/curfender/data/laser.ogg");
+        warningsound = Mix_LoadWAV("/usr/share/curfender/data/warning.ogg");
+      }
     } else {
       sound = 0;
   }
Fork of https://codeberg.org/gwync/curblaster.git with improvements