From b01482bddb6d8f0b0be4dd46ee7c9e4141908673 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 13 May 2012 23:05:41 +1000
Subject: TONY: Further globals added to Globals class

---
 engines/tony/font.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'engines/tony/font.cpp')

diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index dee3c3228a..8957c09a87 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -1816,9 +1816,12 @@ void RMFontObj::Init(void) {
 \****************************************************************************/
 
 RMFontColor *RMText::m_fonts[4] = { NULL, NULL, NULL, NULL };
-OSystem::MutexRef RMText::m_cs;
 RMGfxClearTask RMText::m_clear;
 
+void RMText::InitStatics() {
+	Common::fill(&m_fonts[0], &m_fonts[4], (RMFontColor *)NULL);
+}
+
 RMText::RMText() {
 	// Colore di default: bianco
 	m_r = m_g = m_b = 255;
@@ -1843,8 +1846,6 @@ void RMText::Unload() {
 		delete m_fonts[2];
 		delete m_fonts[3];
 		m_fonts[0] =  m_fonts[1] = m_fonts[2] = m_fonts[3] = 0;
-
-		g_system->unlockMutex(m_cs);
 	}
 }
 
@@ -1866,13 +1867,9 @@ void RMText::WriteText(const RMString &text, int nFont, int *time) {
 		m_fonts[1] = new RMFontObj;   m_fonts[1]->Init();
 		m_fonts[2] = new RMFontMacc;  m_fonts[2]->Init();
 		m_fonts[3] = new RMFontCredits;  m_fonts[3]->Init();
-
-		m_cs = g_system->createMutex();
 	}
 
-	g_system->lockMutex(m_cs);
-	WriteText(text,m_fonts[nFont],time);
-	g_system->unlockMutex(m_cs);
+	WriteText(text, m_fonts[nFont], time);
 }
 
 
-- 
cgit v1.2.3