aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-01 05:24:31 -0500
committerPaul Gilbert2017-01-01 05:24:31 -0500
commitd0d00f6beb9a2fab19455f653837af1b629d00da (patch)
tree7b92015c46e06490468da152b65374e61ce0b5a0 /engines/titanic/core
parentab7a152c3a47427b606503ac3ee16abf0cb94bbe (diff)
downloadscummvm-rg350-d0d00f6beb9a2fab19455f653837af1b629d00da.tar.gz
scummvm-rg350-d0d00f6beb9a2fab19455f653837af1b629d00da.tar.bz2
scummvm-rg350-d0d00f6beb9a2fab19455f653837af1b629d00da.zip
TITANIC: Rename CPetText to CTextControl
The class is used in several areas outside of the PET, so it makes better sense to not have it in the pet_control/ folder and named so
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp8
-rw-r--r--engines/titanic/core/game_object.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index b7cc688b61..a27584c483 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1081,7 +1081,7 @@ void CGameObject::setMovieFrameRate(double rate) {
void CGameObject::setText(const CString &str, int border, int borderRight) {
if (!_text)
- _text = new CPetText();
+ _text = new CTextControl();
_textBorder = border;
_textBorderRight = borderRight;
@@ -1093,7 +1093,7 @@ void CGameObject::setText(const CString &str, int border, int borderRight) {
void CGameObject::setTextHasBorders(bool hasBorders) {
if (!_text)
- _text = new CPetText();
+ _text = new CTextControl();
_text->setHasBorder(hasBorders);
}
@@ -1109,14 +1109,14 @@ void CGameObject::setTextBounds() {
void CGameObject::setTextColor(byte r, byte g, byte b) {
if (!_text)
- _text = new CPetText();
+ _text = new CTextControl();
_text->setColor(r, g, b);
}
void CGameObject::setTextFontNumber(int fontNumber) {
if (!_text)
- _text = new CPetText();
+ _text = new CTextControl();
_text->setFontNumber(fontNumber);
}
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 6671cbf4be..b367a0e722 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -34,7 +34,7 @@
#include "titanic/support/strings.h"
#include "titanic/support/movie_clip.h"
#include "titanic/pet_control/pet_section.h"
-#include "titanic/pet_control/pet_text.h"
+#include "titanic/gfx/text_control.h"
#include "titanic/game_state.h"
namespace Titanic {
@@ -87,7 +87,7 @@ protected:
int _initialFrame;
CMovieRangeInfoList _movieRangeInfoList;
int _frameNumber;
- CPetText *_text;
+ CTextControl *_text;
uint _textBorder;
uint _textBorderRight;
int _field9C;