/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2010 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 *
*
* Date: 05.Nov.90
*
- * $Id: hanoi.c,v 1.27 2008/08/04 10:57:59 tom Exp $
+ * $Id: hanoi.c,v 1.31 2010/11/14 01:01:07 tom Exp $
*/
#include <test.priv.h>
static struct Peg Pegs[NPEGS];
static int PegPos[] =
-{LEFTPEG, MIDPEG, RIGHTPEG};
-static int TileColour[] =
+{
+ LEFTPEG,
+ MIDPEG,
+ RIGHTPEG
+};
+static short TileColour[] =
{
COLOR_GREEN, /* Length 3 */
COLOR_MAGENTA, /* Length 5 */
initscr();
if (has_colors()) {
int i;
- int bg = COLOR_BLACK;
+ short bg = COLOR_BLACK;
start_color();
#if HAVE_USE_DEFAULT_COLORS
if (use_default_colors() == OK)
bg = -1;
#endif
for (i = 0; i < 9; i++)
- init_pair(i + 1, bg, TileColour[i]);
+ init_pair((short) (i + 1), bg, TileColour[i]);
}
cbreak();
if (LINES < 24) {
if (GetMove(&FromCol, &ToCol))
break;
if (InvalidMove(FromCol, ToCol)) {
- mvaddstr(STATUSLINE, 0, "Invalid Move !!");
+ MvAddStr(STATUSLINE, 0, "Invalid Move !!");
refresh();
beep();
continue;
}
MakeMove(FromCol, ToCol);
if (Solved(NTiles)) {
- mvprintw(STATUSLINE, 0,
+ MvPrintw(STATUSLINE, 0,
"Well Done !! You did it in %d moves", NMoves);
refresh();
sleep(5);
int Size, SlotNo;
for (Size = NTiles * 2 + 1, SlotNo = 0; Size >= 3; Size -= 2)
- Pegs[0].Length[SlotNo++] = Size;
+ Pegs[0].Length[SlotNo++] = (size_t) Size;
Pegs[0].Count = NTiles;
Pegs[1].Count = 0;
char TileBuf[BUFSIZ];
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", NMoves);
- attrset(A_REVERSE);
- mvaddstr(BASELINE, 8,
+ 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", NMoves);
+ (void) attrset(A_REVERSE);
+ MvAddStr(BASELINE, 8,
" ");
for (Line = TOPLINE; Line < BASELINE; Line++) {
- mvaddch(Line, LEFTPEG, ' ');
- mvaddch(Line, MIDPEG, ' ');
- mvaddch(Line, RIGHTPEG, ' ');
+ MvAddCh(Line, LEFTPEG, ' ');
+ MvAddCh(Line, MIDPEG, ' ');
+ MvAddCh(Line, RIGHTPEG, ' ');
}
- mvaddch(BASELINE, LEFTPEG, '1');
- mvaddch(BASELINE, MIDPEG, '2');
- mvaddch(BASELINE, RIGHTPEG, '3');
- attrset(A_NORMAL);
+ MvAddCh(BASELINE, LEFTPEG, '1');
+ MvAddCh(BASELINE, MIDPEG, '2');
+ MvAddCh(BASELINE, RIGHTPEG, '3');
+ (void) attrset(A_NORMAL);
/* Draw tiles */
for (peg = 0; peg < NPEGS; peg++) {
for (SlotNo = 0; SlotNo < Pegs[peg].Count; SlotNo++) {
- unsigned len = Pegs[peg].Length[SlotNo];
- if (len < sizeof(TileBuf) - 1 && len < (unsigned) PegPos[peg]) {
+ size_t len = Pegs[peg].Length[SlotNo];
+ if (len < sizeof(TileBuf) - 1 && len < (size_t) PegPos[peg]) {
memset(TileBuf, ' ', len);
TileBuf[len] = '\0';
if (has_colors())
- attrset(COLOR_PAIR(LENTOIND(len)));
+ (void) attrset(COLOR_PAIR(LENTOIND(len)));
else
- attrset(A_REVERSE);
- mvaddstr(BASELINE - (SlotNo + 1),
- (int) (PegPos[peg] - len / 2),
+ (void) attrset(A_REVERSE);
+ MvAddStr(BASELINE - (SlotNo + 1),
+ (PegPos[peg] - (int) len / 2),
TileBuf);
}
}
}
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
refresh();
}
static int
GetMove(int *From, int *To)
{
- mvaddstr(STATUSLINE, 0, "Next move ('q' to quit) from ");
+ MvAddStr(STATUSLINE, 0, "Next move ('q' to quit) from ");
clrtoeol();
refresh();
if ((*From = getch()) == 'q')