From ae127d42b419728f2ef9e711fa2711038080baf1 Mon Sep 17 00:00:00 2001 From: John Anthony Date: Wed, 1 Aug 2012 00:03:55 +0100 Subject: Renamed "basic" data pack as "default" and updated the music to be the free software song --- LICENSE | 2 +- nyan.c | 6 +++--- res/basic/bg00.png | Bin 247 -> 0 bytes res/basic/bg01.png | Bin 264 -> 0 bytes res/basic/bg02.png | Bin 271 -> 0 bytes res/basic/bg03.png | Bin 269 -> 0 bytes res/basic/bg04.png | Bin 282 -> 0 bytes res/basic/data | 2 -- res/basic/fg00.png | Bin 1090 -> 0 bytes res/basic/fg01.png | Bin 1099 -> 0 bytes res/basic/fg02.png | Bin 1102 -> 0 bytes res/basic/fg03.png | Bin 1110 -> 0 bytes res/basic/fg04.png | Bin 1092 -> 0 bytes res/basic/music.ogg | Bin 2668031 -> 0 bytes res/default/bg00.png | Bin 0 -> 247 bytes res/default/bg01.png | Bin 0 -> 264 bytes res/default/bg02.png | Bin 0 -> 271 bytes res/default/bg03.png | Bin 0 -> 269 bytes res/default/bg04.png | Bin 0 -> 282 bytes res/default/data | 2 ++ res/default/fg00.png | Bin 0 -> 1090 bytes res/default/fg01.png | Bin 0 -> 1099 bytes res/default/fg02.png | Bin 0 -> 1102 bytes res/default/fg03.png | Bin 0 -> 1110 bytes res/default/fg04.png | Bin 0 -> 1092 bytes res/default/music.ogg | Bin 0 -> 2668031 bytes res/freedom/music.ogg | Bin 1687373 -> 3520569 bytes 27 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 res/basic/bg00.png delete mode 100644 res/basic/bg01.png delete mode 100644 res/basic/bg02.png delete mode 100644 res/basic/bg03.png delete mode 100644 res/basic/bg04.png delete mode 100644 res/basic/data delete mode 100644 res/basic/fg00.png delete mode 100644 res/basic/fg01.png delete mode 100644 res/basic/fg02.png delete mode 100644 res/basic/fg03.png delete mode 100644 res/basic/fg04.png delete mode 100644 res/basic/music.ogg create mode 100644 res/default/bg00.png create mode 100644 res/default/bg01.png create mode 100644 res/default/bg02.png create mode 100644 res/default/bg03.png create mode 100644 res/default/bg04.png create mode 100644 res/default/data create mode 100644 res/default/fg00.png create mode 100644 res/default/fg01.png create mode 100644 res/default/fg02.png create mode 100644 res/default/fg03.png create mode 100644 res/default/fg04.png create mode 100644 res/default/music.ogg diff --git a/LICENSE b/LICENSE index 7bf334b..72a0f8c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2011 John Anthony +Copyright (C) 2011-2012 John Anthony This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/nyan.c b/nyan.c index 7fb8251..524bdc3 100644 --- a/nyan.c +++ b/nyan.c @@ -313,7 +313,7 @@ handle_args(int argc, char **argv) { } if (!RESOURCE_PATH) - RESOURCE_PATH = "basic"; + RESOURCE_PATH = "default"; } static void @@ -600,8 +600,8 @@ usage(char* exname) { resolution to use (0 and 0 for full \n\ resolution) (800x600 default)\n\ -d, --data-set Use an alternate data set. Packaged with\n\ - this program by default are \"basic\"\n\ - (the default) and \"freedom\" sets.\n\ + this program by default are \"default\"\n\ + and \"freedom\" sets.\n\ -hw, -sw Use hardware or software SDL rendering, \n\ respectively. Hardware is default\n", exname); exit(0); diff --git a/res/basic/bg00.png b/res/basic/bg00.png deleted file mode 100644 index 03ba5e9..0000000 Binary files a/res/basic/bg00.png and /dev/null differ diff --git a/res/basic/bg01.png b/res/basic/bg01.png deleted file mode 100644 index a151b55..0000000 Binary files a/res/basic/bg01.png and /dev/null differ diff --git a/res/basic/bg02.png b/res/basic/bg02.png deleted file mode 100644 index f83ccac..0000000 Binary files a/res/basic/bg02.png and /dev/null differ diff --git a/res/basic/bg03.png b/res/basic/bg03.png deleted file mode 100644 index c767724..0000000 Binary files a/res/basic/bg03.png and /dev/null differ diff --git a/res/basic/bg04.png b/res/basic/bg04.png deleted file mode 100644 index b3b08e4..0000000 Binary files a/res/basic/bg04.png and /dev/null differ diff --git a/res/basic/data b/res/basic/data deleted file mode 100644 index fd3c81a..0000000 --- a/res/basic/data +++ /dev/null @@ -1,2 +0,0 @@ -5 -5 diff --git a/res/basic/fg00.png b/res/basic/fg00.png deleted file mode 100644 index b517a70..0000000 Binary files a/res/basic/fg00.png and /dev/null differ diff --git a/res/basic/fg01.png b/res/basic/fg01.png deleted file mode 100644 index 1f494bc..0000000 Binary files a/res/basic/fg01.png and /dev/null differ diff --git a/res/basic/fg02.png b/res/basic/fg02.png deleted file mode 100644 index 6f1e105..0000000 Binary files a/res/basic/fg02.png and /dev/null differ diff --git a/res/basic/fg03.png b/res/basic/fg03.png deleted file mode 100644 index 128ce00..0000000 Binary files a/res/basic/fg03.png and /dev/null differ diff --git a/res/basic/fg04.png b/res/basic/fg04.png deleted file mode 100644 index 84d50e5..0000000 Binary files a/res/basic/fg04.png and /dev/null differ diff --git a/res/basic/music.ogg b/res/basic/music.ogg deleted file mode 100644 index 0ab05ac..0000000 Binary files a/res/basic/music.ogg and /dev/null differ diff --git a/res/default/bg00.png b/res/default/bg00.png new file mode 100644 index 0000000..03ba5e9 Binary files /dev/null and b/res/default/bg00.png differ diff --git a/res/default/bg01.png b/res/default/bg01.png new file mode 100644 index 0000000..a151b55 Binary files /dev/null and b/res/default/bg01.png differ diff --git a/res/default/bg02.png b/res/default/bg02.png new file mode 100644 index 0000000..f83ccac Binary files /dev/null and b/res/default/bg02.png differ diff --git a/res/default/bg03.png b/res/default/bg03.png new file mode 100644 index 0000000..c767724 Binary files /dev/null and b/res/default/bg03.png differ diff --git a/res/default/bg04.png b/res/default/bg04.png new file mode 100644 index 0000000..b3b08e4 Binary files /dev/null and b/res/default/bg04.png differ diff --git a/res/default/data b/res/default/data new file mode 100644 index 0000000..fd3c81a --- /dev/null +++ b/res/default/data @@ -0,0 +1,2 @@ +5 +5 diff --git a/res/default/fg00.png b/res/default/fg00.png new file mode 100644 index 0000000..b517a70 Binary files /dev/null and b/res/default/fg00.png differ diff --git a/res/default/fg01.png b/res/default/fg01.png new file mode 100644 index 0000000..1f494bc Binary files /dev/null and b/res/default/fg01.png differ diff --git a/res/default/fg02.png b/res/default/fg02.png new file mode 100644 index 0000000..6f1e105 Binary files /dev/null and b/res/default/fg02.png differ diff --git a/res/default/fg03.png b/res/default/fg03.png new file mode 100644 index 0000000..128ce00 Binary files /dev/null and b/res/default/fg03.png differ diff --git a/res/default/fg04.png b/res/default/fg04.png new file mode 100644 index 0000000..84d50e5 Binary files /dev/null and b/res/default/fg04.png differ diff --git a/res/default/music.ogg b/res/default/music.ogg new file mode 100644 index 0000000..0ab05ac Binary files /dev/null and b/res/default/music.ogg differ diff --git a/res/freedom/music.ogg b/res/freedom/music.ogg index f8b6316..f8b250e 100644 Binary files a/res/freedom/music.ogg and b/res/freedom/music.ogg differ -- cgit v1.2.3