From e190fae0061c68bdb8eb074ea58d7b8ff6bebad0 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Thu, 11 Apr 2002 00:06:44 +0000
Subject: [PATCH] Fixed cursor and key event carried over from game
---
src/game/intro.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/game/intro.cpp b/src/game/intro.cpp
index c4fa4c722..525170a44 100644
--- a/src/game/intro.cpp
+++ b/src/game/intro.cpp
@@ -45,6 +45,7 @@
#include "cursor.h"
#include "menus.h"
#include "interface.h"
+#include "ui.h"
/*----------------------------------------------------------------------------
-- Declarations
@@ -130,7 +131,8 @@ local void IntroCallbackKey1(unsigned key, unsigned keychar)
local void IntroCallbackKey2(unsigned key, unsigned keychar)
{
if( UseContinueButton ) {
- if( keychar=='c' || keychar=='\r' ) {
+ if( (keychar=='c' || keychar=='\r') &&
+ (ContinueButtonFlags&MenuButtonClicked) ) {
IntroNoEvent=0;
ContinueButtonFlags&=~MenuButtonClicked;
}
@@ -505,6 +507,7 @@ global void ShowCredits(Credits *credits)
UseContinueButton=1;
InitContinueButton(455,480-40);
+ GameCursor=TheUI.Point.Cursor;
DestroyCursorBackground();
x=(VideoWidth-640)/2;
@@ -922,6 +925,7 @@ global void ShowStats()
UseContinueButton=1;
InitContinueButton(455,480-40);
+ GameCursor=TheUI.Point.Cursor;
DestroyCursorBackground();
done=0;