dmagnetic: look for wonder* instead of wonderland*

The files as downloaded are named wonder.* and not wonderland.*, this
prevents users from having to rename the files for dmagnetic to find
them when started as `dMagnetic game-name`.
This commit is contained in:
Henrik Grimler 2021-07-11 19:27:23 +02:00
parent c633044cc8
commit 282546ca50
3 changed files with 60 additions and 1 deletions

View File

@ -0,0 +1,31 @@
--- ./src/toplevel/dMagnetic_helpscreens.c.orig 2021-07-10 21:06:45.831605096 +0000
+++ ./src/toplevel/dMagnetic_helpscreens.c 2021-07-10 21:07:00.738274747 +0000
@@ -86,7 +86,7 @@
{"corruption", "Corruption", 3,1,"MSC/C" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM|PLATFORM_ARCHIMEDES |PLATFORM_TWORSC|PLATFORM_APPLEII},
{"fish", "Fish!", 2,1,"MSC/F" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM|PLATFORM_ARCHIMEDES |PLATFORM_TWORSC},
{"myth", "Myth", 1,0,"" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM },
- {"wonderland", "Wonderland", 1,1,"wonderland/" ,PLATFORM_MAG|PLATFORM_GFX |PLATFORM_TWORSC},
+ {"wonder", "Wonderland", 1,1,"wonderland/" ,PLATFORM_MAG|PLATFORM_GFX |PLATFORM_TWORSC},
};
void dMagnetic_helpscreens_header()
--- ./src/loader/maggfxloader.c.orig 2021-07-11 13:13:06.320617293 +0000
+++ ./src/loader/maggfxloader.c 2021-07-11 13:14:01.630819789 +0000
@@ -80,7 +80,7 @@
|| (retrievefromcommandline(argc,argv,"corruption",NULL,0))
|| (retrievefromcommandline(argc,argv,"fish",NULL,0))
|| (retrievefromcommandline(argc,argv,"myth",NULL,0))
- || (retrievefromcommandline(argc,argv,"wonderland",NULL,0)))
+ || (retrievefromcommandline(argc,argv,"wonder",NULL,0)))
{
gamenamegiven=1;
}
@@ -92,7 +92,7 @@
}
{
int i;
- char* gameprefix[]={"pawn","guild","jinxter","corruption","fish","myth","wonderland"};
+ char* gameprefix[]={"pawn","guild","jinxter","corruption","fish","myth","wonder"};
char magname[32];
char gfxname[32];
char tworscname[32];

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interpreter for classic text adventure games and interac
TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.31
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://www.dettus.net/dMagnetic/dMagnetic_${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=1a0356f04d3a5e252225b0fd38b9047957f292f67338ba83579958b46f184139
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -0,0 +1,28 @@
--- ./src/toplevel/dMagnetic_helpscreens.c.orig 2021-06-23 20:13:37.000000000 +0000
+++ ./src/toplevel/dMagnetic_helpscreens.c 2021-07-10 20:17:40.252485255 +0000
@@ -68,10 +68,10 @@
} tGameInfo;
const tPlatformInfo cdMagnetic_platformInfo[NUMPLATFORMS]={
- {"mag", "/usr/local/share/games/magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"},
- {"gfx", "/usr/local/share/games/magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"},
+ {"mag", "@TERMUX_PREFIX@/share/games/magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"},
+ {"gfx", "@TERMUX_PREFIX@/share/games/magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"},
{"msdos", "/MSDOS/C/", "" ,1,0,1,0, PLATFORM_MSDOS, "-msdosdir DIRECTORY/"},
- {"tworsc", "/usr/local/share/games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"},
+ {"tworsc", "@TERMUX_PREFIX@/share/games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"},
{"d64", "/8/", ".D64" ,1,0,2,0, PLATFORM_D64, "-d64 IMAGE1.d64,IMAGE2.d64"},
{"amstradcpc", "/dsk/amstradcpc/", ".DSK" ,1,0,2,0, PLATFORM_AMSTRADCPC, "-amstradcpc IMAGE1.DSK,IMAGE2.DSK"},
{"spectrum", "/dsk/spectrum/", ".DSK" ,0,0,1,0, PLATFORM_SPECTRUM, "-spectrum IMAGE.DSK"},
@@ -282,8 +282,9 @@
fprintf(stderr,"%s %s\n",argv0,cdMagnetic_platformInfo[i].cmdline);
}
fprintf(stderr,"\n");
- fprintf(stderr,"You can get the .mag and .gfx files from\n");
- fprintf(stderr," https://msmemorial.if-legends.org/\n");
+ fprintf(stderr,"You can download the .mag and .gfx files using the\n");
+ fprintf(stderr,"'magnetic-scrolls'-script, or manually by visiting\n");
+ fprintf(stderr,"https://msmemorial.if-legends.org/\n");
fprintf(stderr,"\n");
fprintf(stderr,"To get a more detailed help, please run\n");
fprintf(stderr," %s --help\n",argv0);