From 99bf47fd98341745f1265460a9f190118a5df618 Mon Sep 17 00:00:00 2001
From: Taylor Richards <taylor@icculus.org>
Date: Tue, 3 Mar 2015 21:46:22 -0500
Subject: [PATCH] add running check for fonttool

---
 include/pstypes.h            | 1 +
 src/ac/ac_stubs.cpp          | 1 +
 src/fonttool/fonttool.cpp    | 2 ++
 src/freespace2/freespace.cpp | 1 +
 src/graphics/2d.cpp          | 6 +++---
 src/nebedit/nebedit.cpp      | 1 +
 src/pofview/pofviewstubs.cpp | 1 +
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/pstypes.h b/include/pstypes.h
index 6f842e4..7df3497 100644
--- a/include/pstypes.h
+++ b/include/pstypes.h
@@ -412,6 +412,7 @@ void gr_activate(int);
 extern int	Fred_running;  // Is Fred running, or FreeSpace?
 extern int Pofview_running;
 extern int Nebedit_running;
+extern int Fonttool_running;
 
 
 //======================================================================================
diff --git a/src/ac/ac_stubs.cpp b/src/ac/ac_stubs.cpp
index a489a96..76f517c 100644
--- a/src/ac/ac_stubs.cpp
+++ b/src/ac/ac_stubs.cpp
@@ -89,6 +89,7 @@ int Font1;
 void freespace_menu_background() {}
 int Fred_running = 0;
 int Pofview_running = 0;
+int Fonttool_running = 0;
 char *Game_CDROM_dir;
 void game_stop_looped_sounds() {}
 void game_enter_state(int, int){}
diff --git a/src/fonttool/fonttool.cpp b/src/fonttool/fonttool.cpp
index ee3af6e..94724ff 100644
--- a/src/fonttool/fonttool.cpp
+++ b/src/fonttool/fonttool.cpp
@@ -87,6 +87,8 @@ static const char Usage[] = "Usage:\n"	\
 
 int Font1 = -1;
 
+int Fonttool_running = 1;
+
 void demo_set_playback_filter() {}
 float flFrametime = 0.0f;
 
diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp
index 93d087a..0f20883 100644
--- a/src/freespace2/freespace.cpp
+++ b/src/freespace2/freespace.cpp
@@ -741,6 +741,7 @@ int Game_no_clear = 0;
 
 int Pofview_running = 0;
 int Nebedit_running = 0;
+int Fonttool_running = 0;
 
 typedef struct big_expl_flash {
 	float max_flash_intensity;	// max intensity
diff --git a/src/graphics/2d.cpp b/src/graphics/2d.cpp
index fec64aa..e9f27c2 100644
--- a/src/graphics/2d.cpp
+++ b/src/graphics/2d.cpp
@@ -647,7 +647,7 @@ void gr_set_gamma(float gamma)
 
 static int gr_get_best_res(int *max_w, int *max_h)
 {
-	if (Fred_running || Pofview_running || Nebedit_running) {
+	if (Fred_running || Pofview_running || Nebedit_running || Fonttool_running) {
 		(*max_w) = 640;
 		(*max_h) = 480;
 
@@ -846,8 +846,8 @@ void gr_toggle_fullscreen()
 		return;
 	}
 
-	// skip if a tool is running
-	if ( Fred_running || Pofview_running || Nebedit_running ) {
+	// skip if a tool is running (except fonttool)
+	if (Fred_running || Pofview_running || Nebedit_running) {
 		return;
 	}
 
diff --git a/src/nebedit/nebedit.cpp b/src/nebedit/nebedit.cpp
index a01a342..8e84ef0 100644
--- a/src/nebedit/nebedit.cpp
+++ b/src/nebedit/nebedit.cpp
@@ -134,6 +134,7 @@ float ViewerZoom = 1.0f;
 int test_model = -1;
 int Fred_running = 0;
 int Pofview_running = 0;
+int Fonttool_running = 0;
 float flFrametime = 0.0f;
 
 int Font1 = -1;
diff --git a/src/pofview/pofviewstubs.cpp b/src/pofview/pofviewstubs.cpp
index 10cfea3..e7cd746 100644
--- a/src/pofview/pofviewstubs.cpp
+++ b/src/pofview/pofviewstubs.cpp
@@ -21,6 +21,7 @@ int rtvoice_stream_data(uint, uint, uint )
 }
 
 int Fred_running = 0;
+int Fonttool_running = 0;
 
 
 void demo_set_playback_filter()
-- 
2.39.2