finish moving data files around (I think)

diff --git a/Makefile b/Makefile
index 3656113..3d5716c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,9 @@ install-program: program
        $(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
 
 install-data: data
-       $(INSTALL_DATA) ./data/* $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.png $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
        $(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
 
 uninstall: uninstall-program uninstall-data rminstalldirs
@@ -126,5 +128,7 @@ uninstall-program:
        rm -f $(PROGRAM_PREFIX)/vor
 
 uninstall-data:
-       rm -f $(DATA_PREFIX)/*
+       rm -f $(DATA_PREFIX)/*.png
+       rm -f $(DATA_PREFIX)/*.wav
+       rm -f $(DATA_PREFIX)/*.mod
        rm -f $(DATA_PREFIX)/icons/*

diff --git a/main.c b/main.c
index 11ebba6..7620378 100644 (file)
--- a/main.c
+++ b/main.c
@@ -391,12 +391,12 @@ init(void) {
        }
 
        // Load the banners
-       NULLERROR(surf_b_variations = load_image("variations.png"));
-       NULLERROR(surf_b_on = load_image("on.png"));
-       NULLERROR(surf_b_rockdodger = load_image("rockdodger.png"));
+       NULLERROR(surf_b_variations = load_image("b_variations.png"));
+       NULLERROR(surf_b_on = load_image("b_on.png"));
+       NULLERROR(surf_b_rockdodger = load_image("b_rockdodger.png"));
 
-       NULLERROR(surf_b_game = load_image("game.png"));
-       NULLERROR(surf_b_over = load_image("over.png"));
+       NULLERROR(surf_b_game = load_image("b_game.png"));
+       NULLERROR(surf_b_over = load_image("b_over.png"));
 
        // Load the life indicator (small ship) graphic.
        NULLERROR(surf_life = load_image("life.png"));

diff --git a/rocks.c b/rocks.c
index 5f637e0..9384fe0 100644 (file)
--- a/rocks.c
+++ b/rocks.c
@@ -37,7 +37,7 @@ reset_rocks(void)
        nrocks_timer = 0;
 }
 
-#define ROCK_LEN sizeof("sprites/rockXX.png")
+#define ROCK_LEN sizeof("rockXX.png")
 
 void
 load_rocks(void)
@@ -46,7 +46,7 @@ load_rocks(void)
        char a[ROCK_LEN];
 
        for(i=0; i<NROCKS; i++) {
-               snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
+               snprintf(a, ROCK_LEN, "rock%02d.png", i);
                load_sprite(SPRITE(&prototypes[i]), a);
                prototypes[i].sprite_type = ROCK;
                prototypes[i].flags = MOVE|DRAW|COLLIDE;