aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimei Yin2017-07-15 16:46:41 +0200
committerSimei Yin2017-07-15 17:51:57 +0200
commit8c8e5c44d8d84f27e2d41829364266c9968f4d98 (patch)
tree0bb6ad1c32b89918f5c0c4539af0a9055ce0fe53
parentd53c43d092ed505185ad30086ffb78f1b04332a3 (diff)
downloadscummvm-rg350-8c8e5c44d8d84f27e2d41829364266c9968f4d98.tar.gz
scummvm-rg350-8c8e5c44d8d84f27e2d41829364266c9968f4d98.tar.bz2
scummvm-rg350-8c8e5c44d8d84f27e2d41829364266c9968f4d98.zip
SLUDGE: Remove openGl-related function fixFont
-rw-r--r--engines/sludge/builtin.cpp2
-rw-r--r--engines/sludge/fonttext.cpp27
-rw-r--r--engines/sludge/fonttext.h1
-rw-r--r--engines/sludge/statusba.cpp2
-rw-r--r--engines/sludge/talk.cpp1
5 files changed, 0 insertions, 33 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 9821eff1cc..d93d8b4858 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -889,7 +889,6 @@ builtIn(pasteString) {
trimStack(fun->stack);
if (x == IN_THE_CENTRE)
x = (winWidth - stringWidth(newText)) >> 1;
- fixFont(pastePalette);
pasteStringToBackdrop(newText, x, y, pastePalette);
return BR_CONTINUE;
}
@@ -2215,7 +2214,6 @@ builtIn(burnString) {
trimStack(fun->stack);
if (x == IN_THE_CENTRE)
x = (winWidth - stringWidth(newText)) >> 1;
- fixFont(pastePalette);
burnStringToBackdrop(newText, x, y, pastePalette);
return BR_CONTINUE;
}
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 591e4a3d2e..f1394b0b98 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -126,33 +126,6 @@ void burnStringToBackdrop(const Common::String &theText, int xOff, int y, sprite
}
}
-void fixFont(spritePalette &spal) {
-#if 0
- delete [] spal.tex_names;
- delete [] spal.burnTex_names;
- delete [] spal.tex_h;
- delete [] spal.tex_w;
-
- spal.numTextures = theFont.myPalette.numTextures;
-
- spal.tex_names = new GLuint [spal.numTextures];
- if (! checkNew(spal.tex_names)) return;
- spal.burnTex_names = new GLuint [spal.numTextures];
- if (! checkNew(spal.burnTex_names)) return;
- spal.tex_w = new int [spal.numTextures];
- if (! checkNew(spal.tex_w)) return;
- spal.tex_h = new int [spal.numTextures];
- if (! checkNew(spal.tex_h)) return;
-
- for (int i = 0; i < theFont.myPalette.numTextures; i++) {
- spal.tex_names[i] = theFont.myPalette.tex_names[i];
- spal.burnTex_names[i] = theFont.myPalette.burnTex_names[i];
- spal.tex_w[i] = theFont.myPalette.tex_w[i];
- spal.tex_h[i] = theFont.myPalette.tex_h[i];
- }
-#endif
-}
-
void setFontColour(spritePalette &sP, byte r, byte g, byte b) {
sP.originalRed = r;
sP.originalGreen = g;
diff --git a/engines/sludge/fonttext.h b/engines/sludge/fonttext.h
index 4ddd614b50..3967770ee8 100644
--- a/engines/sludge/fonttext.h
+++ b/engines/sludge/fonttext.h
@@ -28,7 +28,6 @@ namespace Sludge {
bool loadFont(int filenum, const Common::String &charOrder, int);
void pasteString(const Common::String &theText, int, int, spritePalette &);
-void fixFont(spritePalette &spal);
void setFontColour(spritePalette &sP, byte r, byte g, byte b);
int stringWidth(const Common::String &theText);
int stringLength(const Common::String &theText);
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index 6bebb0dea9..79c4f01362 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -88,8 +88,6 @@ void positionStatus(int x, int y) {
void drawStatusBar() {
int y = nowStatus->statusY, n = 0;
statusBar *stat = nowStatus->firstStatusBar;
- fixFont(litVerbLinePalette);
- fixFont(verbLinePalette);
while (stat) {
switch (nowStatus->alignStatus) {
case IN_THE_CENTRE:
diff --git a/engines/sludge/talk.cpp b/engines/sludge/talk.cpp
index a1f51bbaaf..4523a7f28f 100644
--- a/engines/sludge/talk.cpp
+++ b/engines/sludge/talk.cpp
@@ -203,7 +203,6 @@ int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool ani
void viewSpeech() {
int viewY = speech->speechY;
speechLine *viewLine = speech->allSpeech;
- fixFont(speech->talkCol);
while (viewLine) {
pasteString(viewLine->textLine, viewLine->x, viewY, speech->talkCol);
viewY -= fontHeight / cameraZoom;