summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Anthony <johnanthony@lavabit.com>2012-08-01 00:03:55 +0100
committerJohn Anthony <johnanthony@lavabit.com>2012-08-01 00:03:55 +0100
commitae127d42b419728f2ef9e711fa2711038080baf1 (patch)
tree679a40520f2be2163c4d8ca328844f58f602d416
parent103ec3923e1b2a904e33525ab8246fbadeec36b8 (diff)
downloadnyancat-ae127d42b419728f2ef9e711fa2711038080baf1.tar.gz
nyancat-ae127d42b419728f2ef9e711fa2711038080baf1.tar.bz2
nyancat-ae127d42b419728f2ef9e711fa2711038080baf1.zip
Renamed "basic" data pack as "default" and updated the music to be the free software song
-rw-r--r--LICENSE2
-rw-r--r--nyan.c6
-rw-r--r--res/default/bg00.png (renamed from res/basic/bg00.png)bin247 -> 247 bytes
-rw-r--r--res/default/bg01.png (renamed from res/basic/bg01.png)bin264 -> 264 bytes
-rw-r--r--res/default/bg02.png (renamed from res/basic/bg02.png)bin271 -> 271 bytes
-rw-r--r--res/default/bg03.png (renamed from res/basic/bg03.png)bin269 -> 269 bytes
-rw-r--r--res/default/bg04.png (renamed from res/basic/bg04.png)bin282 -> 282 bytes
-rw-r--r--res/default/data (renamed from res/basic/data)0
-rw-r--r--res/default/fg00.png (renamed from res/basic/fg00.png)bin1090 -> 1090 bytes
-rw-r--r--res/default/fg01.png (renamed from res/basic/fg01.png)bin1099 -> 1099 bytes
-rw-r--r--res/default/fg02.png (renamed from res/basic/fg02.png)bin1102 -> 1102 bytes
-rw-r--r--res/default/fg03.png (renamed from res/basic/fg03.png)bin1110 -> 1110 bytes
-rw-r--r--res/default/fg04.png (renamed from res/basic/fg04.png)bin1092 -> 1092 bytes
-rw-r--r--res/default/music.ogg (renamed from res/basic/music.ogg)bin2668031 -> 2668031 bytes
-rw-r--r--res/freedom/music.oggbin1687373 -> 3520569 bytes
15 files changed, 4 insertions, 4 deletions
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/default/bg00.png
index 03ba5e9..03ba5e9 100644
--- a/res/basic/bg00.png
+++ b/res/default/bg00.png
Binary files differ
diff --git a/res/basic/bg01.png b/res/default/bg01.png
index a151b55..a151b55 100644
--- a/res/basic/bg01.png
+++ b/res/default/bg01.png
Binary files differ
diff --git a/res/basic/bg02.png b/res/default/bg02.png
index f83ccac..f83ccac 100644
--- a/res/basic/bg02.png
+++ b/res/default/bg02.png
Binary files differ
diff --git a/res/basic/bg03.png b/res/default/bg03.png
index c767724..c767724 100644
--- a/res/basic/bg03.png
+++ b/res/default/bg03.png
Binary files differ
diff --git a/res/basic/bg04.png b/res/default/bg04.png
index b3b08e4..b3b08e4 100644
--- a/res/basic/bg04.png
+++ b/res/default/bg04.png
Binary files differ
diff --git a/res/basic/data b/res/default/data
index fd3c81a..fd3c81a 100644
--- a/res/basic/data
+++ b/res/default/data
diff --git a/res/basic/fg00.png b/res/default/fg00.png
index b517a70..b517a70 100644
--- a/res/basic/fg00.png
+++ b/res/default/fg00.png
Binary files differ
diff --git a/res/basic/fg01.png b/res/default/fg01.png
index 1f494bc..1f494bc 100644
--- a/res/basic/fg01.png
+++ b/res/default/fg01.png
Binary files differ
diff --git a/res/basic/fg02.png b/res/default/fg02.png
index 6f1e105..6f1e105 100644
--- a/res/basic/fg02.png
+++ b/res/default/fg02.png
Binary files differ
diff --git a/res/basic/fg03.png b/res/default/fg03.png
index 128ce00..128ce00 100644
--- a/res/basic/fg03.png
+++ b/res/default/fg03.png
Binary files differ
diff --git a/res/basic/fg04.png b/res/default/fg04.png
index 84d50e5..84d50e5 100644
--- a/res/basic/fg04.png
+++ b/res/default/fg04.png
Binary files differ
diff --git a/res/basic/music.ogg b/res/default/music.ogg
index 0ab05ac..0ab05ac 100644
--- a/res/basic/music.ogg
+++ b/res/default/music.ogg
Binary files differ
diff --git a/res/freedom/music.ogg b/res/freedom/music.ogg
index f8b6316..f8b250e 100644
--- a/res/freedom/music.ogg
+++ b/res/freedom/music.ogg
Binary files differ