From 4ffc2cfeb67b922ac4885ac9443a45c9dc5ef17c Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 23 Mar 2007 12:55:36 +0000
Subject: not necessary to keep movie history

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3490 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/menu.c | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

(limited to 'mbbsd/menu.c')

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 00e670f4..62e80ea2 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -156,37 +156,28 @@ show_status(void)
     outs(ANSI_RESET);
 }
 
+/*
+ * current callee of movie:
+ *   board.c: movie(0);    // called when IN_CLASSROOT()
+ *                         // with currstat = CLASS -> don't show movies
+ *   xyz.c:   movie(999);  // logout
+ *   menu.c:  movie(currstat); // ...
+ */
 void
-movie(int i)
+movie(int state)
 {
-    static short    history[MAX_HISTORY];
-    int             j;
-
+    int i;
     if ((currstat != CLASS) && (cuser.uflag & MOVIE_FLAG) &&
 	!SHM->Pbusystate && SHM->max_film > 0) {
-	if (currstat == PSALE) {
-	    i = PSALE;
-	    reload_money();
+	if (state == PSALE) {
+	    reload_money(); // XXX why reload_money here?
+	    i = state;
+	} else if (state == 999) {	/* Goodbye my friend */
+	    i = 0;
 	} else {
-	    do {
-		if (!i)
-		    i = 1 + (int)(((float)SHM->max_film *
-				   random()) / (RAND_MAX + 1.0));
-
-		for (j = SHM->max_history; j >= 0; j--)
-		    if (i == history[j]) {
-			i = 0;
-			break;
-		    }
-	    } while (i == 0);
+	    i = 1 + (int)(((float)SHM->max_film * random()) / (RAND_MAX + 1.0));
 	}
 
-	memmove(history, &history[1], SHM->max_history * sizeof(short));
-	history[SHM->max_history] = j = i;
-
-	if (i == 999)		/* Goodbye my friend */
-	    i = 0;
-
 	move(1, 0);
 	clrtoline(1 + FILMROW);	/* 清掉上次的 */
 	out_lines(SHM->notes[i], 11);	/* 只印11行就好 */
-- 
cgit v1.2.3