Preparing for alternate animation and music sets

13 files changed, 25 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index d8b3245..c5b1e42 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ nyancat:  nyan.c
 install:
 	cp nyancat ${BIN}
 	mkdir --parents ${RES}
-	cp -v res/* ${RES}
+	cp -rv res/* ${RES}
 
 clean:
 	rm nyancat
diff --git a/nyan.c b/nyan.c
index 287cdab..d7ebdbb 100644
--- a/nyan.c
+++ b/nyan.c
@@ -360,50 +360,48 @@ load_images(void) {
 

     /* Local cat */

     static char *catimgpaths[] = {

-            "res/frame00.png",

-            "res/frame01.png",

-            "res/frame02.png",

-            "res/frame03.png",

-            "res/frame04.png"};

+            "res/basic/fg00.png",

+            "res/basic/fg01.png",

+            "res/basic/fg02.png",

+            "res/basic/fg03.png",

+            "res/basic/fg04.png"};

     /* Installed cat */

     static char *altcatimgpaths[] = {

-            "/usr/share/nyancat/frame00.png",

-            "/usr/share/nyancat/frame01.png",

-            "/usr/share/nyancat/frame02.png",

-            "/usr/share/nyancat/frame03.png",

-            "/usr/share/nyancat/frame04.png"};

+            "/usr/share/nyancat/basic/fg00.png",

+            "/usr/share/nyancat/basic/fg01.png",

+            "/usr/share/nyancat/basic/fg02.png",

+            "/usr/share/nyancat/basic/fg03.png",

+            "/usr/share/nyancat/basic/fg04.png"};

     /* Local sparkles */

     static char *sparklepaths[] = {

-            "res/sparkle0.png",

-            "res/sparkle1.png",

-            "res/sparkle2.png",

-            "res/sparkle3.png",

-            "res/sparkle4.png"};

+            "res/basic/bg0.png",

+            "res/basic/bg1.png",

+            "res/basic/bg2.png",

+            "res/basic/bg3.png",

+            "res/basic/bg4.png"};

     /* Installed sparkles */

     static char *altsparklepaths[] = {

-            "/usr/share/nyancat/sparkle0.png",

-            "/usr/share/nyancat/sparkle1.png",

-            "/usr/share/nyancat/sparkle2.png",

-            "/usr/share/nyancat/sparkle3.png",

-            "/usr/share/nyancat/sparkle4.png"};

+            "/usr/share/nyancat/basic/bg0.png",

+            "/usr/share/nyancat/basic/bg1.png",

+            "/usr/share/nyancat/basic/bg2.png",

+            "/usr/share/nyancat/basic/bg3.png",

+            "/usr/share/nyancat/basic/bg4.png"};

 

     /* Loading logic */

     for (i = 0; i < ANIM_FRAMES; ++i) {

-

         /* Cat images */

         cat_img[i] = load_image(catimgpaths[i]);

         if (!cat_img[i])

             cat_img[i] = load_image(altcatimgpaths[i]);

         if (!cat_img[i])

-            errout("Error loading cat images!");

+            errout("Error loading foreground images!");

 

         /* Sparkle images  */

         sparkle_img[i] = load_image(sparklepaths[i]);

         if (!sparkle_img[i])

             sparkle_img[i] = load_image(altsparklepaths[i]);

         if (!sparkle_img[i])

-            errout("Error loading sparkle images!");

-

+            errout("Error loading background images!");

     }

 }

 

@@ -422,9 +420,9 @@ load_image( const char* path ) {
 

 static void

 load_music(void) {

-    music = Mix_LoadMUS("res/nyan.ogg");

+    music = Mix_LoadMUS("res/basic/music.ogg");

     if (!music)

-        music = Mix_LoadMUS("/usr/share/nyancat/nyan.ogg");

+        music = Mix_LoadMUS("/usr/share/nyancat/basic/music.ogg");

     if (!music)

         printf("Unable to load Ogg file: %s\n", Mix_GetError());

 }

diff --git a/res/sparkle0.png b/res/basic/bg0.png
index 03ba5e9..03ba5e9 100644
--- a/res/sparkle0.png
+++ b/res/basic/bg0.png
diff --git a/res/sparkle1.png b/res/basic/bg1.png
index a151b55..a151b55 100644
--- a/res/sparkle1.png
+++ b/res/basic/bg1.png
diff --git a/res/sparkle2.png b/res/basic/bg2.png
index f83ccac..f83ccac 100644
--- a/res/sparkle2.png
+++ b/res/basic/bg2.png
diff --git a/res/sparkle3.png b/res/basic/bg3.png
index c767724..c767724 100644
--- a/res/sparkle3.png
+++ b/res/basic/bg3.png
diff --git a/res/sparkle4.png b/res/basic/bg4.png
index b3b08e4..b3b08e4 100644
--- a/res/sparkle4.png
+++ b/res/basic/bg4.png
diff --git a/res/frame00.png b/res/basic/fg00.png
index b517a70..b517a70 100644
--- a/res/frame00.png
+++ b/res/basic/fg00.png
diff --git a/res/frame01.png b/res/basic/fg01.png
index 1f494bc..1f494bc 100644
--- a/res/frame01.png
+++ b/res/basic/fg01.png
diff --git a/res/frame02.png b/res/basic/fg02.png
index 6f1e105..6f1e105 100644
--- a/res/frame02.png
+++ b/res/basic/fg02.png
diff --git a/res/frame03.png b/res/basic/fg03.png
index 128ce00..128ce00 100644
--- a/res/frame03.png
+++ b/res/basic/fg03.png
diff --git a/res/frame04.png b/res/basic/fg04.png
index 84d50e5..84d50e5 100644
--- a/res/frame04.png
+++ b/res/basic/fg04.png
diff --git a/res/nyan.ogg b/res/basic/music.ogg
index 0ab05ac..0ab05ac 100644
--- a/res/nyan.ogg
+++ b/res/basic/music.ogg