aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-03 21:49:09 +0000
committerMartin Kiewitz2009-10-03 21:49:09 +0000
commitc0773975f54dd862fa7d68df900236ea63a6b509 (patch)
tree86a18b8b2ca66bac9e7d2075e0372cd5ab55931a /engines
parent93c3d07e2b459d8b9d20e857e430986b24420fe4 (diff)
downloadscummvm-rg350-c0773975f54dd862fa7d68df900236ea63a6b509.tar.gz
scummvm-rg350-c0773975f54dd862fa7d68df900236ea63a6b509.tar.bz2
scummvm-rg350-c0773975f54dd862fa7d68df900236ea63a6b509.zip
SCI/newgui: removed duplicate unused code
svn-id: r44574
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gui/gui_gfx.cpp64
-rw-r--r--engines/sci/gui/gui_gfx.h3
2 files changed, 0 insertions, 67 deletions
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index 34748dc23e..e616fcc004 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -536,70 +536,6 @@ void SciGUIgfx::StdChar(int16 chr) {
#endif
}
-SCILanguage SciGUIgfx::getSCILanguage() {
- return kLangEnglish;
-}
-
-char *SciGUIgfx::StrSplit(char *buff, const char *msg, const char *fmt) {
- SCILanguage gameLang = getSCILanguage();
- SCILanguage subtitleLang = kLangNone;
- char *retval;
-// if (_theGame.getHandle())
- //subtitleLang = (SCILanguage)_theGame.getProperty(0x58); // subtitleLang property
-
- if (buff == msg) {
- char str[2000];
- getIntlString(str, msg, fmt, gameLang, subtitleLang);
- retval = strcpy(buff, str);
- } else
- retval = getIntlString(buff, msg, fmt, gameLang, subtitleLang);
- return retval;
-}
-//--------------------------------
-// In multilanguage game the msg has format ___english_text__#I___italian_text___
-// The function should place in buff a translated part of msg or the 1st one if a translation
-// does not exist
-char *SciGUIgfx::getIntlString(char *buff, const char *msg, const char *fmt, SCILanguage gameLang, SCILanguage subtitleLang) {
-
- // prefer subtitleLang if set
- SCILanguage lang = subtitleLang != kLangNone ? subtitleLang : gameLang;
- const char *ptr = msg, *szFrom;
- char ch;
- int nLen = 0;
- // searching for language code in msg
- while (*ptr) {
- ch = *(ptr + 1);
- if(*ptr == '#' && (ch == 'I' || ch == 'F' || ch == 'G' || ch == 'S')) {
- ptr +=2;
- break;
- }
- ptr++;
- }
- // if a language code was found...
- if (*ptr) {
- if ((lang == kLangItalian && ch == 'I') || (lang == kLangFrench && ch == 'F') ||
- (lang == kLangGerman && ch == 'G') || (lang == kLangSpanish && ch == 'S')) {
- nLen = (int)strlen(ptr);
- szFrom = ptr;
- } else {
- nLen = ptr - msg - 2;
- szFrom = msg;
- }
- } else {
- nLen = ptr - msg;
- szFrom = msg;
- }
- if (fmt && subtitleLang != kLangNone) {
- strcpy(buff, fmt);
- strncat(buff, szFrom, nLen);
- buff[nLen + strlen(fmt)] = 0;
- } else {
- strncpy(buff, szFrom, nLen);
- buff[nLen] = 0;
- }
- return buff;
-}
-
// TODO: implement codes
int16 SciGUIgfx::TextSize(Common::Rect &rect, const char *str, int16 fontId, int16 maxwidth) {
char buff[1000] = { 0 };
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index 80ceca16ba..f86a62f157 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -86,9 +86,6 @@ public:
void ClearChar(int16 chr);
void DrawChar(int16 chr);
void StdChar(int16 chr);
- SCILanguage getSCILanguage();
- char* StrSplit(char*buff, const char*msg, const char*fmt);
- char* getIntlString(char*buff, const char*msg, const char*fmt, SCILanguage lang, SCILanguage prop);
int16 TextSize(Common::Rect &rect, const char *str, int16 fontId, int16 maxwidth);
int16 GetLongest(const char *str, int16 maxwidth);
void DrawText(const char *str, int16 from, int16 len);