fix a segfault, several misspellings, and a clang error...

This commit is contained in:
espie 2017-04-27 20:04:31 +00:00
parent 4026771db4
commit 6c51bb682e
7 changed files with 74 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.32 2015/06/05 08:11:53 bentley Exp $
# $OpenBSD: Makefile,v 1.33 2017/04/27 20:04:31 espie Exp $
COMMENT= block action game
DISTNAME= xdeblock
PKGNAME= xdeblock-1.0
REVISION = 1
REVISION = 2
CATEGORIES= games
MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1 2002/02/20 22:50:51 pvalchev Exp $
--- Imakefile.orig Fri Nov 15 21:06:36 1996
+++ Imakefile Wed Feb 20 15:44:17 2002
@@ -10,7 +10,7 @@ XCOMM ==================================
$OpenBSD: patch-Imakefile,v 1.2 2017/04/27 20:04:31 espie Exp $
--- Imakefile.orig Sat Nov 16 05:06:36 1996
+++ Imakefile Thu Apr 27 21:45:21 2017
@@ -10,7 +10,7 @@ XCOMM ================================================
XCOMM Set xdeblock working directory.
XCOMM =====================================================================

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-dialog_c,v 1.1 2017/04/27 20:04:31 espie Exp $
--- dialog.c.orig Thu Apr 27 21:55:19 2017
+++ dialog.c Thu Apr 27 21:55:24 2017
@@ -177,7 +177,7 @@ void draw_inputname(win,name,num)
"Input your name...",white.pixel);
drawMiniText(display,win,20,120,
- "Press RTURN or Mouse to end.",white.pixel);
+ "Press RETURN or Mouse to end.",white.pixel);
XSetForeground(display,gc,WhitePixel(display,DefaultScreen(display)));
XDrawRectangle(display,win,gc,16,66,dInputWidth-24,34);

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-file_c,v 1.1 2017/04/27 20:04:31 espie Exp $
--- file.c.orig Thu Apr 27 22:03:41 2017
+++ file.c Thu Apr 27 22:03:49 2017
@@ -39,6 +39,7 @@ void fileUpData(void)
{
fprintf(stderr,"XDeBlock:cannot updata mapf = %s\n",
nowDataRec.nowMap.filename);
+ return;
}
for(i = 0; i < 10; i++)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gamemain_c,v 1.1 2003/12/31 04:15:52 espie Exp $
--- gamemain.c.orig 2003-12-31 05:10:44.000000000 +0100
+++ gamemain.c 2003-12-31 05:11:14.000000000 +0100
$OpenBSD: patch-gamemain_c,v 1.2 2017/04/27 20:04:31 espie Exp $
--- gamemain.c.orig Sat Nov 16 06:37:16 1996
+++ gamemain.c Thu Apr 27 21:57:05 2017
@@ -793,7 +793,7 @@ void stageScoreCheck(void)
void openingString(void)
{
@ -10,3 +10,12 @@ $OpenBSD: patch-gamemain_c,v 1.1 2003/12/31 04:15:52 espie Exp $
struct timeval time;
char text[32];
@@ -804,7 +804,7 @@ void openingString(void)
{
/** not yet clear map **/
drawShadowText(display,mWin,120,300,
- "You have not clear this map...",white.pixel);
+ "You have not cleared this map...",white.pixel);
}
else
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-main_c,v 1.1 2002/02/20 22:50:51 pvalchev Exp $
--- main.c.orig Fri Nov 15 22:37:16 1996
+++ main.c Wed Feb 20 15:44:17 2002
$OpenBSD: patch-main_c,v 1.2 2017/04/27 20:04:31 espie Exp $
--- main.c.orig Sat Nov 16 06:37:16 1996
+++ main.c Thu Apr 27 21:59:08 2017
@@ -66,7 +66,7 @@ int checkOption(argc,argv)
/*** set s_map ***/
gameMainFlg.s_map = False;
@ -10,3 +10,21 @@ $OpenBSD: patch-main_c,v 1.1 2002/02/20 22:50:51 pvalchev Exp $
for(i =1; i < argc; i++)
{
@@ -584,7 +584,7 @@ int checkTitleButton(num)
break;
case 1: /**** game continue ****/
if(nowDataRec.nowMap.continueCount < 0)
- return;
+ return (False);
gameMainFlg.demoFlg = False;
gameMainFlg.useContinue = True;
nowDataRec.nowMap.continueCount --;
@@ -743,7 +743,7 @@ void titleText(void)
nowDataRec.nowMap.filename,red.pixel);
else
drawShadowText(display,mWin,310,420,
- "non select",red.pixel);
+ "none selected",red.pixel);
}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mapf_standard_mapf_txt,v 1.1 2017/04/27 20:04:31 espie Exp $
--- mapf/standard.mapf.txt.orig Thu Apr 27 21:54:14 2017
+++ mapf/standard.mapf.txt Thu Apr 27 21:54:19 2017
@@ -11,7 +11,7 @@
{/oku!/} {/all clear :-)/}
128 11 2 9 1 250
3 0 0 1000 1001 65 65 303 0
-{/pochi/} {/Wellcome XDeBlock!/}
+{/pochi/} {/Welcome XDeBlock!/}
600 48 1 1 0
552 48 1 1 0
504 48 1 1 0