ncurses 6.0 - patch 20151226

[ncurses.git] / test / hanoi.c

diff --git a/test/hanoi.c b/test/hanoi.c
index 4e4e7051148a1947390c7e3413af080d71a6caff..7447ae2cca875522b5d91bfa2324c0ad46e01e01 100644 (file)
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -41,7 +41,7 @@
  *
  *     Date: 05.Nov.90
  *
  *
  *     Date: 05.Nov.90
  *

- * $Id: hanoi.c,v 1.34 2012/12/08 16:41:56 tom Exp $
+ * $Id: hanoi.c,v 1.36 2014/08/02 17:24:07 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -231,7 +231,7 @@ DisplayTiles(void)
     erase();
     MvAddStr(1, 24, "T O W E R S   O F   H A N O I");
     MvAddStr(3, 34, "SJR 1990");
     erase();
     MvAddStr(1, 24, "T O W E R S   O F   H A N O I");
     MvAddStr(3, 34, "SJR 1990");

-    MvPrintw(19, 5, "Moves : %d of %.0f", NMoves, pow(2.0, NTiles) - 1);
+    MvPrintw(19, 5, "Moves : %d of %.0f", NMoves, pow(2.0, (float) NTiles) - 1);

     (void) attrset(A_REVERSE);
     MvAddStr(BASELINE, 8,
             "                                                               ");
     (void) attrset(A_REVERSE);
     MvAddStr(BASELINE, 8,
             "                                                               ");


@@ -254,7 +254,7 @@ DisplayTiles(void)
                memset(TileBuf, ' ', len);
                TileBuf[len] = '\0';
                if (has_colors())
                memset(TileBuf, ' ', len);
                TileBuf[len] = '\0';
                if (has_colors())

-                   (void) attrset((attr_t) COLOR_PAIR(LENTOIND(len)));
+                   (void) attrset(AttrArg(COLOR_PAIR(LENTOIND(len)), 0));

                else
                    (void) attrset(A_REVERSE);
                MvAddStr(BASELINE - (SlotNo + 1),
                else
                    (void) attrset(A_REVERSE);
                MvAddStr(BASELINE - (SlotNo + 1),