Attachment 226333 Details for Bug 257088 – nlarn-0.7.6 diff

[patch] nlarn-0.7.6 diff

nlarn-0.7.6.diff (text/plain), 18.69 KB, created by Alex on 2021-07-09 21:31:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex

Created: 2021-07-09 21:31:31 UTC

Size: 18.69 KB

patch

obsolete

>diff -ruN nlarn.orig/Makefile nlarn/Makefile
>--- nlarn.orig/Makefile	2021-07-09 11:56:31.851418000 -0400
>+++ nlarn/Makefile	2021-07-09 16:25:42.963990000 -0400
>@@ -2,8 +2,8 @@
> 
> PORTNAME=	nlarn
> DISTVERSIONPREFIX=	NLarn-
>-DISTVERSION=	0.7.3
>-PORTREVISION=	1
>+DISTVERSION=	0.7.6
>+PORTREVISION=	0
> CATEGORIES=	games
> 
> MAINTAINER=	egypcio@FreeBSD.org
>@@ -18,12 +18,12 @@
> 
> post-configure:
> 	${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \
>-		${WRKSRC}/src/game.c
>+		${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}/nlarn.ini-sample ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
> 
> .include <bsd.port.mk>
>diff -ruN nlarn.orig/distinfo nlarn/distinfo
>--- nlarn.orig/distinfo	2021-07-09 11:56:31.851602000 -0400
>+++ nlarn/distinfo	2021-07-09 12:15:55.452681000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1547652196
>-SHA256 (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = f604286374774d48cb96baa6fa09902e1d190e0f9ae47d80a7494a90a1eba7db
>-SIZE (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = 912955
>+TIMESTAMP = 1625847355
>+SHA256 (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 6c8e68b6bb098f7310251c65b6362726ba1d14cc7c3a62bbadd4678a5542cc49
>+SIZE (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 919158
>diff -ruN nlarn.orig/files/patch-Makefile nlarn/files/patch-Makefile
>--- nlarn.orig/files/patch-Makefile	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-Makefile	2021-07-09 15:21:01.907342000 -0400
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2020-05-23 06:13:27 UTC
>++++ Makefile
>+@@ -104,7 +104,7 @@ LDFLAGS += $(shell pkg-config --libs glib-2.0)
>+ 
>+ # Unless requested otherwise build with curses.
>+ ifneq ($(SDLPDCURSES),Y)
>+-	LDFLAGS += -lcurses -lpanel
>++	LDFLAGS += $(shell pkg-config --libs ncurses) -lpanel
>+ else
>+ 	PDCLIB   := PDCurses/sdl2/pdcurses.a
>+ 	CFLAGS   += $(shell pkg-config --cflags SDL2_ttf) -IPDCurses -DSDLPDCURSES
>diff -ruN nlarn.orig/files/patch-inc_extdefs.h nlarn/files/patch-inc_extdefs.h
>--- nlarn.orig/files/patch-inc_extdefs.h	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-inc_extdefs.h	2021-07-09 15:21:01.910252000 -0400
>@@ -0,0 +1,53 @@
>+--- 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
>diff -ruN nlarn.orig/files/patch-inc_nlarn.h nlarn/files/patch-inc_nlarn.h
>--- nlarn.orig/files/patch-inc_nlarn.h	2021-07-09 11:56:31.852584000 -0400
>+++ nlarn/files/patch-inc_nlarn.h	1969-12-31 19:00:00.000000000 -0500
>@@ -1,10 +0,0 @@
>---- inc/nlarn.h.orig	2018-09-08 19:56:33 UTC
>-+++ inc/nlarn.h
>-@@ -31,6 +31,6 @@
>- #endif
>- 
>- /* the entire game */
>--game *nlarn;
>-+extern game *nlarn;
>- 
>- #endif
>diff -ruN nlarn.orig/files/patch-inc_player.h nlarn/files/patch-inc_player.h
>--- nlarn.orig/files/patch-inc_player.h	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-inc_player.h	2021-07-09 15:21:01.912911000 -0400
>@@ -0,0 +1,12 @@
>+--- 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 */
>diff -ruN nlarn.orig/files/patch-inc_position.h nlarn/files/patch-inc_position.h
>--- nlarn.orig/files/patch-inc_position.h	2021-07-09 11:56:31.852402000 -0400
>+++ nlarn/files/patch-inc_position.h	2021-07-09 15:21:01.915888000 -0400
>@@ -1,11 +1,11 @@
>---- inc/position.h.orig	2018-09-08 19:56:33 UTC
>+--- inc/position.h.orig	2020-05-23 06:13:27 UTC
> +++ inc/position.h
>-@@ -52,7 +52,7 @@ typedef union _position
>+@@ -52,8 +52,6 @@ typedef union _position
>      guint32 val;
>  } position;
>  
> -const position pos_invalid;
>-+extern const position pos_invalid;
>- 
>+-
>  typedef struct _rectangle
>  {
>+     guint64 x1: 16;
>diff -ruN nlarn.orig/files/patch-src_amulets.c nlarn/files/patch-src_amulets.c
>--- nlarn.orig/files/patch-src_amulets.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_amulets.c	2021-07-09 15:21:01.918758000 -0400
>@@ -0,0 +1,11 @@
>+--- src/amulets.c.orig	2020-05-23 06:13:27 UTC
>++++ src/amulets.c
>+@@ -19,7 +19,7 @@
>+ #include <glib.h>
>+ #include "amulets.h"
>+ #include "items.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ 
>+ const amulet_data amulets[AM_MAX] =
>+ {
>diff -ruN nlarn.orig/files/patch-src_buildings.c nlarn/files/patch-src_buildings.c
>--- nlarn.orig/files/patch-src_buildings.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_buildings.c	2021-07-09 15:21:01.923065000 -0400
>@@ -0,0 +1,11 @@
>+--- src/buildings.c.orig	2020-05-23 06:13:27 UTC
>++++ src/buildings.c
>+@@ -25,7 +25,7 @@
>+ #include "game.h"
>+ #include "gems.h"
>+ #include "items.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "scrolls.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_config.c nlarn/files/patch-src_config.c
>--- nlarn.orig/files/patch-src_config.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_config.c	2021-07-09 15:21:01.927300000 -0400
>@@ -0,0 +1,11 @@
>+--- src/config.c.orig	2020-05-23 06:13:27 UTC
>++++ src/config.c
>+@@ -22,7 +22,7 @@
>+ 
>+ #include "config.h"
>+ #include "display.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "items.h"
>+ #include "player.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_container.c nlarn/files/patch-src_container.c
>--- nlarn.orig/files/patch-src_container.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_container.c	2021-07-09 15:21:01.931087000 -0400
>@@ -0,0 +1,11 @@
>+--- src/container.c.orig	2020-05-23 06:13:27 UTC
>++++ src/container.c
>+@@ -20,7 +20,7 @@
>+ 
>+ #include "container.h"
>+ #include "display.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "random.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_display.c nlarn/files/patch-src_display.c
>--- nlarn.orig/files/patch-src_display.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_display.c	2021-07-09 15:21:01.934202000 -0400
>@@ -0,0 +1,11 @@
>+--- src/display.c.orig	2020-05-23 06:13:27 UTC
>++++ src/display.c
>+@@ -24,7 +24,7 @@
>+ #include "display.h"
>+ #include "fov.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "spheres.h"
>+ 
>+ typedef struct _display_colset
>diff -ruN nlarn.orig/files/patch-src_effects.c nlarn/files/patch-src_effects.c
>--- nlarn.orig/files/patch-src_effects.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_effects.c	2021-07-09 15:21:01.936963000 -0400
>@@ -0,0 +1,11 @@
>+--- src/effects.c.orig	2020-05-23 06:13:27 UTC
>++++ src/effects.c
>+@@ -22,7 +22,7 @@
>+ #include "cJSON.h"
>+ #include "effects.h"
>+ #include "game.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "random.h"
>+ 
>+ static const effect_data effects[ET_MAX] =
>diff -ruN nlarn.orig/files/patch-src_fov.c nlarn/files/patch-src_fov.c
>--- nlarn.orig/files/patch-src_fov.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_fov.c	2021-07-09 15:21:01.948935000 -0400
>@@ -0,0 +1,11 @@
>+--- src/fov.c.orig	2020-05-23 06:13:27 UTC
>++++ src/fov.c
>+@@ -21,7 +21,7 @@
>+ #include "fov.h"
>+ #include "game.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "position.h"
>+ 
>+ static void fov_calculate_octant(fov *fv, map *m, position center,
>diff -ruN nlarn.orig/files/patch-src_game.c nlarn/files/patch-src_game.c
>--- nlarn.orig/files/patch-src_game.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_game.c	2021-07-09 15:21:01.953012000 -0400
>@@ -0,0 +1,19 @@
>+--- 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"
>diff -ruN nlarn.orig/files/patch-src_inventory.c nlarn/files/patch-src_inventory.c
>--- nlarn.orig/files/patch-src_inventory.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_inventory.c	2021-07-09 15:21:01.955774000 -0400
>@@ -0,0 +1,11 @@
>+--- src/inventory.c.orig	2020-05-23 06:13:27 UTC
>++++ src/inventory.c
>+@@ -22,7 +22,7 @@
>+ #include "game.h"
>+ #include "inventory.h"
>+ #include "items.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "potions.h"
>+ 
>+ /* functions */
>diff -ruN nlarn.orig/files/patch-src_items.c nlarn/files/patch-src_items.c
>--- nlarn.orig/files/patch-src_items.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_items.c	2021-07-09 15:21:01.958340000 -0400
>@@ -0,0 +1,11 @@
>+--- src/items.c.orig	2020-05-23 06:13:27 UTC
>++++ src/items.c
>+@@ -27,7 +27,7 @@
>+ #include "gems.h"
>+ #include "items.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "potions.h"
>+ #include "random.h"
>diff -ruN nlarn.orig/files/patch-src_map.c nlarn/files/patch-src_map.c
>--- nlarn.orig/files/patch-src_map.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_map.c	2021-07-09 15:21:01.960981000 -0400
>@@ -0,0 +1,11 @@
>+--- src/map.c.orig	2020-05-23 06:13:27 UTC
>++++ src/map.c
>+@@ -23,7 +23,7 @@
>+ #include "display.h"
>+ #include "items.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "random.h"
>+ #include "sobjects.h"
>+ #include "spheres.h"
>diff -ruN nlarn.orig/files/patch-src_monsters.c nlarn/files/patch-src_monsters.c
>--- nlarn.orig/files/patch-src_monsters.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_monsters.c	2021-07-09 15:21:01.963630000 -0400
>@@ -0,0 +1,11 @@
>+--- src/monsters.c.orig	2020-05-23 06:13:27 UTC
>++++ src/monsters.c
>+@@ -26,7 +26,7 @@
>+ #include "items.h"
>+ #include "map.h"
>+ #include "monsters.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "pathfinding.h"
>+ #include "random.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_nlarn.c nlarn/files/patch-src_nlarn.c
>--- nlarn.orig/files/patch-src_nlarn.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_nlarn.c	2021-07-09 15:21:01.966085000 -0400
>@@ -0,0 +1,10 @@
>+--- src/nlarn.c.orig	2020-05-23 06:13:27 UTC
>++++ src/nlarn.c
>+@@ -46,6 +46,7 @@
>+ #include "scoreboard.h"
>+ #include "sobjects.h"
>+ #include "traps.h"
>++#include "extdefs.h"
>+ 
>+ /* see https://stackoverflow.com/q/36764885/1519878 */
>+ #define _STR(x) #x
>diff -ruN nlarn.orig/files/patch-src_pathfinding.c nlarn/files/patch-src_pathfinding.c
>--- nlarn.orig/files/patch-src_pathfinding.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_pathfinding.c	2021-07-09 15:21:01.968847000 -0400
>@@ -0,0 +1,11 @@
>+--- src/pathfinding.c.orig	2020-05-23 06:13:27 UTC
>++++ src/pathfinding.c
>+@@ -16,7 +16,7 @@
>+  * with this program.  If not, see <http://www.gnu.org/licenses/>.
>+  */
>+ 
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "pathfinding.h"
>+ #include "player.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_player.c nlarn/files/patch-src_player.c
>--- nlarn.orig/files/patch-src_player.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_player.c	2021-07-09 15:21:01.971476000 -0400
>@@ -0,0 +1,18 @@
>+--- 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";
>diff -ruN nlarn.orig/files/patch-src_position.c nlarn/files/patch-src_position.c
>--- nlarn.orig/files/patch-src_position.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_position.c	2021-07-09 15:21:01.974002000 -0400
>@@ -0,0 +1,11 @@
>+--- src/position.c.orig	2020-05-23 06:13:27 UTC
>++++ src/position.c
>+@@ -22,7 +22,7 @@
>+ #include "cJSON.h"
>+ #include "display.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "position.h"
>+ 
>+ #define POS_MAX_XY (1<<10)
>diff -ruN nlarn.orig/files/patch-src_potions.c nlarn/files/patch-src_potions.c
>--- nlarn.orig/files/patch-src_potions.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_potions.c	2021-07-09 15:21:01.976663000 -0400
>@@ -0,0 +1,11 @@
>+--- src/potions.c.orig	2020-05-23 06:13:27 UTC
>++++ src/potions.c
>+@@ -20,7 +20,7 @@
>+ 
>+ #include "display.h"
>+ #include "game.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "potions.h"
>+ #include "random.h"
>diff -ruN nlarn.orig/files/patch-src_rings.c nlarn/files/patch-src_rings.c
>--- nlarn.orig/files/patch-src_rings.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_rings.c	2021-07-09 15:21:01.979262000 -0400
>@@ -0,0 +1,11 @@
>+--- src/rings.c.orig	2020-05-23 06:13:27 UTC
>++++ src/rings.c
>+@@ -18,7 +18,7 @@
>+ 
>+ #include <glib.h>
>+ 
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "rings.h"
>+ 
>+ const ring_data rings[RT_MAX] =
>diff -ruN nlarn.orig/files/patch-src_scoreboard.c nlarn/files/patch-src_scoreboard.c
>--- nlarn.orig/files/patch-src_scoreboard.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_scoreboard.c	2021-07-09 15:21:01.981764000 -0400
>@@ -0,0 +1,11 @@
>+--- src/scoreboard.c.orig	2020-05-23 06:13:27 UTC
>++++ src/scoreboard.c
>+@@ -25,7 +25,7 @@
>+ # include <sys/file.h>
>+ #endif
>+ 
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "scoreboard.h"
>+ #include "cJSON.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_scrolls.c nlarn/files/patch-src_scrolls.c
>--- nlarn.orig/files/patch-src_scrolls.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_scrolls.c	2021-07-09 15:21:01.984391000 -0400
>@@ -0,0 +1,11 @@
>+--- src/scrolls.c.orig	2020-05-23 06:13:27 UTC
>++++ src/scrolls.c
>+@@ -21,7 +21,7 @@
>+ 
>+ #include "display.h"
>+ #include "game.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "random.h"
>+ #include "scrolls.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_sobjects.c nlarn/files/patch-src_sobjects.c
>--- nlarn.orig/files/patch-src_sobjects.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_sobjects.c	2021-07-09 15:21:01.987060000 -0400
>@@ -0,0 +1,11 @@
>+--- src/sobjects.c.orig	2020-05-23 06:13:27 UTC
>++++ src/sobjects.c
>+@@ -21,7 +21,7 @@
>+ #include "display.h"
>+ #include "game.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "sobjects.h"
>+ #include "player.h"
>+ #include "random.h"
>diff -ruN nlarn.orig/files/patch-src_spells.c nlarn/files/patch-src_spells.c
>--- nlarn.orig/files/patch-src_spells.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_spells.c	2021-07-09 15:21:01.989680000 -0400
>@@ -0,0 +1,11 @@
>+--- src/spells.c.orig	2020-05-23 06:13:27 UTC
>++++ src/spells.c
>+@@ -21,7 +21,7 @@
>+ 
>+ #include "display.h"
>+ #include "map.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "random.h"
>+ #include "sobjects.h"
>+ #include "spells.h"
>diff -ruN nlarn.orig/files/patch-src_spheres.c nlarn/files/patch-src_spheres.c
>--- nlarn.orig/files/patch-src_spheres.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_spheres.c	2021-07-09 15:21:01.993063000 -0400
>@@ -0,0 +1,11 @@
>+--- src/spheres.c.orig	2020-05-23 06:13:27 UTC
>++++ src/spheres.c
>+@@ -19,7 +19,7 @@
>+ #include <glib.h>
>+ 
>+ #include "game.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "random.h"
>+ #include "spheres.h"
>+ 
>diff -ruN nlarn.orig/files/patch-src_traps.c nlarn/files/patch-src_traps.c
>--- nlarn.orig/files/patch-src_traps.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_traps.c	2021-07-09 15:21:01.996505000 -0400
>@@ -0,0 +1,11 @@
>+--- src/traps.c.orig	2020-05-23 06:13:27 UTC
>++++ src/traps.c
>+@@ -21,7 +21,7 @@
>+ #include "display.h"
>+ #include "effects.h"
>+ #include "game.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "random.h"
>+ #include "traps.h"
>diff -ruN nlarn.orig/files/patch-src_utils.c nlarn/files/patch-src_utils.c
>--- nlarn.orig/files/patch-src_utils.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_utils.c	2021-07-09 15:21:01.999353000 -0400
>@@ -0,0 +1,11 @@
>+--- src/utils.c.orig	2020-05-23 06:13:27 UTC
>++++ src/utils.c
>+@@ -21,7 +21,7 @@
>+ #include <stdio.h>
>+ #include <string.h>
>+ 
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "utils.h"
>+ 
>+ static const guint LOG_MAX_LENGTH = 100;
>diff -ruN nlarn.orig/files/patch-src_weapons.c nlarn/files/patch-src_weapons.c
>--- nlarn.orig/files/patch-src_weapons.c	1969-12-31 19:00:00.000000000 -0500
>+++ nlarn/files/patch-src_weapons.c	2021-07-09 15:21:02.001968000 -0400
>@@ -0,0 +1,11 @@
>+--- src/weapons.c.orig	2020-05-23 06:13:27 UTC
>++++ src/weapons.c
>+@@ -22,7 +22,7 @@
>+ #include "items.h"
>+ #include "map.h"
>+ #include "monsters.h"
>+-#include "nlarn.h"
>++#include "extdefs.h"
>+ #include "player.h"
>+ #include "random.h"
>+ #include "weapons.h"
>diff -ruN nlarn.orig/pkg-plist nlarn/pkg-plist
>--- nlarn.orig/pkg-plist	2021-07-09 11:56:31.851781000 -0400
>+++ nlarn/pkg-plist	2021-07-09 16:30:21.430729000 -0400
>@@ -4,8 +4,6 @@
> %%DATADIR%%/fortune
> %%DATADIR%%/maze
> %%DATADIR%%/maze_doc.txt
>-%%DATADIR%%/monsters.lua
> %%DATADIR%%/nlarn-128.bmp
> %%DATADIR%%/nlarn.hlp
>-%%DATADIR%%/nlarn.ini-sample
> %%DATADIR%%/nlarn.msg

Actions: View | Diff

Attachments on bug 257088: 226333