From 8bb4fea24e25218ee6a9b3c9c86038c2b7d36aa6 Mon Sep 17 00:00:00 2001 From: John Anthony Date: Tue, 31 Jul 2012 15:46:01 +0100 Subject: Preparing for alternate animation and music sets --- Makefile | 2 +- nyan.c | 50 ++++++++++++++++++++++++-------------------------- res/basic/bg0.png | Bin 0 -> 247 bytes res/basic/bg1.png | Bin 0 -> 264 bytes res/basic/bg2.png | Bin 0 -> 271 bytes res/basic/bg3.png | Bin 0 -> 269 bytes res/basic/bg4.png | Bin 0 -> 282 bytes res/basic/fg00.png | Bin 0 -> 1090 bytes res/basic/fg01.png | Bin 0 -> 1099 bytes res/basic/fg02.png | Bin 0 -> 1102 bytes res/basic/fg03.png | Bin 0 -> 1110 bytes res/basic/fg04.png | Bin 0 -> 1092 bytes res/basic/music.ogg | Bin 0 -> 2668031 bytes res/frame00.png | Bin 1090 -> 0 bytes res/frame01.png | Bin 1099 -> 0 bytes res/frame02.png | Bin 1102 -> 0 bytes res/frame03.png | Bin 1110 -> 0 bytes res/frame04.png | Bin 1092 -> 0 bytes res/nyan.ogg | Bin 2668031 -> 0 bytes res/sparkle0.png | Bin 247 -> 0 bytes res/sparkle1.png | Bin 264 -> 0 bytes res/sparkle2.png | Bin 271 -> 0 bytes res/sparkle3.png | Bin 269 -> 0 bytes res/sparkle4.png | Bin 282 -> 0 bytes 24 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 res/basic/bg0.png create mode 100644 res/basic/bg1.png create mode 100644 res/basic/bg2.png create mode 100644 res/basic/bg3.png create mode 100644 res/basic/bg4.png create mode 100644 res/basic/fg00.png create mode 100644 res/basic/fg01.png create mode 100644 res/basic/fg02.png create mode 100644 res/basic/fg03.png create mode 100644 res/basic/fg04.png create mode 100644 res/basic/music.ogg delete mode 100644 res/frame00.png delete mode 100644 res/frame01.png delete mode 100644 res/frame02.png delete mode 100644 res/frame03.png delete mode 100644 res/frame04.png delete mode 100644 res/nyan.ogg delete mode 100644 res/sparkle0.png delete mode 100644 res/sparkle1.png delete mode 100644 res/sparkle2.png delete mode 100644 res/sparkle3.png delete mode 100644 res/sparkle4.png 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/basic/bg0.png b/res/basic/bg0.png new file mode 100644 index 0000000..03ba5e9 Binary files /dev/null and b/res/basic/bg0.png differ diff --git a/res/basic/bg1.png b/res/basic/bg1.png new file mode 100644 index 0000000..a151b55 Binary files /dev/null and b/res/basic/bg1.png differ diff --git a/res/basic/bg2.png b/res/basic/bg2.png new file mode 100644 index 0000000..f83ccac Binary files /dev/null and b/res/basic/bg2.png differ diff --git a/res/basic/bg3.png b/res/basic/bg3.png new file mode 100644 index 0000000..c767724 Binary files /dev/null and b/res/basic/bg3.png differ diff --git a/res/basic/bg4.png b/res/basic/bg4.png new file mode 100644 index 0000000..b3b08e4 Binary files /dev/null and b/res/basic/bg4.png differ diff --git a/res/basic/fg00.png b/res/basic/fg00.png new file mode 100644 index 0000000..b517a70 Binary files /dev/null and b/res/basic/fg00.png differ diff --git a/res/basic/fg01.png b/res/basic/fg01.png new file mode 100644 index 0000000..1f494bc Binary files /dev/null and b/res/basic/fg01.png differ diff --git a/res/basic/fg02.png b/res/basic/fg02.png new file mode 100644 index 0000000..6f1e105 Binary files /dev/null and b/res/basic/fg02.png differ diff --git a/res/basic/fg03.png b/res/basic/fg03.png new file mode 100644 index 0000000..128ce00 Binary files /dev/null and b/res/basic/fg03.png differ diff --git a/res/basic/fg04.png b/res/basic/fg04.png new file mode 100644 index 0000000..84d50e5 Binary files /dev/null and b/res/basic/fg04.png differ diff --git a/res/basic/music.ogg b/res/basic/music.ogg new file mode 100644 index 0000000..0ab05ac Binary files /dev/null and b/res/basic/music.ogg differ diff --git a/res/frame00.png b/res/frame00.png deleted file mode 100644 index b517a70..0000000 Binary files a/res/frame00.png and /dev/null differ diff --git a/res/frame01.png b/res/frame01.png deleted file mode 100644 index 1f494bc..0000000 Binary files a/res/frame01.png and /dev/null differ diff --git a/res/frame02.png b/res/frame02.png deleted file mode 100644 index 6f1e105..0000000 Binary files a/res/frame02.png and /dev/null differ diff --git a/res/frame03.png b/res/frame03.png deleted file mode 100644 index 128ce00..0000000 Binary files a/res/frame03.png and /dev/null differ diff --git a/res/frame04.png b/res/frame04.png deleted file mode 100644 index 84d50e5..0000000 Binary files a/res/frame04.png and /dev/null differ diff --git a/res/nyan.ogg b/res/nyan.ogg deleted file mode 100644 index 0ab05ac..0000000 Binary files a/res/nyan.ogg and /dev/null differ diff --git a/res/sparkle0.png b/res/sparkle0.png deleted file mode 100644 index 03ba5e9..0000000 Binary files a/res/sparkle0.png and /dev/null differ diff --git a/res/sparkle1.png b/res/sparkle1.png deleted file mode 100644 index a151b55..0000000 Binary files a/res/sparkle1.png and /dev/null differ diff --git a/res/sparkle2.png b/res/sparkle2.png deleted file mode 100644 index f83ccac..0000000 Binary files a/res/sparkle2.png and /dev/null differ diff --git a/res/sparkle3.png b/res/sparkle3.png deleted file mode 100644 index c767724..0000000 Binary files a/res/sparkle3.png and /dev/null differ diff --git a/res/sparkle4.png b/res/sparkle4.png deleted file mode 100644 index b3b08e4..0000000 Binary files a/res/sparkle4.png and /dev/null differ -- cgit v1.2.3