From 9c55e7247c34419ab34c95225cc38553d87d5bef Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Fri, 16 Apr 2004 12:12:37 +0000 Subject: Rename this function and associate data with COMMON file svn-id: r13587 --- graphics/scummfont.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'graphics') diff --git a/graphics/scummfont.cpp b/graphics/scummfont.cpp index e6df7e68ba..1b41bad8ee 100644 --- a/graphics/scummfont.cpp +++ b/graphics/scummfont.cpp @@ -97,16 +97,12 @@ const ScummFont g_scummfont; #ifdef __PALM_OS__ #include "scumm_globals.h" -_GINIT(NewGui) -#ifndef NEW_FONT_CODE -_GSETPTR(Graphics::guifont, GBVARS_GUIFONT_INDEX, byte, GBVARS_SCUMM) -#endif +_GINIT(ScummFont) +_GSETPTR(Graphics::guifont, GBVARS_GUIFONT_INDEX, byte, GBVARS_COMMON) _GEND -_GRELEASE(NewGui) -#ifndef NEW_FONT_CODE -_GRELEASEPTR(GBVARS_GUIFONT_INDEX, GBVARS_SCUMM) -#endif +_GRELEASE(ScummFont) +_GRELEASEPTR(GBVARS_GUIFONT_INDEX, GBVARS_COMMON) _GEND #endif -- cgit v1.2.3