aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-06-18 08:28:13 +0200
committerStrangerke2012-06-18 08:28:13 +0200
commitf2e6b4615356d17205a1d4e04100f6de8676a194 (patch)
treee233f4823dcb296b3d4400f6f5c675de6f7a8de7
parente8a6f61f8815fcf36e7a43383695c74b8925993f (diff)
downloadscummvm-rg350-f2e6b4615356d17205a1d4e04100f6de8676a194.tar.gz
scummvm-rg350-f2e6b4615356d17205a1d4e04100f6de8676a194.tar.bz2
scummvm-rg350-f2e6b4615356d17205a1d4e04100f6de8676a194.zip
TONY: Rename RMFontDialog
-rw-r--r--engines/tony/font.cpp8
-rw-r--r--engines/tony/font.h4
2 files changed, 5 insertions, 7 deletions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index c4a95d0493..efce8dbe6e 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -201,10 +201,10 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) {
}
/***************************************************************************\
-* RMFontParla Methods
+* RMFontDialog Methods
\****************************************************************************/
-void RMFontParla::init() {
+void RMFontDialog::init() {
int i;
// bernie: Number of characters in the font
@@ -1801,11 +1801,10 @@ void RMText::removeThis(CORO_PARAM, bool &result) {
result = true;
}
-
void RMText::writeText(const RMString &text, int nFont, int *time) {
// Initializes the font (only once)
if (_fonts[0] == NULL) {
- _fonts[0] = new RMFontParla;
+ _fonts[0] = new RMFontDialog;
_fonts[0]->init();
_fonts[1] = new RMFontObj;
_fonts[1]->init();
@@ -1818,7 +1817,6 @@ void RMText::writeText(const RMString &text, int nFont, int *time) {
writeText(text, _fonts[nFont], time);
}
-
void RMText::writeText(const RMString &text, RMFontColor *font, int *time) {
RMGfxPrimitive *prim;
char *p, *old_p;
diff --git a/engines/tony/font.h b/engines/tony/font.h
index 595cb726a6..9971e536ed 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -141,10 +141,10 @@ public:
};
-class RMFontParla : public RMFontColor, public RMFontWithTables {
+class RMFontDialog : public RMFontColor, public RMFontWithTables {
public:
void init();
- virtual ~RMFontParla() {}
+ virtual ~RMFontDialog() {}
};
class RMFontObj : public RMFontColor, public RMFontWithTables {