aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/talk.cpp
diff options
context:
space:
mode:
authorStrangerke2011-07-02 01:02:14 +0200
committerStrangerke2011-07-02 01:02:14 +0200
commit8e531d0da391b895a573c36c4b1bd8074571df83 (patch)
treef4c67a215f3e552540f36fdda0c28f7524e325cb /engines/cge/talk.cpp
parent601bfbd6095a88b2f6b77d2dec16731fe4fbf687 (diff)
downloadscummvm-rg350-8e531d0da391b895a573c36c4b1bd8074571df83.tar.gz
scummvm-rg350-8e531d0da391b895a573c36c4b1bd8074571df83.tar.bz2
scummvm-rg350-8e531d0da391b895a573c36c4b1bd8074571df83.zip
CGE: Some more renaming (WIP)
Diffstat (limited to 'engines/cge/talk.cpp')
-rw-r--r--engines/cge/talk.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge/talk.cpp b/engines/cge/talk.cpp
index fab1abc0d8..38625e2971 100644
--- a/engines/cge/talk.cpp
+++ b/engines/cge/talk.cpp
@@ -48,7 +48,7 @@ FONT::FONT(const char *name) {
Wid = farnew(uint8, WID_SIZ);
if ((Map == NULL) || (Pos == NULL) || (Wid == NULL))
error("No core");
- MergeExt(Path, name, FONT_EXT);
+ mergeExt(Path, name, FONT_EXT);
Load();
}
@@ -126,7 +126,7 @@ TALK::~TALK (void) {
FONT *TALK::_Font;
void TALK::init() {
- _Font = new FONT(ProgName());
+ _Font = new FONT(progName());
}
void TALK::deinit() {
@@ -182,7 +182,7 @@ void TALK::Update(const char *tx) {
tx++;
}
TS[0]->code();
- SetShapeList(TS);
+ setShapeList(TS);
}
@@ -286,7 +286,7 @@ void TALK::PutLine(int line, const char *text) {
INFO_LINE::INFO_LINE(CGEEngine *vm, uint16 w) : TALK(vm), OldTxt(NULL), _vm(vm) {
TS[0] = new Bitmap(w, FONT_HIG, TEXT_BG);
- SetShapeList(TS);
+ setShapeList(TS);
}