ncurses 5.7 - patch 20100731

[ncurses.git] / test / rain.c

diff --git a/test/rain.c b/test/rain.c
index 411306a71f9dbcdf55690b415cf1621be44ca6e3..11d4cb7c42918686217d712815bff2d09f280364 100644 (file)
--- a/test/rain.c
+++ b/test/rain.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: rain.c,v 1.33 2008/03/22 18:12:01 tom Exp $
+ * $Id: rain.c,v 1.36 2010/05/01 19:12:26 tom Exp $
  */
 #include <test.priv.h>
 
@@ -105,7 +105,7 @@ next_j(int j)
        chtype color = COLOR_PAIR(z);
        if (z)
            color |= A_BOLD;
-       attrset(color);
+       (void) attrset(color);
     }
     return j;
 }
@@ -113,47 +113,47 @@ next_j(int j)
 static void
 part1(DATA * drop)
 {
-    mvaddch(drop->y, drop->x, '.');
+    MvAddCh(drop->y, drop->x, '.');
 }
 
 static void
 part2(DATA * drop)
 {
-    mvaddch(drop->y, drop->x, 'o');
+    MvAddCh(drop->y, drop->x, 'o');
 }
 
 static void
 part3(DATA * drop)
 {
-    mvaddch(drop->y, drop->x, 'O');
+    MvAddCh(drop->y, drop->x, 'O');
 }
 
 static void
 part4(DATA * drop)
 {
-    mvaddch(drop->y - 1, drop->x, '-');
-    mvaddstr(drop->y, drop->x - 1, "|.|");
-    mvaddch(drop->y + 1, drop->x, '-');
+    MvAddCh(drop->y - 1, drop->x, '-');
+    MvAddStr(drop->y, drop->x - 1, "|.|");
+    MvAddCh(drop->y + 1, drop->x, '-');
 }
 
 static void
 part5(DATA * drop)
 {
-    mvaddch(drop->y - 2, drop->x, '-');
-    mvaddstr(drop->y - 1, drop->x - 1, "/ \\");
-    mvaddstr(drop->y, drop->x - 2, "| O |");
-    mvaddstr(drop->y + 1, drop->x - 1, "\\ /");
-    mvaddch(drop->y + 2, drop->x, '-');
+    MvAddCh(drop->y - 2, drop->x, '-');
+    MvAddStr(drop->y - 1, drop->x - 1, "/ \\");
+    MvAddStr(drop->y, drop->x - 2, "| O |");
+    MvAddStr(drop->y + 1, drop->x - 1, "\\ /");
+    MvAddCh(drop->y + 2, drop->x, '-');
 }
 
 static void
 part6(DATA * drop)
 {
-    mvaddch(drop->y - 2, drop->x, ' ');
-    mvaddstr(drop->y - 1, drop->x - 1, "   ");
-    mvaddstr(drop->y, drop->x - 2, "     ");
-    mvaddstr(drop->y + 1, drop->x - 1, "   ");
-    mvaddch(drop->y + 2, drop->x, ' ');
+    MvAddCh(drop->y - 2, drop->x, ' ');
+    MvAddStr(drop->y - 1, drop->x - 1, "   ");
+    MvAddStr(drop->y, drop->x - 2, "     ");
+    MvAddStr(drop->y + 1, drop->x - 1, "   ");
+    MvAddCh(drop->y + 2, drop->x, ' ');
 }
 
 #ifdef USE_PTHREADS
@@ -323,6 +323,7 @@ main(int argc GCC_UNUSED,
        last[j].x = random_x();
        last[j].y = random_y();
     }
+    j = 0;
 #endif
 
     while (!done) {