Add Pandora specific code (PANDORA preprocessor definition) and README.md

Author: M-HT

Makefile-pandora

@@ -0,0 +1,100 @@
+HOST=generic
+#HOST=mingw
+#HOST=haiku
+
+CC=arm-none-linux-gnueabi-g++
+RM=rm
+CFLAGS= -Os -DPANDORA -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=vfpv3 -mfloat-abi=softfp -I${PNDSDK}/usr/include -L${PNDSDK}/usr/lib
+COPTS=  $(CFLAGS) -funsigned-char -ffast-math
+LIBS= -lm -lSDL -lts -lSDL_mixer -lmad -s
+SRCS= alien.c asylum.c bullet.c file.c keyboard.c maze.c menus.c player.c projectile.c sound.c vdu.c
+
+RESOURCES=data/Resources data/Ego data/Psyche data/Id data/Voices
+
+INSTALLGROUP=games
+CHGRP=chgrp
+CHMOD=chmod
+
+# For a non-root install, try something like this:
+#
+#INSTALLBIN=/home/blotwell/bin/asylum
+#INSTALLRESOURCEPATH=/home/blotwell/lib/asylum
+#INSTALLHISCORES=/home/blotwell/.asylum-hiscores
+#
+#INSTALLGROUP=foo
+#CHGRP=echo
+#CHMOD=echo
+ifeq ($(HOST),haiku)
+	CC=i586-pc-haiku-gcc
+	COPTS+=$(CPPFLAGS) -D_NO_SOUND
+	INSTALLBIN=/boot/common/games/asylum/asylum
+	INSTALLRESOURCEPATH=/boot/common/games/asylum/data
+	INSTALLHISCORES=/boot/common/games/asylum/hiscores
+	OS_SOURCE=asylum_haiku.c
+	LIBS=-lSDL_mixer -lSDL -lbe -lroot -ldevice -lgame -lGL -ltextencoding -lmedia
+endif
+ifeq ($(HOST),mingw)
+	INSTALLBIN="c:/program files/asylum/asylum.exe"
+	INSTALLRESOURCEPATH="c:/program files/asylum/data"
+	INSTALLHISCORES="c:/program files/asylum/hiscores"
+	OS_SOURCE=asylum_win.c
+	RM=del
+	EXE=.exe
+	LIBS=-lm -lmingw32 -lSDL_mixer -lSDLmain -lSDL -mwindows
+endif
+ifeq ($(HOST),generic)
+	INSTALLBIN=/usr/games/asylum
+	INSTALLRESOURCEPATH=/usr/share/games/asylum
+	INSTALLHISCORES=/var/games/asylum
+endif
+
+default: build
+
+ifneq ($(HOST),mingw)
+$(INSTALLBIN): asylum$(EXE) Makefile
+	cp asylum$(EXE) $(INSTALLBIN)
+	$(CHGRP) $(INSTALLGROUP) $(INSTALLBIN)
+	$(CHMOD) g+s $(INSTALLBIN)
+	$(CHMOD) a+x $(INSTALLBIN)
+
+install-resources: $(RESOURCES) Makefile
+	mkdir -p $(INSTALLRESOURCEPATH)
+	cp -r $(RESOURCES) $(INSTALLRESOURCEPATH)/
+	$(CHGRP) -R $(INSTALLGROUP) $(INSTALLRESOURCEPATH)/
+	$(CHMOD) -R a+rX $(INSTALLRESOURCEPATH)/
+
+install-hiscores: Makefile
+	mkdir -p $(INSTALLHISCORES)
+	touch $(INSTALLHISCORES)/EgoHighScores
+	touch $(INSTALLHISCORES)/PsycheHighScores
+	touch $(INSTALLHISCORES)/IdHighScores
+	touch $(INSTALLHISCORES)/ExtendedHighScores
+	$(CHGRP) -R $(INSTALLGROUP) $(INSTALLHISCORES)/*
+	$(CHMOD) -R 660 $(INSTALLHISCORES)/*
+
+install-binary: $(INSTALLBIN)
+
+install: install-resources install-hiscores install-binary
+
+uninstall:
+	rm -rf $(INSTALLBINARY) $(INSTALLRESOURCEPATH) $(INSTALLHISCORES)
+endif
+
+oggs:
+	bash -c 'pushd data; for i in */Music?; do pushd ..; ./asylum --dumpmusic $$i `if (echo \$$i|grep Resources.Music2>/dev/null); then echo -n --slower; fi`; \
+	popd;\
+	tail -c +33 $$i.au| \
+	oggenc - --raw --raw-endianness=1 --raw-rate=22050 --artist="Andy Southgate" \
+	--album="Background music for Asylum computer game" \
+	>$$i.ogg;\
+	rm $$i.au;\
+	done; popd'
+
+build: asylum$(EXE)
+
+asylum$(EXE): $(SRCS) $(OS_SOURCE) asylum.h Makefile
+	$(CC) $(COPTS) $(LDFLAGS) -o asylum$(EXE) $(SRCS) $(OS_SOURCE) $(LIBS)
+
+clean:
+	$(RM) asylum$(EXE)
+

README.md

