Fix merge conflicts

[bsdgames-darwin.git] / dab / gamescreen.h

diff --git a/dab/gamescreen.h b/dab/gamescreen.h
index ca90cb311b8c7e6e0dc0605b9ec93917cc0e7b6f..c52c85bff545fe9f6da3c982a83e3f31d1ebc65c 100644 (file)
--- a/dab/gamescreen.h
+++ b/dab/gamescreen.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: gamescreen.h,v 1.1.1.1 2003/12/26 17:57:03 christos Exp $      */
+/*     $NetBSD: gamescreen.h,v 1.3 2010/12/08 17:08:07 joerg Exp $     */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -70,9 +63,9 @@ class GAMESCREEN {
     virtual void redraw(void) = 0;                     // Refresh
     virtual int getinput(void) = 0;                    // Get user input
     virtual void bell(void) = 0;                       // Beep
-    virtual void score(size_t p, const PLAYER& p) = 0; // Post current score
-    virtual void games(size_t p, const PLAYER& p) = 0; // Post games won
-    virtual void total(size_t p, const PLAYER& p) = 0; // Post total score
+    virtual void score(size_t l, const PLAYER& p) = 0; // Post current score
+    virtual void games(size_t l, const PLAYER& p) = 0; // Post games won
+    virtual void total(size_t l, const PLAYER& p) = 0; // Post total score
     virtual void ties(const PLAYER& p) = 0;            // Post tie games
 };