nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into win32-x64-working

Browse Source
This commit is contained in:
nhmall
2015-04-19 17:18:43 -04:00
parent 0147b40ec7 0827c0df9d
commit 4f86d74592
5 changed files with 16078 additions and 16075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/share/monsters.txt
+6254 -6253
View File
File diff suppressed because it is too large Load Diff
win/share/objects.txt
+7030 -7029
View File
File diff suppressed because it is too large Load Diff
win/share/other.txt
+2790 -2789
View File
File diff suppressed because it is too large Load Diff
win/share/tile2bmp.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.5 tile2bmp.c $NHDT-Date: 1429464667 2015/04/19 17:31:07 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */ /* NetHack 3.5 tile2bmp.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* Copyright (c) NetHack PC Development Team 1995 */ /* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -317,8 +317,8 @@ BITMAPINFOHEADER *pbmih;
} }
static int graymappings[] = { static int graymappings[] = {
/*A B C D E F G H I J K L M N O P*/ /* . A B C D E F G H I J K L M N O P */
0, 16, 17, 18, 19, 12, 21, 22, 23, 24, 25, 14, 12, 13, 13, 13}; 0, 1,17,18,19,20,27,22,23,24,25,26,21,15,13,14,14};
static void static void
build_bmptile(pixels) build_bmptile(pixels)
win/share/tiletext.c
+1 -1
View File
@@ -33,7 +33,7 @@ static void FDECL(write_txttile, (FILE *, pixel(*)[TILE_X]));
/* Ugh. DICE doesn't like %[A-Z], so we have to spell it out... */ /* Ugh. DICE doesn't like %[A-Z], so we have to spell it out... */
#define FORMAT_STRING \ #define FORMAT_STRING \
"%[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789] = (%d, %d, %d) " "%[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\.] = (%d, %d, %d) "
static void static void
read_text_colormap(txtfile) read_text_colormap(txtfile)