From 1f787c077bf7f4d60beec2bb2daaff29da7bf61c Mon Sep 17 00:00:00 2001 From: PatR <rankin@nethack.org> Date: Thu, 23 Jun 2016 06:19:45 -0700 Subject: [PATCH] tiles lint FDECL(foo, (boolean)) ought to have been using (BOOLEAN_P), but the tiles code isn't including the header which defines that, so change the argument to int. --- win/share/tile.h | 4 ++-- win/share/tiletext.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win/share/tile.h b/win/share/tile.h index db4f124f1..7c01fb067 100644 --- a/win/share/tile.h +++ b/win/share/tile.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 tile.h $NHDT-Date: 1432512803 2015/05/25 00:13:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */ +/* NetHack 3.6 tile.h $NHDT-Date: 1466687973 2016/06/23 13:19:33 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.12 $ */ typedef unsigned char pixval; typedef struct pixel_s { @@ -35,7 +35,7 @@ extern boolean FDECL(read_text_tile, (pixel(*) [TILE_X])); extern boolean FDECL(write_text_tile, (pixel(*) [TILE_X])); extern int NDECL(fclose_text_file); -extern void FDECL(set_grayscale, (boolean)); +extern void FDECL(set_grayscale, (int)); extern void NDECL(init_colormap); extern void NDECL(merge_colormap); diff --git a/win/share/tiletext.c b/win/share/tiletext.c index fb6adb118..8d913f897 100644 --- a/win/share/tiletext.c +++ b/win/share/tiletext.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 tiletext.c $NHDT-Date: 1454464783 2016/02/03 01:59:43 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.12 $ */ +/* NetHack 3.6 tiletext.c $NHDT-Date: 1466687974 2016/06/23 13:19:34 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.14 $ */ /* NetHack may be freely redistributed. See license for details. */ #include "config.h" @@ -37,7 +37,7 @@ static void FDECL(write_txttile, (FILE *, pixel (*)[TILE_X])); "%[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.] = " \ "(%d, %d, %d) " -static boolean grayscale = FALSE; +static int grayscale = 0; /* grayscale color mapping */ static const int graymappings[] = { /* . A B C D E F G H I J K L M N O P */ @@ -46,7 +46,7 @@ static const int graymappings[] = { void set_grayscale(g) -boolean g; +int g; { grayscale = g; } -- 2.40.0