@@ -0,0 +1,33 @@
+# SDL Asylum
+
+<i>Young Sigmund has a few problems. To help him resolve his mental instability you must enter the surreal world of his inner mind and shut down the malfunctioning brain cells which are causing him these problems.</i> — Instructions file from original game
+
+SDL Asylum is a C port of the computer game Asylum, which was written by Andy Southgate in 1994 for the Acorn Archimedes and is now public domain. It should be possible to run it on any platform which support SDL and OpenGL graphics. It's developed primarily on Linux but has also been built successfully on Cygwin, FreeBSD, Windows and Haiku.
+
+This fork contains bug fixes and Pandora specific functionality.
+
+
+##Instructions
+
+<i>Well, you don't really need any instructions to play the game. Just remember, the object is to find things that look like brain cells and shut them down! Good luck!</i> — Instructions file from original game
+
+The game revolves around shooting anything which moves, collecting anything which doesn't move, and, most importantly, finding your way to each of the eight pulsating neurons scattered through the immense map. Use ‘Z’, ‘X’, ‘;’ and ‘.’ to move and ‘Enter’ to fire, or remap the keys to something you like better.
+
+The one game feature which does merit explicit instruction is teleporting. In the first level (“Ego”) the teleporters look like candelabra. To use a teleporter, stand in its centre and press “down” (that's ‘.’ with the default key settings).
+
+
+##Credits
+
+SDL Asylum wouldn't have happened at all without Andy Southgate, who wrote the original game and later generously made it public domain. Nor without Jeffrey Lee and John Hoare, who got hold of Andy's original assembly source and hosted it on their marvellous Asylum tribute site at acornarcade.com.
+
+SDL Asylum wouldn't be as good without the ports, packages and patches provided by: Dmitry Marakasov, Ian Chapman, James Woodcock, Peter De Wachter.
+
+
+##Licensing
+
+SDL Asylum is distributed under GPL version 3.  The original game music and graphics are © Andy Southgate 1993, and have been placed in the public domain by Andy Southgate.
+
+
+##Original Web site
+
+http://sdl-asylum.sourceforge.net/

asylum.c

@@ -17,6 +17,9 @@
 
 #include <SDL/SDL.h>
 #include <SDL/SDL_mixer.h>
+#if defined(PANDORA)
+    #include <unistd.h>
+#endif
 
 #include "asylum_os.h"
 #include "asylum.h"
@@ -245,7 +248,11 @@ void bonus1()
 }
 
 const int keydefs[] =
+#if defined(PANDORA)
+{ -SDLK_LEFT, -SDLK_RIGHT, -SDLK_UP, -SDLK_DOWN, -SDLK_HOME };
+#else
 { -SDLK_z, -SDLK_x, -SDLK_SEMICOLON, -SDLK_PERIOD, -SDLK_RETURN };
+#endif
 
 void setdefaults()
 {
@@ -261,7 +268,11 @@ void setdefaults()
     options.firekey = keydefs[4];
     options.gearchange = (arm3 == 0) ? 0 : 1;
     options.explospeed = (arm3 == 0) ? 2 : 1;
+#if defined(PANDORA)
+    options.fullscreen = 1;
+#else
     options.fullscreen = 0;
+#endif
 #ifndef DISABLE_OPENGL
     options.opengl = 1;
     options.size = 1; // 640 x 512
@@ -707,7 +718,9 @@ void loadconfig()
             case 4: options.firekey = -temp; break;
             case 5: options.soundtype = temp; break;
                 //case 6: options.soundquality=temp; break;
+#if !defined(PANDORA)
             case 7: options.fullscreen = temp; break;
+#endif
 #ifndef DISABLE_OPENGL
             case 8: options.opengl = temp; break;
             case 9: options.size = temp; break;
@@ -740,7 +753,12 @@ void saveconfig()
             config_keywords[4], -options.firekey,
             config_keywords[5], options.soundtype,
             //config_keywords[6], options.soundquality,
-            config_keywords[7], options.fullscreen,
+            config_keywords[7],
+#if defined(PANDORA)
+            1,
+#else
+            options.fullscreen,
+#endif
             config_keywords[8],
 #ifndef DISABLE_OPENGL
             options.opengl,
@@ -767,6 +785,9 @@ void saveconfig()
 	                         options.initials[2],
             ((options.idpermit == 1) ? idpermitstring : ""));
     fclose(r0);
+#if defined(PANDORA)
+    sync();
+#endif
 }
 
 void loadgame()
@@ -822,6 +843,9 @@ void savegame()
         fwrite(neuronadr->contents, neuronadr->width, neuronadr->height, r0);
     }
     fclose(r0);
+#if defined(PANDORA)
+    sync();
+#endif
 }
 
 void permitid()
@@ -833,6 +857,9 @@ void permitid()
     {
         fprintf(r0, "%s", idpermitstring);
         fclose(r0);
+#if defined(PANDORA)
+        sync();
+#endif
     }
     options.idpermit = 1;
 }

file.c

