Attachment 168167 Details for Bug 207988 – games_cataclysm-dda.diff

[patch] games_cataclysm-dda.diff

games_cataclysm-dda.diff (text/plain), 25.56 KB, created by tkato432 on 2016-03-14 18:32:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-03-14 18:32:42 UTC

Size: 25.56 KB

patch

obsolete

>diff -urN /usr/ports/games/cataclysm-dda/Makefile games/cataclysm-dda/Makefile
>--- /usr/ports/games/cataclysm-dda/Makefile	2016-02-06 06:15:32.321432000 +0900
>+++ games/cataclysm-dda/Makefile	2016-03-15 00:00:00.000000000 +0900
>@@ -2,12 +2,10 @@
> # $FreeBSD: head/games/cataclysm-dda/Makefile 408120 2016-02-05 00:04:44Z marino $
> 
> PORTNAME=	cataclysm-dda
>-PORTVERSION=	0.B
>+PORTVERSION=	0.C
> PORTEPOCH=	1
> CATEGORIES=	games
>-MASTER_SITES=	GH http://azmodean.polehammer.com/:sound
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+MASTER_SITES=	http://polehammer.com/azmodean/:soundset
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Fork/variant of Cataclysm Roguelike by Whales
>@@ -17,91 +15,99 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=		alias compiler:c++11-lib execinfo gmake shebangfix ncurses
>-SHEBANG_FILES=	lang/*.sh
>-bash_CMD=	/bin/sh
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	CleverRaven
> GH_PROJECT=	Cataclysm-DDA
>-MAKE_ARGS+=	PREFIX=${PREFIX} RELEASE=1 USE_HOME_DIR=1
>-CXXFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME} -L${LOCALBASE}/lib -lexecinfo
> 
>+USES=		compiler:c++11-lib alias compiler execinfo gmake shebangfix
>+SHEBANG_FILES=	lang/*.sh
>+bash_CMD=	${SH}
>+MAKE_ARGS=	CXX="${CXX}" LD="${CXX}" RELEASE=1
> 
>-MAKE_JOBS_UNSAFE=	yes
>+CPPFLAGS+=	${EXECINFO_CPPFLAGS}
>+LDFLAGS+=	${EXECINFO_LDFLAGS} -lexecinfo
> 
>-OPTIONS_DEFINE=	NLS DOCS LUA SOUND
>-OPTIONS_DEFAULT=NLS DOCS NCURSES
>-OPTIONS_SINGLE=	UI
>+OPTIONS_DEFINE=		DOCS LUA NLS SOUND
>+OPTIONS_SINGLE=		UI
> OPTIONS_SINGLE_UI=	NCURSES SDL
>+OPTIONS_DEFAULT=	NCURSES
>+OPTIONS_SUB=		yes
> 
>-UI_DESC=	User Interface
>-SOUND_DESC=	Sound support (SDL UI only)
>+LUA_USES=		lua pkgconfig
>+LUA_MAKE_ARGS=		LUA=1 LUA_BINARY="${LUA_CMD}"
>+NCURSES_USES=		ncurses
>+NLS_USES=		gettext
>+NLS_MAKE_ARGS_OFF=	LOCALIZE=0
>+NLS_CPPFLAGS=		-I${LOCALBASE}/include
>+NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
>+SDL_RUN_DEPENDS=	terminus-font>0:${PORTSDIR}/x11-fonts/terminus-font
>+SDL_USES=		pkgconfig
>+SDL_USE=		SDL=image2,ttf2
>+SDL_MAKE_ARGS=		TILES=1 TILESTARGET=cataclysm
>+SDL_CPPFLAGS=		$$(sdl2-config --cflags)
>+SDL_LDFLAGS=		$$(sdl2-config --libs)
>+SDL_DESKTOP_ENTRIES=	"Cataclysm-DDA" "" "" "cataclysm" "" ""
>+SOUND_DESC=		Sound support (SDL UI only)
>+SOUND_DISTFILES=	${SOUNDSET_FILES:S/$/:soundset/}
>+SOUND_EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+SOUND_USE=		SDL=mixer2
>+SOUND_MAKE_ARGS=	SOUND=1
>+SOUND_IMPLIES=		SDL
>+UI_DESC=		User inteface
> 
>-OPTIONS_SUB=	yes
>-REINPLACE_ARGS=	-i ''
>-
>-NCURSES_USES=	ncurses
>-SDL_USE=	SDL=sdl2,ttf2,image2
>-SDL_USES=	pkgconfig
>-SDL_MAKE_ARGS=	TILES=1 TILESTARGET=cataclysm
>-SDL_FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-fonts/terminus-font:patch
>-SDL_BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
>-NLS_USES=	gettext
>-NLS_LDFLAGS=	-lintl
>-NLS_MAKE_ARGS=	LOCALIZE=1
>-LUA_USES=	lua:51 pkgconfig
>-LUA_MAKE_ARGS=	LUA=1
>+SOUNDSET_FILES=	cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
>+.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
> CXXFLAGS+=	-Wno-inconsistent-missing-override
> .endif
> 
>-.if ${PORT_OPTIONS:MSOUND}
>-.if ${PORT_OPTIONS:MSDL}
>-MAKE_ARGS+=	SOUND=1
>-USE_SDL+=	mixer2
>-SOUND_FILES=	cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
>-DISTFILES+=	${SOUND_FILES:S|$|:sound|}
>-.else
>-IGNORE=		Sound is not supported with ncurses UI.
>-.endif
>+.if ${CHOSEN_COMPILER_TYPE} == gcc
>+CPPFLAGS+=	-DCATA_NO_CPP11_STRING_CONVERSIONS
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/^ *CXX *=/d ; /^ *LD *=/s/g++/$$(CXX)/ ; \
>-		/^ *CXXFLAGS *+*=/s/-O[s0-3]//; /^ *LOCALIZE *=/d ; \
>-		s/$-lncurses$$w*$/\1\2 -ltinfo\2/ ; \
>-		s/=$$(PREFIX)\//=$$(DESTDIR)$$(PREFIX)\// ; \
>-		/install/s/--mode=/-m / ; s/ -t$ $$(DATA_PREFIX)$/\1/ ; \
>-		/cp -R/s/--no-preserve=ownership// ; \
>-		/^ *LUA_BINARY *=/s/lua/${LUA_CMD}/' ${WRKSRC}/Makefile
>-.if ! ${PORT_OPTIONS:MNLS}
>-	@${REINPLACE_CMD} -e '/LOCALE_DIR/s/^/#/' ${WRKSRC}/Makefile
>-.endif
>-.if ${PORT_OPTIONS:MNCURSES} && ${NCURSESBASE} == /usr
>-	@${REINPLACE_CMD} -e 's/$$(shell ncursesw5-config --libs)/-lncursesw/ ; \
>-		/$$(shell ncursesw5-config --cflags)/d' ${WRKSRC}/Makefile
>-.endif
>-.if ${PORT_OPTIONS:MSDL}
>-	@${REINPLACE_CMD} -e '/"file":/s|gfx|${DATADIR}/&|' \
>-		${WRKSRC}/gfx/*/tile_config.json
>-	# replace bundled windows version of terminus font with X-compatible one
>-	@${CAT} `cd ${PORTSDIR}/x11-fonts/terminus-font; make -V WRKSRC`/ter-u14n.bdf \
>-		| bdftopcf | ${GZIP_CMD} > ${WRKSRC}/data/font/terminus.fon
>-.endif
>+	 @${REINPLACE_CMD} -e \
>+		'/CXXFLAGS/s|-O[0-3s]|| ; \
>+		 /LDFLAGS/s|-s$$|| ; \
>+		 s|$$(shell ncursesw5-config --cflags)|| ; \
>+		 s|$$(shell ncursesw5-config --libs)|-lncursesw -ltinfow| ; \
>+		 s|$$$(CXX)$ $$$(DEFINES)$|\1 $$(CPPFLAGS) \2| ; \
>+		 s|$[[:blank:]]$$$$(DATA_PREFIX)$|\1$$(DESTDIR)\2| ; \
>+		 s|$[[:blank:]]$$$$(BIN_PREFIX)$|\1$$(DESTDIR)\2| ; \
>+		 s|--mode=|-m | ; \
>+		 s|--no-preserve=ownership|| ; \
>+		 s|-t || ; \
>+		 s|$[[:blank:]]$$$$(LOCALE_DIR)$|\1$$(DESTDIR)\2| ; \
>+		 s|$=$$$$(LOCALE_DIR)$|\1$$(DESTDIR)\2|' \
>+		${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/local/share/fonts|${LOCALBASE}/share/fonts|' \
>+		${WRKSRC}/src/sdltiles.cpp
>+
>+post-patch-NLS-off:
>+	 @${REINPLACE_CMD} -e \
>+		'/LOCALE_DIR/s|^|#|' \
>+		${WRKSRC}/Makefile
> 
> post-install:
>-.if ${PORT_OPTIONS:MSOUND}
>-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} sound ${STAGEDIR}${DATADIR}
>-	cd ${DISTDIR} && \
>-		${INSTALL_DATA} ${SOUND_FILES} ${STAGEDIR}${DATADIR}/sound
>-.endif
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cataclysm
>+# replace bundled windows version of terminus font with X-compatible one
>+	${RM} ${STAGEDIR}${DATADIR}/font/terminus.fon
>+	${LN} -sf ${PREFIX}/share/fonts/terminus/ter-u14n.pcf.gz \
>+		${STAGEDIR}${DATADIR}/font/terminus.fon
>+
>+post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${FIND} ${WRKSRC} $ -name "*.md" -or -name "*.txt" $ \
>-		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/ \;
>+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
>+		${STAGEDIR}${DOCSDIR})
>+
>+post-install-SOUND-on:
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/sound
>+	cd ${WRKSRC}/data/sound && ${INSTALL_DATA} soundset.json \
>+		${STAGEDIR}${DATADIR}/sound
>+	cd ${DISTDIR} && ${INSTALL_DATA} ${SOUNDSET_FILES} \
>+		${STAGEDIR}${DATADIR}/sound
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/games/cataclysm-dda/distinfo games/cataclysm-dda/distinfo
>--- /usr/ports/games/cataclysm-dda/distinfo	2015-08-24 04:04:17.361179000 +0900
>+++ games/cataclysm-dda/distinfo	2016-03-15 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>-SHA256 (CleverRaven-Cataclysm-DDA-0.B_GH0.tar.gz) = fee109c68b6ee2aa988ec54b1fec20cd4b5baf202adef7001125f6a5de885757
>-SIZE (CleverRaven-Cataclysm-DDA-0.B_GH0.tar.gz) = 21837016
> SHA256 (cataclysmthemeREV6.ogg) = fa305afea557b27ed341f6a10dcfab5aa07ecdd92e42b4dddec61eccb3c1c77f
> SIZE (cataclysmthemeREV6.ogg) = 7964468
> SHA256 (Dark_Days_Ahead_demo_2.ogg) = 75fe6b792ab06b842add070989acb9fe62f0acc5c17f344d724d774a772a68d4
> SIZE (Dark_Days_Ahead_demo_2.ogg) = 9182431
>+SHA256 (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 69e947824626fffb505ca4ec44187ec94bba32c1e5957ba5c771b3445f958af6
>+SIZE (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 26887684
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-cata_tiles.cpp games/cataclysm-dda/files/patch-src-cata_tiles.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-cata_tiles.cpp	2015-08-24 04:04:17.408717000 +0900
>+++ games/cataclysm-dda/files/patch-src-cata_tiles.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>---- src/cata_tiles.cpp.orig	2014-11-17 06:09:38.000000000 +0300
>-+++ src/cata_tiles.cpp	2014-11-30 11:56:51.119502150 +0300
>-@@ -164,9 +164,6 @@ void cata_tiles::get_tile_information(st
>+--- src/cata_tiles.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/cata_tiles.cpp
>+@@ -167,9 +167,6 @@ void cata_tiles::get_tile_information(st
>  int cata_tiles::load_tileset(std::string path, int R, int G, int B)
>  {
>      std::string img_path = path;
>@@ -10,3 +10,12 @@
>      /** reinit tile_atlas */
>      SDL_Surface *tile_atlas = IMG_Load(img_path.c_str());
>  
>+@@ -285,7 +282,7 @@ void cata_tiles::load_tilejson_from_file
>+         JsonArray tiles_new = config.get_array("tiles-new");
>+         while (tiles_new.has_more()) {
>+             JsonObject tile_part_def = tiles_new.next_object();
>+-            const std::string tileset_image_path = tile_part_def.get_string("file");
>++            const std::string tileset_image_path = FILENAMES["datadir"] + "/" + tile_part_def.get_string("file");
>+             int R = -1;
>+             int G = -1;
>+             int B = -1;
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-game.cpp games/cataclysm-dda/files/patch-src-game.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-game.cpp	2015-08-24 04:04:17.414877000 +0900
>+++ games/cataclysm-dda/files/patch-src-game.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -1,33 +1,20 @@
>---- src/game.cpp.orig	2014-11-17 06:09:38.000000000 +0300
>-+++ src/game.cpp	2014-11-23 14:15:08.005205207 +0300
>-@@ -4535,15 +4535,17 @@ std::vector<std::string> game::list_acti
>- void game::write_memorial_file(std::string sLastWords)
>- {
>+--- src/game.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/game.cpp
>+@@ -9545,7 +9545,7 @@ int game::list_items(const int iLastStat
>+             if (ground_items.empty() && iLastState == 1) {
>+                 reset_item_list_state(w_items_border, iInfoHeight, bRadiusSort);
>+                 wrefresh(w_items_border);
>+-                mvwprintz(w_items, 10, 2, c_white, _("You dont see any items around you!"));
>++                mvwprintz(w_items, 10, 2, c_white, _("You don't see any items around you!"));
>+             } else {
>+                 werase(w_items);
>  
>-+    std::string memorialdir = FILENAMES["memorialdir"];
>-+
>-     //Open the file first
>--    DIR *dir = opendir("memorial");
>-+    DIR *dir = opendir(memorialdir.c_str());
>-     if (!dir) {
>- #if (defined _WIN32 || defined __WIN32__)
>--        mkdir("memorial");
>-+        mkdir(memorialdir.c_str());
>- #else
>--        mkdir("memorial", 0777);
>-+        mkdir(memorialdir.c_str(), 0777);
>- #endif
>--        dir = opendir("memorial");
>-+        dir = opendir(memorialdir.c_str());
>-         if (!dir) {
>-             dbg(D_ERROR) << "game:write_memorial_file: Unable to make memorial directory.";
>-             debugmsg("Could not make './memorial' directory");
>-@@ -4581,7 +4583,7 @@ void game::write_memorial_file(std::stri
>-     }
>- 
>-     //Omit the name if too many unusable characters stripped
>--    std::string memorial_file_path = string_format("memorial/%s%s.txt",
>-+    std::string memorial_file_path = string_format((memorialdir + "%s%s.txt").c_str(),
>-                                      player_name.str().length() <= (u.name.length() / 5) ? "" : player_name.str().c_str(),
>-                                      timestamp.c_str());
>+@@ -9808,7 +9808,7 @@ int game::list_monsters(const int iLastS
>  
>+             if (vMonsters.empty()) {
>+                 wrefresh(w_monsters_border);
>+-                mvwprintz(w_monsters, 10, 2, c_white, _("You dont see any monsters around you!"));
>++                mvwprintz(w_monsters, 10, 2, c_white, _("You don't see any monsters around you!"));
>+             } else {
>+                 if( static_cast<size_t>( iActive ) >= vMonsters.size() ) {
>+                     iActive = 0;
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-options.cpp games/cataclysm-dda/files/patch-src-options.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-options.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ games/cataclysm-dda/files/patch-src-options.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -0,0 +1,13 @@
>+--- src/options.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/options.cpp
>+@@ -513,8 +513,8 @@ void initOptions()
>+                                    false
>+                                   );
>+ 
>+-    OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to reenable safemode"),
>+-                                        _("Number of turns after safemode is reenabled if no hostiles are in safemodeproximity distance."),
>++    OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to re-enable safemode"),
>++                                        _("Number of turns after safemode is re-enabled if no hostiles are in safemodeproximity distance."),
>+                                         1, 100, 50
>+                                        );
>+ 
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-player.cpp games/cataclysm-dda/files/patch-src-player.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-player.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ games/cataclysm-dda/files/patch-src-player.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- src/player.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/player.cpp
>+@@ -9788,7 +9788,7 @@ void player::pick_style() // Style selec
>+ 
>+     uimenu kmenu;
>+     kmenu.text = _("Select a style (press ? for style info)");
>+-    std::auto_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
>++    std::unique_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
>+     kmenu.callback = ma_style_info.get();
>+     kmenu.addentry( 0, true, 'c', _("Cancel") );
>+     if (keep_hands_free) {
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-sdltiles.cpp games/cataclysm-dda/files/patch-src-sdltiles.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-sdltiles.cpp	2015-08-24 04:04:17.397423000 +0900
>+++ games/cataclysm-dda/files/patch-src-sdltiles.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -1,19 +1,11 @@
>---- src/sdltiles.cpp.orig	2014-11-17 06:09:38.000000000 +0300
>-+++ src/sdltiles.cpp	2014-11-30 13:31:51.462125514 +0300
>-@@ -1,4 +1,5 @@
>- #if (defined TILES)
>-+#include <sys/param.h>
>- #include "catacurse.h"
>- #include "options.h"
>- #include "output.h"
>-@@ -1213,8 +1214,8 @@ static void save_font_list()
>+--- src/sdltiles.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/sdltiles.cpp
>+@@ -1214,7 +1214,7 @@ static void save_font_list()
>      wordexp("~/Library/Fonts", &exp, 0);
>      font_folder_list(fout, exp.we_wordv[0]);
>      wordfree(&exp);*/
> -#elif (defined linux || defined __linux)
>--    font_folder_list(fout, "/usr/share/fonts");
> +#elif (defined linux || defined __linux || defined __FreeBSD__)
>-+    font_folder_list(fout, "/usr/local/lib/X11/fonts");
>+     font_folder_list(fout, "/usr/share/fonts");
>      font_folder_list(fout, "/usr/local/share/fonts");
>      wordexp_t exp;
>-     wordexp("~/.fonts", &exp, 0);
>diff -urN /usr/ports/games/cataclysm-dda/files/patch-src-translations.cpp games/cataclysm-dda/files/patch-src-translations.cpp
>--- /usr/ports/games/cataclysm-dda/files/patch-src-translations.cpp	2015-08-24 04:04:17.390969000 +0900
>+++ games/cataclysm-dda/files/patch-src-translations.cpp	2016-03-15 00:00:00.000000000 +0900
>@@ -1,13 +1,6 @@
>---- src/translations.cpp.orig	2014-11-17 06:09:38.000000000 +0300
>-+++ src/translations.cpp	2014-11-30 13:22:06.603147068 +0300
>-@@ -1,5 +1,6 @@
>- #include "translations.h"
>- 
>-+#include <sys/param.h>
>- #include <string>
>- #ifdef LOCALIZE
>- #undef __STRICT_ANSI__ // _putenv in minGW need that
>-@@ -72,7 +73,7 @@ void set_language(bool reload_options)
>+--- src/translations.cpp.orig	2015-03-09 05:25:34 UTC
>++++ src/translations.cpp
>+@@ -72,7 +72,7 @@ void set_language(bool reload_options)
>  
>      // Step 2. Bind to gettext domain.
>      const char *locale_dir;
>diff -urN /usr/ports/games/cataclysm-dda/pkg-plist games/cataclysm-dda/pkg-plist
>--- /usr/ports/games/cataclysm-dda/pkg-plist	2015-08-24 04:04:17.339009000 +0900
>+++ games/cataclysm-dda/pkg-plist	2016-03-15 00:00:00.000000000 +0900
>@@ -6,6 +6,8 @@
> %%DATADIR%%/credits/de.credits
> %%DATADIR%%/credits/en.credits
> %%DATADIR%%/credits/es_AR.credits
>+%%DATADIR%%/credits/es_ES.credits
>+%%DATADIR%%/credits/it_IT.credits
> %%DATADIR%%/credits/ru.credits
> %%DATADIR%%/font/fixedsys.ttf
> %%DATADIR%%/font/square.ttf
>@@ -14,6 +16,10 @@
> %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/blockheadtiles.png
> %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tile_config.json
> %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tileset.txt
>+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/fallback.png
>+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tile_config.json
>+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tiles.png
>+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tileset.txt
> %%SDL%%%%DATADIR%%/gfx/DeonTileset/deontiles.png
> %%SDL%%%%DATADIR%%/gfx/DeonTileset/tile_config.json
> %%SDL%%%%DATADIR%%/gfx/DeonTileset/tileset.txt
>@@ -51,7 +57,6 @@
> %%SDL%%%%DATADIR%%/gfx/tinytile.png
> %%DATADIR%%/json/LOADING_ORDER.md
> %%DATADIR%%/json/bionics.json
>-%%DATADIR%%/json/boxing.json
> %%DATADIR%%/json/bullet_pulling.json
> %%DATADIR%%/json/construction.json
> %%DATADIR%%/json/doll_speech.json
>@@ -61,6 +66,7 @@
> %%DATADIR%%/json/furniture.json
> %%DATADIR%%/json/furniture/ags_furniture.json
> %%DATADIR%%/json/hints.json
>+%%DATADIR%%/json/item_actions.json
> %%DATADIR%%/json/item_groups.json
> %%DATADIR%%/json/items/ags_items.json
> %%DATADIR%%/json/items/ammo.json
>@@ -69,9 +75,9 @@
> %%DATADIR%%/json/items/armor.json
> %%DATADIR%%/json/items/bionics.json
> %%DATADIR%%/json/items/books.json
>+%%DATADIR%%/json/items/chemicals_and_resources.json
> %%DATADIR%%/json/items/comestibles.json
> %%DATADIR%%/json/items/containers.json
>-%%DATADIR%%/json/items/gi.json
> %%DATADIR%%/json/items/handloaded_bullets.json
> %%DATADIR%%/json/items/martial_arts_manuals.json
> %%DATADIR%%/json/items/melee.json
>@@ -83,9 +89,10 @@
> %%DATADIR%%/json/items/var_vehicle_parts.json
> %%DATADIR%%/json/items/vehicle_parts.json
> %%DATADIR%%/json/lab_notes.json
>-%%DATADIR%%/json/main.lua
>+%%LUA%%%%DATADIR%%/json/main.lua
> %%DATADIR%%/json/map_extra_items.json
> %%DATADIR%%/json/mapgen/Prepper_house01.json
>+%%DATADIR%%/json/mapgen/abandoned01.json
> %%DATADIR%%/json/mapgen/ags_station.json
> %%DATADIR%%/json/mapgen/antique_store.json
> %%DATADIR%%/json/mapgen/arcade.json
>@@ -93,6 +100,7 @@
> %%DATADIR%%/json/mapgen/bandit_camp.json
> %%DATADIR%%/json/mapgen/bar.json
> %%DATADIR%%/json/mapgen/bowling_alley.json
>+%%DATADIR%%/json/mapgen/boxing.json
> %%DATADIR%%/json/mapgen/cabin03.json
> %%DATADIR%%/json/mapgen/coffee_shop.json
> %%DATADIR%%/json/mapgen/diner.json
>@@ -116,16 +124,26 @@
> %%DATADIR%%/json/mapgen/house09 .json
> %%DATADIR%%/json/mapgen/house10.json
> %%DATADIR%%/json/mapgen/house11.json
>+%%DATADIR%%/json/mapgen/house12.json
>+%%DATADIR%%/json/mapgen/house13.json
>+%%DATADIR%%/json/mapgen/house14.json
>+%%DATADIR%%/json/mapgen/house15.json
>+%%DATADIR%%/json/mapgen/house16.json
>+%%DATADIR%%/json/mapgen/house17.json
>+%%DATADIR%%/json/mapgen/house_dogs.json
> %%DATADIR%%/json/mapgen/house_duplex.json
> %%DATADIR%%/json/mapgen/house_garage.json
> %%DATADIR%%/json/mapgen/house_garage2.json
> %%DATADIR%%/json/mapgen/house_garage3.json
> %%DATADIR%%/json/mapgen/house_garage4.json
> %%DATADIR%%/json/mapgen/house_garage5.json
>+%%DATADIR%%/json/mapgen/house_garage_prepper.json
>+%%DATADIR%%/json/mapgen/house_gardener.json
> %%DATADIR%%/json/mapgen/house_library.json
> %%DATADIR%%/json/mapgen/house_modern_lx.json
> %%DATADIR%%/json/mapgen/house_patio.json
> %%DATADIR%%/json/mapgen/house_porch.json
>+%%DATADIR%%/json/mapgen/house_quiverfull.json
> %%DATADIR%%/json/mapgen/house_rv.json
> %%DATADIR%%/json/mapgen/house_tool_shed.json
> %%DATADIR%%/json/mapgen/jewel_store.json
>@@ -135,6 +153,7 @@
> %%DATADIR%%/json/mapgen/museum.json
> %%DATADIR%%/json/mapgen/necropolis.json
> %%DATADIR%%/json/mapgen/necropolisB1.json
>+%%DATADIR%%/json/mapgen/office_tower_2.json
> %%DATADIR%%/json/mapgen/pharmacy_1.json
> %%DATADIR%%/json/mapgen/pharmacy_1_open.json
> %%DATADIR%%/json/mapgen/pizza_parlor.json
>@@ -143,11 +162,13 @@
> %%DATADIR%%/json/mapgen/restaurant.json
> %%DATADIR%%/json/mapgen/restaurant2.json
> %%DATADIR%%/json/mapgen/restaurant_fast.json
>+%%DATADIR%%/json/mapgen/s_gas_rural.json
> %%DATADIR%%/json/mapgen/sai.json
> %%DATADIR%%/json/mapgen/warehouse.json
> %%DATADIR%%/json/martialarts.json
> %%DATADIR%%/json/materials.json
> %%DATADIR%%/json/monster_drops.json
>+%%DATADIR%%/json/monster_factions.json
> %%DATADIR%%/json/monstergroups.json
> %%DATADIR%%/json/monsters.json
> %%DATADIR%%/json/mutations.json
>@@ -168,7 +189,7 @@
> %%DATADIR%%/json/npcs/npc.json
> %%DATADIR%%/json/overmap_specials.json
> %%DATADIR%%/json/overmap_terrain.json
>-%%DATADIR%%/json/preload.lua
>+%%LUA%%%%DATADIR%%/json/preload.lua
> %%DATADIR%%/json/professions.json
> %%DATADIR%%/json/recipes/recipe_ammo.json
> %%DATADIR%%/json/recipes/recipe_armor.json
>@@ -197,7 +218,12 @@
> %%DATADIR%%/json/vehicles/vehicles.json
> %%LUA%%%%DATADIR%%/lua/autoexec.lua
> %%LUA%%%%DATADIR%%/lua/class_definitions.lua
>-%%DATADIR%%/mods/AutoGasStations/modinfo.json
>+%%DATADIR%%/mods/Animatronics/animatronics.json
>+%%DATADIR%%/mods/Animatronics/bankrupt_pizzeria.json
>+%%DATADIR%%/mods/Animatronics/dead_animatronics.json
>+%%DATADIR%%/mods/Animatronics/modinfo.json
>+%%DATADIR%%/mods/Animatronics/regional_map_settings.json
>+%%DATADIR%%/mods/Animatronics/speech.json
> %%DATADIR%%/mods/Boats/b_inflatable_boat_parts.json
> %%DATADIR%%/mods/Boats/b_item_groups.json
> %%DATADIR%%/mods/Boats/b_items.json
>@@ -227,18 +253,18 @@
> %%DATADIR%%/mods/Experimental_Z-Level/office_tower.json
> %%DATADIR%%/mods/Experimental_Z-Level/overmap_specials.json
> %%DATADIR%%/mods/Experimental_Z-Level/overmap_terrain.json
>-%%DATADIR%%/mods/Fast_Zombies/main.lua
>+%%LUA%%%%DATADIR%%/mods/Fast_Zombies/main.lua
> %%DATADIR%%/mods/Fast_Zombies/modinfo.json
>-%%DATADIR%%/mods/Medieval_pack/modinfo.json
> %%DATADIR%%/mods/Mundane_Zombies/modinfo.json
> %%DATADIR%%/mods/No_Energy_Weapons/modinfo.json
> %%DATADIR%%/mods/No_Flaming_Weapons/modinfo.json
>+%%DATADIR%%/mods/No_Joke_Monsters/modinfo.json
> %%DATADIR%%/mods/No_Medieval_Items/modinfo.json
> %%DATADIR%%/mods/No_Mutagen/modinfo.json
> %%DATADIR%%/mods/No_Old_guns/modinfo.json
> %%DATADIR%%/mods/No_Powered_Armor/modinfo.json
> %%DATADIR%%/mods/No_Religious_Books/modinfo.json
>-%%DATADIR%%/mods/No_Reviving/main.lua
>+%%LUA%%%%DATADIR%%/mods/No_Reviving/main.lua
> %%DATADIR%%/mods/No_Reviving/modinfo.json
> %%DATADIR%%/mods/No_Rivtech_Guns/modinfo.json
> %%DATADIR%%/mods/No_Survivor_Armor/modinfo.json
>@@ -246,14 +272,25 @@
> %%DATADIR%%/mods/Only_Wildlife/modinfo.json
> %%DATADIR%%/mods/RL_Classes/classes.json
> %%DATADIR%%/mods/RL_Classes/modinfo.json
>-%%DATADIR%%/mods/Remote_Control/modinfo.json
>-%%DATADIR%%/mods/Slow_Zombies/main.lua
>+%%LUA%%%%DATADIR%%/mods/Slow_Zombies/main.lua
> %%DATADIR%%/mods/Slow_Zombies/modinfo.json
>+%%LUA%%%%DATADIR%%/mods/Zombie_Nightvision/main.lua
>+%%DATADIR%%/mods/Zombie_Nightvision/modinfo.json
>+%%DATADIR%%/mods/blazemod/blaze_ammo.json
>+%%DATADIR%%/mods/blazemod/blaze_ammo_t.json
>+%%DATADIR%%/mods/blazemod/blaze_other.json
>+%%DATADIR%%/mods/blazemod/blaze_parts.json
>+%%DATADIR%%/mods/blazemod/blaze_recipes.json
>+%%DATADIR%%/mods/blazemod/blaze_weapons.json
>+%%DATADIR%%/mods/blazemod/modinfo.json
> %%DATADIR%%/mods/dev-default-mods.json
>-%%DATADIR%%/mods/old_guns/modinfo.json
>+%%DATADIR%%/mods/necromancy/modinfo.json
>+%%DATADIR%%/mods/necromancy/necronimicron.json
>+%%DATADIR%%/mods/obsolete-mods.json
> %%DATADIR%%/motd/de.motd
> %%DATADIR%%/motd/en.motd
> %%DATADIR%%/motd/es_AR.motd
>+%%DATADIR%%/motd/it_IT.motd
> %%DATADIR%%/motd/ru.motd
> %%DATADIR%%/names/en.json
> %%DATADIR%%/names/fr.json
>@@ -270,13 +307,12 @@
> %%SOUND%%%%DATADIR%%/sound/Dark_Days_Ahead_demo_2.ogg
> %%SOUND%%%%DATADIR%%/sound/cataclysmthemeREV6.ogg
> %%SOUND%%%%DATADIR%%/sound/soundset.json
>-%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
>+%%DATADIR%%/title/en.title
>+%%DATADIR%%/title/ru.title
> %%PORTDOCS%%%%DOCSDIR%%/CODE_STYLE.txt
> %%PORTDOCS%%%%DOCSDIR%%/COMPILER_SUPPORT.md
>-%%PORTDOCS%%%%DOCSDIR%%/COMPILING.md
>-%%PORTDOCS%%%%DOCSDIR%%/COMPILING_osx.md
>-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
> %%PORTDOCS%%%%DOCSDIR%%/DEVELOPER_FAQ.md
>+%%PORTDOCS%%%%DOCSDIR%%/EFFECTS_JSON.md
> %%PORTDOCS%%%%DOCSDIR%%/ENUMS.md
> %%PORTDOCS%%%%DOCSDIR%%/GAMEMODES.md
> %%PORTDOCS%%%%DOCSDIR%%/GAME_BALANCE.txt
>@@ -284,32 +320,32 @@
> %%PORTDOCS%%%%DOCSDIR%%/JSON_FLAGS.md
> %%PORTDOCS%%%%DOCSDIR%%/JSON_INFO.md
> %%PORTDOCS%%%%DOCSDIR%%/JSON_LOADING_ORDER.md
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
>-%%PORTDOCS%%%%DOCSDIR%%/LOADING_ORDER.md
> %%PORTDOCS%%%%DOCSDIR%%/LUA_SUPPORT.md
> %%PORTDOCS%%%%DOCSDIR%%/MAPGEN.md
> %%PORTDOCS%%%%DOCSDIR%%/MODDING.txt
> %%PORTDOCS%%%%DOCSDIR%%/OLD_TODO.txt
> %%PORTDOCS%%%%DOCSDIR%%/PLAYER_ACTIVITY.md
>-%%PORTDOCS%%%%DOCSDIR%%/README.md
>-%%PORTDOCS%%%%DOCSDIR%%/README.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README_all_translators.txt
>+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_CHECKLIST
> %%PORTDOCS%%%%DOCSDIR%%/TESTING.txt
> %%PORTDOCS%%%%DOCSDIR%%/TRANSLATING.md
>-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
>-%%PORTDOCS%%%%DOCSDIR%%/de.txt
>-%%PORTDOCS%%%%DOCSDIR%%/doxygen_conf.txt
>-%%PORTDOCS%%%%DOCSDIR%%/freenode.txt
>-%%PORTDOCS%%%%DOCSDIR%%/office_ascii_map.txt
>-%%PORTDOCS%%%%DOCSDIR%%/sokoban.txt
>-%%PORTDOCS%%%%DOCSDIR%%/tileset.txt
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/drinkable_milk/main.lua
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/drinkable_milk/modinfo.json
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/data.json
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/main.lua
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/modinfo.json
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/modinfo.json
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/preload.lua
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/tools.json
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/no_jam_spawn/main.lua
>+%%PORTDOCS%%%%DOCSDIR%%/sample_mods/no_jam_spawn/modinfo.json
> %%NLS%%share/locale/cs/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/de/LC_MESSAGES/cataclysm-dda.mo
>+%%NLS%%share/locale/el/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/fi/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/cataclysm-dda.mo
>+%%NLS%%share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/ko/LC_MESSAGES/cataclysm-dda.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/cataclysm-dda.mo

Actions: View | Diff

Attachments on bug 207988: 168167