From b1b848ae4a13a2dfa43e80e0ada2eede1c859f79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 19 Jan 2002 05:56:25 +0000
Subject: [PATCH] finally get the damn spinner working (not in the right place,
 though)

---
 cs-code/menu.qc     | 12 ++++++------
 libs/console/menu.c |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cs-code/menu.qc b/cs-code/menu.qc
index ac63986af..58fc3b5a3 100644
--- a/cs-code/menu.qc
+++ b/cs-code/menu.qc
@@ -14,12 +14,12 @@ entity self;
 .void () think;
 
 string [6] dot = {
-	"gfx/menudot0.lpm",
-	"gfx/menudot1.lpm",
-	"gfx/menudot2.lpm",
-	"gfx/menudot3.lpm",
-	"gfx/menudot4.lpm",
-	"gfx/menudot5.lpm",
+	"gfx/menudot1.lmp",
+	"gfx/menudot2.lmp",
+	"gfx/menudot3.lmp",
+	"gfx/menudot4.lmp",
+	"gfx/menudot5.lmp",
+	"gfx/menudot6.lmp",
 };
 
 void (integer x, integer y) spinner =
diff --git a/libs/console/menu.c b/libs/console/menu.c
index 6aec8b5cb..93904c84e 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -197,7 +197,8 @@ bi_Menu_Item (progs_t *pr)
 static void
 bi_Menu_Cursor (progs_t *pr)
 {
-	func_t      func = G_FUNCTION (pr, OFS_PARM3);
+	func_t      func = G_FUNCTION (pr, OFS_PARM0);
+
 	menu->cursor = func;
 }
 
@@ -289,6 +290,7 @@ Menu_Draw (void)
 
 	if (!menu)
 		return;
+	*menu_pr_state.globals.time = *menu_pr_state.time;
 	for (m_pic = menu->pics; m_pic; m_pic = m_pic->next) {
 		qpic_t     *pic = Draw_CachePic (m_pic->name, 1);
 		if (!pic)
@@ -302,8 +304,8 @@ Menu_Draw (void)
 		}
 	}
 	if (menu->cursor) {
-		G_INT (&menu_pr_state, OFS_PARM0) = 320;
-		G_INT (&menu_pr_state, OFS_PARM1) = 240;
+		G_INT (&menu_pr_state, OFS_PARM0) = 0;
+		G_INT (&menu_pr_state, OFS_PARM1) = 0;
 		PR_ExecuteProgram (&menu_pr_state, menu->cursor);
 	}
 	if (menu_draw) {