Added new thwomp assets.

git-svn-id: https://s.snth.net/svn/neverball/trunk@3225 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/data/mtrl/thwomp-fear b/data/mtrl/thwomp-fear
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-fear
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-fear.png b/data/mtrl/thwomp-fear.png
new file mode 100644 (file)
index 0000000..6390345
Binary files /dev/null and b/data/mtrl/thwomp-fear.png differ

diff --git a/data/mtrl/thwomp-grim b/data/mtrl/thwomp-grim
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-grim
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-grim.png b/data/mtrl/thwomp-grim.png
new file mode 100644 (file)
index 0000000..7b3ad32
Binary files /dev/null and b/data/mtrl/thwomp-grim.png differ

diff --git a/data/mtrl/thwomp-gufaw b/data/mtrl/thwomp-gufaw
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-gufaw
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-gufaw.png b/data/mtrl/thwomp-gufaw.png
new file mode 100644 (file)
index 0000000..7ed5c10
Binary files /dev/null and b/data/mtrl/thwomp-gufaw.png differ

diff --git a/data/mtrl/thwomp-incred b/data/mtrl/thwomp-incred
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-incred
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-incred.png b/data/mtrl/thwomp-incred.png
new file mode 100644 (file)
index 0000000..b11cecb
Binary files /dev/null and b/data/mtrl/thwomp-incred.png differ

diff --git a/data/mtrl/thwomp-mocking b/data/mtrl/thwomp-mocking
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-mocking
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-mocking.png b/data/mtrl/thwomp-mocking.png
new file mode 100644 (file)
index 0000000..1108e32
Binary files /dev/null and b/data/mtrl/thwomp-mocking.png differ

diff --git a/data/mtrl/thwomp-sullen b/data/mtrl/thwomp-sullen
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-sullen
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-sullen.png b/data/mtrl/thwomp-sullen.png
new file mode 100644 (file)
index 0000000..c535b36
Binary files /dev/null and b/data/mtrl/thwomp-sullen.png differ

diff --git a/data/mtrl/thwomp-whistler b/data/mtrl/thwomp-whistler
new file mode 100644 (file)
index 0000000..cf9568b
--- /dev/null
+++ b/data/mtrl/thwomp-whistler
@@ -0,0 +1,7 @@
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+66
+45.000000

diff --git a/data/mtrl/thwomp-whistler.png b/data/mtrl/thwomp-whistler.png
new file mode 100644 (file)
index 0000000..f8f3b7b
Binary files /dev/null and b/data/mtrl/thwomp-whistler.png differ

diff --git a/data/mtrl/thwomp.png b/data/mtrl/thwomp.png
index 3bfa895..3efe952 100644 (file)
Binary files a/data/mtrl/thwomp.png and b/data/mtrl/thwomp.png differ

diff --git a/share/fs.c b/share/fs.c
index fd75cbf..bc96b89 100644 (file)
--- a/share/fs.c
+++ b/share/fs.c
@@ -396,8 +396,9 @@ static int write_lines(const char *start, int length, fs_file fh)
 
 #include <stdio.h>
 #include <stdarg.h>
-
+#ifndef __APPLE__
 extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif
 
 int fs_printf(fs_file fh, const char *fmt, ...)
 {