From 670433bcf6437f45083eb1a3c90e2b975ba9b66e Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Sun, 17 May 2009 23:22:55 +0000 Subject: [PATCH] Level mods --- Makefile | 20 ++++++++++++++++---- Makefile.leapord | 6 +++--- data/levels/batsinthebelfry.dat | 18 ++++++++++++++++-- data/levels/crazyarchitect.dat | 2 +- data/levels/dontjump.dat | 2 +- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 077e8a1..2fdf3d3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,20 @@ +LIBS = libs/libSDL-1.2.0.dylib libs/libSDL_image-1.2.0.dylib libs/libSDL_mixer-1.2.0.dylib libs/libSDL_ttf-2.0.0.dylib libs/libjpeg.62.dylib libs/libpng.3.dylib libs/libvorbisfile.3.dylib libs/libogg.0.dylib libs/libsmpeg-0.4.0.dylib libs/libmikmod.2.dylib libs/libvorbis.0.dylib libs/libSDL_gfx.dylib + all: rc edit -rc: rc.c rc.h shared.c shared.h defs.h - gcc -Wall -DREV=`./getsvnrev.sh` -orc -g rc.c shared.c `sdl-config --cflags --libs` -I/usr/local/include -L/usr/local/lib -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer +rc: rc.c shared.c rc.h shared.h globals.h defs.h + gcc -Wall -DREV=`./getsvnrev.sh` -o rc -g rc.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_Mixer -edit: edit.c edit.h shared.c shared.h defs.h - gcc -D__EDITOR -Wall -DREV=`./getsvnrev.sh` -oedit -g edit.c shared.c `sdl-config --cflags --libs` -I/usr/local/include -L/usr/local/lib -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer +edit: edit.c shared.c edit.h shared.h globals.h defs.h + gcc -DREV=`./getsvnrev.sh` -D__EDITOR -Wall -o edit -g edit.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf + +app: rc + if [ `uname -s` != "Darwin" ]; then echo "Mac .app bundle generation is only available under OSX."; exit 1; fi; + if [ -d RatCatcher.app ]; then rm -fr RatCatcher.app ; fi + # create staging area without svn files + rsync -rC data/ staging/data + platypus -a rc -t shell -o TextWindow -R -u "Rob Pearce" -f staging/data -f rc scripts/run.sh RatCatcher.app + seticon -d icon.icns RatCatcher.app + dylibbundler -od -b -x ./RatCatcher.app/Contents/Resources/rc -d ./RatCatcher.app/Contents/libs/ -p @executable_path/../libs/ + zip -r RatCatcher.zip RatCatcher.app diff --git a/Makefile.leapord b/Makefile.leapord index 37df53c..2fdf3d3 100644 --- a/Makefile.leapord +++ b/Makefile.leapord @@ -3,10 +3,10 @@ LIBS = libs/libSDL-1.2.0.dylib libs/libSDL_image-1.2.0.dylib libs/libSDL_mixer-1 all: rc edit rc: rc.c shared.c rc.h shared.h globals.h defs.h - gcc -Wall -o rc -g rc.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_Mixer + gcc -Wall -DREV=`./getsvnrev.sh` -o rc -g rc.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_Mixer -edit: edit.c shared.c edit.h shared.h globals.h defs.h - gcc -D__EDITOR -Wall -o edit -g edit.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf +edit: edit.c shared.c edit.h shared.h globals.h defs.h + gcc -DREV=`./getsvnrev.sh` -D__EDITOR -Wall -o edit -g edit.c shared.c `sdl-config --cflags --libs` -lSDLmain -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf app: rc if [ `uname -s` != "Darwin" ]; then echo "Mac .app bundle generation is only available under OSX."; exit 1; fi; diff --git a/data/levels/batsinthebelfry.dat b/data/levels/batsinthebelfry.dat index 40c7443..f3bd78c 100644 --- a/data/levels/batsinthebelfry.dat +++ b/data/levels/batsinthebelfry.dat @@ -4,8 +4,22 @@ hurryup 30 help endhelp monsters -0 0 0 -134 0 0 +0 3 28 +134 33 26 +172 9 3 +172 32 6 +132 37 25 600 416 600 39 603 39 603 39 603 39 603 39 +132 2 2 40 48 40 406 41 406 41 406 41 406 41 406 41 406 41 406 +171 22 10 +171 8 18 +171 24 17 +12 14 22 +12 34 18 +49 17 27 +49 28 22 +6 15 13 +6 29 11 +23 23 17 endmonsters exitdir 1 74,98,98,98,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,98,98,98,74, diff --git a/data/levels/crazyarchitect.dat b/data/levels/crazyarchitect.dat index 8579f8a..e3ecdb0 100644 --- a/data/levels/crazyarchitect.dat +++ b/data/levels/crazyarchitect.dat @@ -8,7 +8,7 @@ monsters 134 38 22 23 18 10 172 20 3 -132 34 16 552 272 552 272 552 272 552 272 552 460 +132 34 16 552 272 552 272 552 272 552 272 552 272 552 460 49 24 17 49 27 23 157 8 27 diff --git a/data/levels/dontjump.dat b/data/levels/dontjump.dat index a3789a2..40b133d 100644 --- a/data/levels/dontjump.dat +++ b/data/levels/dontjump.dat @@ -17,7 +17,7 @@ monsters 6 2 17 49 19 2 endmonsters -exitdir 1 +exitdir -2 74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74, 74,98,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,74,98,98,98,98,74,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,98,74, 74,98,98,98,98,98,98,97,75,99,75,97,98,98,98,98,98,74,98,98,98,98,74,98,98,98,98,98,97,75,99,75,97,98,98,98,98,98,98,74,