@@ -46,11 +46,15 @@ FILE* find_game(int op)
 {
     char fullname[240] = "";
 
+#if defined(PANDORA)
+	strcpy(fullname, "..");
+#else
     char* home = getenv("HOME");
     if (home)
 	strcat(fullname, home);
     else
 	return NULL;
+#endif
     strcat(fullname, savegamename);
     switch (op)
     {
@@ -65,11 +69,15 @@ FILE* find_config(int op)
 {
     char fullname[240] = "";
 
+#if defined(PANDORA)
+	strcpy(fullname, "..");
+#else
     char* home = getenv("HOME");
     if (home)
 	strcat(fullname, home);
     else
 	strcat(fullname, resource_path);
+#endif
     strcat(fullname, configname);
     switch (op)
     {
@@ -326,6 +334,9 @@ int swi_osfile(int op, const char* name, char* start, char* end)
         f = fopen(name, "wb");
         for (char* i = start; i < end; i++) fputc(*i, f);
         fclose(f);
+#if defined(PANDORA)
+        sync();
+#endif
         return 0;
     case 5: // test file existence
         f = fopen(name, "rb");

keyboard.c

@@ -109,7 +109,13 @@ void update_keyboard()
             if (ke->keysym.unicode)
                 unibuf = ke->keysym.unicode;
             else
+            {
+#if defined(PANDORA)
+                if (keybuf > 32 && keybuf <= 127) unibuf = keybuf;
+                else
+#endif
                 unibuf = -1;
+            }
             break;
         case SDL_KEYUP:
             ke = (SDL_KeyboardEvent*)&e;
@@ -197,7 +203,7 @@ void keyread(key_state* ks)
  */
     }
    nojoystick:
-    if ((osbyte_81(options.leftkey) == 0xff) || !(r4&1)) 
+    if ((osbyte_81(options.leftkey) == 0xff) || !(r4&1))
       { if (++ks->leftpress == 0) ks->leftpress = 0xff;}
     else ks->leftpress = 0;
     if ((osbyte_81(options.rightkey) == 0xff) || !(r4&2))

menus.c

@@ -177,10 +177,20 @@ void choosecontrol()
     wipetexttab();
     showchatscreen();
     message(96, 48, 0, 0, "Controls");
+#if defined(PANDORA)
+    message(64, 96, 0, 0, "1. Set Keys");
+#else
     message(64, 96, 0, 0, "1. Keyboard");
     message(64, 128, 0, 0, "2. Joystick");
+#endif
     showtext();
-    switch (readopt(2))
+    switch (readopt(
+#if defined(PANDORA)
+        1
+#else
+        2
+#endif
+    ))
     {
     case-1: return;
     case  1: choosekeys(); return;
@@ -271,9 +281,15 @@ void tunegame()
         }
 }
 
+#if defined(PANDORA)
+char sound1[] = "-1. No Sound";
+char sound2[] = "-2. Sound";
+char sound3[] = "-3. Sound";
+#else
 char sound1[] = "-1. No Sound";
 char sound2[] = "-2. 4 Channels";
 char sound3[] = "-3. 4 Channels";
+#endif
 char sound4[] = "-4. 8 Channels";
 char sound5[] = "-5. Normal Quality";
 char sound6[] = "-6. High Quality";
@@ -292,16 +308,24 @@ void tunesound()
         message(32, 80, 0, 0, sound2);
         message(32, 100, 0, 0, sound3);
         message(80, 120, 0, 0, "and music");
+#if !defined(PANDORA)
         message(32, 140, 0, 0, sound4);
         message(32, 160, 0, 0, sound5);
         message(32, 180, 0, 0, sound6);
         message(32, 200, 0, 0, sound7);
+#endif
         message(96, 220, 0, 0, "ESC - Exit");
         swi_blitz_wait(0);
         swi_fastspr_clearwindow();
         showtext();
 
-        switch (readopt(7))
+        switch (readopt(
+#if defined(PANDORA)
+            3
+#else
+            7
+#endif
+        ))
         {
         case 1: options.soundtype = 0; break;
         case 2: options.soundtype = 1; break;
@@ -339,7 +363,9 @@ void tunevolume()
     message(48, 116, 0, 0, "2. Quieter effects");
     message(48, 136, 0, 0, "3. Louder music");
     message(48, 156, 0, 0, "4. Quieter music");
+#if !defined(PANDORA)
     message(48-14, 176, 0, 0, tunevol1);
+#endif
     message(96, 220, 0, 0, "ESC - Exit");
     do
     {
@@ -350,7 +376,13 @@ void tunevolume()
         swi_blitz_wait(0);
         swi_fastspr_clearwindow();
         showtext();
-        int r0 = readopt(5);
+        int r0 = readopt(
+#if defined(PANDORA)
+            4
+#else
+            5
+#endif
+        );
         if (r0 == -1) return;
 
         if (r0 == 1)

platform.h

@@ -1,3 +1,10 @@
+#if defined(PANDORA)
+    #define DISABLE_OPENGL
+    #undef RESOURCEPATH
+    #undef SCOREPATH
+    #undef HAVE_GET_EXE_PATH
+#endif
+
 #define DISPLAY_HWDOUBLEBUF 0
 
 #ifndef DISABLE_OPENGL