Attachment #226333 for bug #257088

View | Details | Raw Unified | Return to bug 257088
Collapse All | Expand All





PORTNAME=	nlarn
DISTVERSIONPREFIX=	NLarn-
DISTVERSION=	0.7.6
PORTREVISION=	0
CATEGORIES=	games

MAINTAINER=	egypcio@FreeBSD.org


post-configure:
	${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \
		${WRKSRC}/src/nlarn.c

do-install:
	${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${STAGEDIR}${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)nlarn/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547652196	1	TIMESTAMP = 1625847355
2	SHA256 (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = f604286374774d48cb96baa6fa09902e1d190e0f9ae47d80a7494a90a1eba7db	2	SHA256 (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 6c8e68b6bb098f7310251c65b6362726ba1d14cc7c3a62bbadd4678a5542cc49
3	SIZE (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = 912955	3	SIZE (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 919158

Line 0 Link Here

(-)nlarn/files/patch-Makefile (+11 lines)
	1	--- Makefile.orig 2020-05-23 06:13:27 UTC
	2	+++ Makefile
	3	@@ -104,7 +104,7 @@ LDFLAGS += $(shell pkg-config --libs glib-2.0)
	4
	5	# Unless requested otherwise build with curses.
	6	ifneq ($(SDLPDCURSES),Y)
	7	- LDFLAGS += -lcurses -lpanel
	8	+ LDFLAGS += $(shell pkg-config --libs ncurses) -lpanel
	9	else
	10	PDCLIB := PDCurses/sdl2/pdcurses.a
	11	CFLAGS += $(shell pkg-config --cflags SDL2_ttf) -IPDCurses -DSDLPDCURSES




--- inc/extdefs.h.orig	2021-07-09 19:20:11 UTC
+++ inc/extdefs.h
@@ -0,0 +1,50 @@
+/*
+ * nlarn.h
+ * Copyright (C) 2009-2020 Joachim de Groot <jdegroot@web.de>
+ *
+ * NLarn is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NLarn is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EXTDEFS_H_
+#define __EXTDEFS_H_
+
+#include <setjmp.h>
+
+#include "game.h"
+#include "position.h"
+
+/* game version string */
+extern const char *nlarn_version;
+
+/* the entire game */
+extern game *nlarn;
+
+/* death jump buffer - used to return to the main loop when the player has died */
+extern jmp_buf nlarn_death_jump;
+
+/* file paths */
+extern const char *nlarn_libdir;
+extern const char *nlarn_mesgfile;
+extern const char *nlarn_helpfile;
+extern const char *nlarn_mazefile;
+extern const char *nlarn_fortunes;
+extern const char *nlarn_highscores;
+extern const char *nlarn_inifile;
+extern const char *nlarn_savefile;
+
+extern const position pos_invalid;
+
+/* textual representation of the player's gender */
+extern const char *player_sex_str[PS_MAX];
+#endif

Lines 1-10 Link Here

(-)nlarn/files/patch-inc_nlarn.h (-10 lines)
1	--- inc/nlarn.h.orig 2018-09-08 19:56:33 UTC
2	+++ inc/nlarn.h
3	@@ -31,6 +31,6 @@
4	#endif
5
6	/* the entire game */
7	-game *nlarn;
8	+extern game *nlarn;
9
10	#endif




--- inc/player.h.orig	2020-05-23 06:13:27 UTC
+++ inc/player.h
@@ -79,9 +79,6 @@ typedef enum _player_sex
     PS_MAX
 } player_sex;
 
-/* textual representation of the player's gender */
-const char *player_sex_str[PS_MAX];
-
 typedef struct _player_settings
 {
     gboolean auto_pickup[IT_MAX]; /* automatically pick up item of enabled types */




--- inc/position.h.orig	2020-05-23 06:13:27 UTC
+++ inc/position.h
@@ -52,8 +52,6 @@ typedef union _position
     guint32 val;
 } position;
 
-const position pos_invalid;
-
 
 typedef struct _rectangle
 {
     guint64 x1: 16;

Line 0 Link Here

(-)nlarn/files/patch-src_amulets.c (+11 lines)
	1	--- src/amulets.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/amulets.c
	3	@@ -19,7 +19,7 @@
	4	#include <glib.h>
	5	#include "amulets.h"
	6	#include "items.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9
	10	const amulet_data amulets[AM_MAX] =
	11	{

Line 0 Link Here

(-)nlarn/files/patch-src_buildings.c (+11 lines)
	1	--- src/buildings.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/buildings.c
	3	@@ -25,7 +25,7 @@
	4	#include "game.h"
	5	#include "gems.h"
	6	#include "items.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "scrolls.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_config.c (+11 lines)
	1	--- src/config.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/config.c
	3	@@ -22,7 +22,7 @@
	4
	5	#include "config.h"
	6	#include "display.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "items.h"
	10	#include "player.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_container.c (+11 lines)
	1	--- src/container.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/container.c
	3	@@ -20,7 +20,7 @@
	4
	5	#include "container.h"
	6	#include "display.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "random.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_display.c (+11 lines)
	1	--- src/display.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/display.c
	3	@@ -24,7 +24,7 @@
	4	#include "display.h"
	5	#include "fov.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "spheres.h"
	10
	11	typedef struct _display_colset

Line 0 Link Here

(-)nlarn/files/patch-src_effects.c (+11 lines)
	1	--- src/effects.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/effects.c
	3	@@ -22,7 +22,7 @@
	4	#include "cJSON.h"
	5	#include "effects.h"
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "random.h"
	10
	11	static const effect_data effects[ET_MAX] =

Line 0 Link Here

(-)nlarn/files/patch-src_fov.c (+11 lines)
	1	--- src/fov.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/fov.c
	3	@@ -21,7 +21,7 @@
	4	#include "fov.h"
	5	#include "game.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "position.h"
	10
	11	static void fov_calculate_octant(fov fv, map m, position center,




--- src/game.c.orig	2020-05-23 06:13:27 UTC
+++ src/game.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <glib/gstdio.h>
+#include <unistd.h>
 
 #if (defined __unix) || (defined __unix__) || (defined __APPLE__)
 # include <sys/file.h>
@@ -42,7 +43,7 @@
 #include "config.h"
 #include "display.h"
 #include "game.h"
-#include "nlarn.h"
+#include "extdefs.h"
 #include "player.h"
 #include "spheres.h"
 #include "random.h"

Line 0 Link Here

(-)nlarn/files/patch-src_inventory.c (+11 lines)
	1	--- src/inventory.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/inventory.c
	3	@@ -22,7 +22,7 @@
	4	#include "game.h"
	5	#include "inventory.h"
	6	#include "items.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "potions.h"
	10
	11	/* functions */

Line 0 Link Here

(-)nlarn/files/patch-src_items.c (+11 lines)
	1	--- src/items.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/items.c
	3	@@ -27,7 +27,7 @@
	4	#include "gems.h"
	5	#include "items.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "potions.h"
	11	#include "random.h"

Line 0 Link Here

(-)nlarn/files/patch-src_map.c (+11 lines)
	1	--- src/map.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/map.c
	3	@@ -23,7 +23,7 @@
	4	#include "display.h"
	5	#include "items.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "random.h"
	10	#include "sobjects.h"
	11	#include "spheres.h"

Line 0 Link Here

(-)nlarn/files/patch-src_monsters.c (+11 lines)
	1	--- src/monsters.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/monsters.c
	3	@@ -26,7 +26,7 @@
	4	#include "items.h"
	5	#include "map.h"
	6	#include "monsters.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "pathfinding.h"
	10	#include "random.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_nlarn.c (+10 lines)
	1	--- src/nlarn.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/nlarn.c
	3	@@ -46,6 +46,7 @@
	4	#include "scoreboard.h"
	5	#include "sobjects.h"
	6	#include "traps.h"
	7	+#include "extdefs.h"
	8
	9	/* see https://stackoverflow.com/q/36764885/1519878 */
	10	#define _STR(x) #x

Line 0 Link Here

(-)nlarn/files/patch-src_pathfinding.c (+11 lines)
	1	--- src/pathfinding.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/pathfinding.c
	3	@@ -16,7 +16,7 @@
	4	* with this program. If not, see <http://www.gnu.org/licenses/>.
	5	*/
	6
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "pathfinding.h"
	10	#include "player.h"
	11




--- src/player.c.orig	2020-05-23 06:13:27 UTC
+++ src/player.c
@@ -27,13 +27,13 @@
 #include "display.h"
 #include "fov.h"
 #include "game.h"
-#include "nlarn.h"
+#include "extdefs.h"
 #include "player.h"
 #include "random.h"
 #include "scoreboard.h"
 #include "sobjects.h"
 
-const char *player_sex_str[] = {"not defined", "male", "female"};
+const char *player_sex_str[PS_MAX] = {"not defined", "male", "female"};
 
 static const char aa1[] = "mighty evil master";
 static const char aa2[] = "apprentice demi-god";

Line 0 Link Here

(-)nlarn/files/patch-src_position.c (+11 lines)
	1	--- src/position.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/position.c
	3	@@ -22,7 +22,7 @@
	4	#include "cJSON.h"
	5	#include "display.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "position.h"
	10
	11	#define POS_MAX_XY (1<<10)

Line 0 Link Here

(-)nlarn/files/patch-src_potions.c (+11 lines)
	1	--- src/potions.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/potions.c
	3	@@ -20,7 +20,7 @@
	4
	5	#include "display.h"
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "potions.h"
	11	#include "random.h"

Line 0 Link Here

(-)nlarn/files/patch-src_rings.c (+11 lines)
	1	--- src/rings.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/rings.c
	3	@@ -18,7 +18,7 @@
	4
	5	#include <glib.h>
	6
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "rings.h"
	10
	11	const ring_data rings[RT_MAX] =

Line 0 Link Here

(-)nlarn/files/patch-src_scoreboard.c (+11 lines)
	1	--- src/scoreboard.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/scoreboard.c
	3	@@ -25,7 +25,7 @@
	4	# include <sys/file.h>
	5	#endif
	6
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "scoreboard.h"
	10	#include "cJSON.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_scrolls.c (+11 lines)
	1	--- src/scrolls.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/scrolls.c
	3	@@ -21,7 +21,7 @@
	4
	5	#include "display.h"
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "random.h"
	10	#include "scrolls.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_sobjects.c (+11 lines)
	1	--- src/sobjects.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/sobjects.c
	3	@@ -21,7 +21,7 @@
	4	#include "display.h"
	5	#include "game.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "sobjects.h"
	10	#include "player.h"
	11	#include "random.h"

Line 0 Link Here

(-)nlarn/files/patch-src_spells.c (+11 lines)
	1	--- src/spells.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/spells.c
	3	@@ -21,7 +21,7 @@
	4
	5	#include "display.h"
	6	#include "map.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "random.h"
	10	#include "sobjects.h"
	11	#include "spells.h"

Line 0 Link Here

(-)nlarn/files/patch-src_spheres.c (+11 lines)
	1	--- src/spheres.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/spheres.c
	3	@@ -19,7 +19,7 @@
	4	#include <glib.h>
	5
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "random.h"
	10	#include "spheres.h"
	11

Line 0 Link Here

(-)nlarn/files/patch-src_traps.c (+11 lines)
	1	--- src/traps.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/traps.c
	3	@@ -21,7 +21,7 @@
	4	#include "display.h"
	5	#include "effects.h"
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "random.h"
	11	#include "traps.h"

Line 0 Link Here

(-)nlarn/files/patch-src_utils.c (+11 lines)
	1	--- src/utils.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/utils.c
	3	@@ -21,7 +21,7 @@
	4	#include <stdio.h>
	5	#include <string.h>
	6
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "utils.h"
	10
	11	static const guint LOG_MAX_LENGTH = 100;

Line 0 Link Here

(-)nlarn/files/patch-src_weapons.c (+11 lines)
	1	--- src/weapons.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/weapons.c
	3	@@ -22,7 +22,7 @@
	4	#include "items.h"
	5	#include "map.h"
	6	#include "monsters.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "random.h"
	11	#include "weapons.h"

Lines 4-11 Link Here

(-)nlarn/pkg-plist (-2 lines)
4	%%DATADIR%%/fortune	4	%%DATADIR%%/fortune
5	%%DATADIR%%/maze	5	%%DATADIR%%/maze
6	%%DATADIR%%/maze_doc.txt	6	%%DATADIR%%/maze_doc.txt
7	%%DATADIR%%/monsters.lua
8	%%DATADIR%%/nlarn-128.bmp	7	%%DATADIR%%/nlarn-128.bmp
9	%%DATADIR%%/nlarn.hlp	8	%%DATADIR%%/nlarn.hlp
10	%%DATADIR%%/nlarn.ini-sample
11	%%DATADIR%%/nlarn.msg	9	%%DATADIR%%/nlarn.msg

Return to bug 257088

Lines 2-9 Link Here

(-)nlarn/Makefile (-4 / +4 lines)
2		2
3	PORTNAME= nlarn	3	PORTNAME= nlarn
4	DISTVERSIONPREFIX= NLarn-	4	DISTVERSIONPREFIX= NLarn-
5	DISTVERSION= 0.7.3	5	DISTVERSION= 0.7.6
6	PORTREVISION= 1	6	PORTREVISION= 0
7	CATEGORIES= games	7	CATEGORIES= games
8		8
9	MAINTAINER= egypcio@FreeBSD.org	9	MAINTAINER= egypcio@FreeBSD.org
Lines 18-29 Link Here
18		18
19	post-configure:	19	post-configure:
20	${REINPLACE_CMD} 's\|/usr/share/nlarn\|${DATADIR}\|' \	20	${REINPLACE_CMD} 's\|/usr/share/nlarn\|${DATADIR}\|' \
21	${WRKSRC}/src/game.c	21	${WRKSRC}/src/nlarn.c
22		22
23	do-install:	23	do-install:
24	${MKDIR} ${STAGEDIR}${DATADIR}	24	${MKDIR} ${STAGEDIR}${DATADIR}
25	${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${STAGEDIR}${PREFIX}/bin	25	${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${STAGEDIR}${PREFIX}/bin
26	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR}	26	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR}
27	${INSTALL_DATA} ${WRKSRC}/nlarn.ini-sample ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}	27	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
28		28
29	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Line 0 Link Here

(-)nlarn/files/patch-inc_extdefs.h (+53 lines)
	1	--- inc/extdefs.h.orig 2021-07-09 19:20:11 UTC
	2	+++ inc/extdefs.h
	3	@@ -0,0 +1,50 @@
	4	+/*
	5	+ * nlarn.h
	6	+ * Copyright (C) 2009-2020 Joachim de Groot <jdegroot@web.de>
	7	+ *
	8	+ * NLarn is free software: you can redistribute it and/or modify it
	9	+ * under the terms of the GNU General Public License as published by the
	10	+ * Free Software Foundation, either version 3 of the License, or
	11	+ * (at your option) any later version.
	12	+ *
	13	+ * NLarn is distributed in the hope that it will be useful, but
	14	+ * WITHOUT ANY WARRANTY; without even the implied warranty of
	15	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	16	+ * See the GNU General Public License for more details.
	17	+ *
	18	+ * You should have received a copy of the GNU General Public License along
	19	+ * with this program. If not, see <http://www.gnu.org/licenses/>.
	20	+ */
	21	+
	22	+#ifndef __EXTDEFS_H_
	23	+#define __EXTDEFS_H_
	24	+
	25	+#include <setjmp.h>
	26	+
	27	+#include "game.h"
	28	+#include "position.h"
	29	+
	30	+/* game version string */
	31	+extern const char *nlarn_version;
	32	+
	33	+/* the entire game */
	34	+extern game *nlarn;
	35	+
	36	+/* death jump buffer - used to return to the main loop when the player has died */
	37	+extern jmp_buf nlarn_death_jump;
	38	+
	39	+/* file paths */
	40	+extern const char *nlarn_libdir;
	41	+extern const char *nlarn_mesgfile;
	42	+extern const char *nlarn_helpfile;
	43	+extern const char *nlarn_mazefile;
	44	+extern const char *nlarn_fortunes;
	45	+extern const char *nlarn_highscores;
	46	+extern const char *nlarn_inifile;
	47	+extern const char *nlarn_savefile;
	48	+
	49	+extern const position pos_invalid;
	50	+
	51	+/* textual representation of the player's gender */
	52	+extern const char *player_sex_str[PS_MAX];
	53	+#endif

Line 0 Link Here

(-)nlarn/files/patch-inc_player.h (+12 lines)
	1	--- inc/player.h.orig 2020-05-23 06:13:27 UTC
	2	+++ inc/player.h
	3	@@ -79,9 +79,6 @@ typedef enum _player_sex
	4	PS_MAX
	5	} player_sex;
	6
	7	-/* textual representation of the player's gender */
	8	-const char *player_sex_str[PS_MAX];
	9	-
	10	typedef struct _player_settings
	11	{
	12	gboolean auto_pickup[IT_MAX]; /* automatically pick up item of enabled types */

Lines 1-11 Link Here

(-)nlarn/files/patch-inc_position.h (-4 / +4 lines)
1	--- inc/position.h.orig 2018-09-08 19:56:33 UTC	1	--- inc/position.h.orig 2020-05-23 06:13:27 UTC
2	+++ inc/position.h	2	+++ inc/position.h
3	@@ -52,7 +52,7 @@ typedef union _position	3	@@ -52,8 +52,6 @@ typedef union _position
4	guint32 val;	4	guint32 val;
5	} position;	5	} position;
6		6
7	-const position pos_invalid;	7	-const position pos_invalid;
8	+extern const position pos_invalid;	8	-
9
10	typedef struct _rectangle	9	typedef struct _rectangle
11	{	10	{
		11	guint64 x1: 16;

Line 0 Link Here

(-)nlarn/files/patch-src_game.c (+19 lines)
	1	--- src/game.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/game.c
	3	@@ -28,6 +28,7 @@
	4	#include <string.h>
	5	#include <zlib.h>
	6	#include <glib/gstdio.h>
	7	+#include <unistd.h>
	8
	9	#if (defined __unix) \|\| (defined __unix__) \|\| (defined __APPLE__)
	10	# include <sys/file.h>
	11	@@ -42,7 +43,7 @@
	12	#include "config.h"
	13	#include "display.h"
	14	#include "game.h"
	15	-#include "nlarn.h"
	16	+#include "extdefs.h"
	17	#include "player.h"
	18	#include "spheres.h"
	19	#include "random.h"

Line 0 Link Here

(-)nlarn/files/patch-src_player.c (+18 lines)
	1	--- src/player.c.orig 2020-05-23 06:13:27 UTC
	2	+++ src/player.c
	3	@@ -27,13 +27,13 @@
	4	#include "display.h"
	5	#include "fov.h"
	6	#include "game.h"
	7	-#include "nlarn.h"
	8	+#include "extdefs.h"
	9	#include "player.h"
	10	#include "random.h"
	11	#include "scoreboard.h"
	12	#include "sobjects.h"
	13
	14	-const char *player_sex_str[] = {"not defined", "male", "female"};
	15	+const char *player_sex_str[PS_MAX] = {"not defined", "male", "female"};
	16
	17	static const char aa1[] = "mighty evil master";
	18	static const char aa2[] = "apprentice demi-god";