aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Weisse <[email protected]>2006-12-12 15:20:30 +0000
committerCarsten Weisse <[email protected]>2006-12-12 15:20:30 +0000
commit25889756b9c6fb5285edb2101ce102343572889c (patch)
treecdf7c904bcccf1aefb1a8647b694a46409f2848c
parent7aac96c5f93048b7c4df77feb656bc632e77634b (diff)
hide mouse on cinematic
-rw-r--r--src/jake2/client/client_state_t.java4
-rw-r--r--src/jake2/sys/IN.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/jake2/client/client_state_t.java b/src/jake2/client/client_state_t.java
index ca8355e..c77a3d6 100644
--- a/src/jake2/client/client_state_t.java
+++ b/src/jake2/client/client_state_t.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 27.11.2003 by RST.
-//$Id: client_state_t.java,v 1.5 2005-11-21 19:38:38 cawe Exp $
+//$Id: client_state_t.java,v 1.6 2006-12-12 15:20:30 cawe Exp $
package jake2.client;
@@ -112,7 +112,7 @@ public class client_state_t {
int cinematictime; // cls.realtime for first cinematic frame
int cinematicframe;
byte cinematicpalette[] = new byte[768];
- boolean cinematicpalette_active;
+ public boolean cinematicpalette_active;
//
// server state information
diff --git a/src/jake2/sys/IN.java b/src/jake2/sys/IN.java
index 70985d6..c3c4e8c 100644
--- a/src/jake2/sys/IN.java
+++ b/src/jake2/sys/IN.java
@@ -2,7 +2,7 @@
* IN.java
* Copyright (C) 2003
*
- * $Id: IN.java,v 1.7 2004-12-16 22:45:55 hzi Exp $
+ * $Id: IN.java,v 1.8 2006-12-12 15:20:30 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -158,8 +158,8 @@ public final class IN extends Globals {
public static void Frame() {
- if (!cl.refresh_prepped || cls.key_dest == key_console
- || cls.key_dest == key_menu)
+ if (!cl.cinematicpalette_active && (!cl.refresh_prepped || cls.key_dest == key_console
+ || cls.key_dest == key_menu))
DeactivateMouse();
else
ActivateMouse();