From a41c6ca7ceb63995d95b4d6d3cd50ff14ab17b78 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sun, 20 Mar 2005 12:53:33 +0000
Subject: [PATCH] added MAX_FPS constant

---
 ChangeLog      | 3 +++
 main/game.c    | 6 +++---
 main/game.h    | 3 ++-
 main/inferno.c | 4 ++--
 main/menu.c    | 6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8497d3ea..310b3f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-20  Bradley Bell  <btb@icculus.org>
 
+	* main/game.c, main/game.h, main/inferno.c, main/menu.c: added
+	MAX_FPS constant
+
 	* console/CON_console.c: Fixed console cursor positioning.
 
 	* main/text.c: revert to Error if text file not found.
diff --git a/main/game.c b/main/game.c
index c8ba34ca..bbd0ff9e 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.34 2004-12-17 13:17:46 btb Exp $ */
+/* $Id: game.c,v 1.35 2005-03-20 12:53:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char game_rcsid[] = "$Id: game.c,v 1.34 2004-12-17 13:17:46 btb Exp $";
+char game_rcsid[] = "$Id: game.c,v 1.35 2005-03-20 12:53:33 btb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -1207,7 +1207,7 @@ int Movie_fixed_frametime;
 #endif
 
 //added on 8/18/98 by Victor Rachels to add maximum framerate
-int maxfps = 80;
+int maxfps = MAX_FPS;
 //end this section
 
 void calc_frame_time()
diff --git a/main/game.h b/main/game.h
index 4a66f6cf..6b2e3975 100644
--- a/main/game.h
+++ b/main/game.h
@@ -1,4 +1,4 @@
-/* $Id: game.h,v 1.9 2004-08-28 23:17:45 schaffner Exp $ */
+/* $Id: game.h,v 1.10 2005-03-20 12:53:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -271,6 +271,7 @@ int gr_toggle_fullscreen_game(void);
  */
 void flickering_light_read(flickering_light *fl, CFILE *fp);
 
+#define MAX_FPS 80
 extern int maxfps;
 
 #endif /* _GAME_H */
diff --git a/main/inferno.c b/main/inferno.c
index 85aa129f..d9c47af1 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -1,4 +1,4 @@
-/* $Id: inferno.c,v 1.100 2005-02-26 09:30:04 chris Exp $ */
+/* $Id: inferno.c,v 1.101 2005-03-20 12:53:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -636,7 +636,7 @@ int main(int argc, char *argv[])
 	//added/edited 8/18/98 by Victor Rachels to set maximum fps <= 100
 	if ((t = FindArg( "-maxfps" ))) {
 		t=atoi(Args[t+1]);
-		if (t>0&&t<=80)
+		if (t > 0 && t <= MAX_FPS)
 			maxfps=t;
 	}
 	//end addition - Victor Rachels
diff --git a/main/menu.c b/main/menu.c
index 50abc7e7..dab64a2d 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.40 2005-01-07 21:58:42 btb Exp $ */
+/* $Id: menu.c,v 1.41 2005-03-20 12:53:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1365,10 +1365,10 @@ void d2x_options_menu()
             if(i == inputs+0)
 			{
 				maxfps = atoi(smaxfps);
-                if(maxfps < 1 || maxfps>80)
+				if(maxfps < 1 || maxfps > MAX_FPS)
 				{
 					nm_messagebox(TXT_ERROR, 1, TXT_OK, "Invalid value for maximum framerate");
-					maxfps = 80;
+					maxfps = MAX_FPS;
 					i = (inputs+0);
 				}
 			}
-- 
2.39.2