diff options
| author | Einar Johan Trøan Sømåen | 2012-07-27 19:07:00 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-27 19:07:00 +0200 |
| commit | 99d4c55e88712a0b0dc0d97e4c9c52946a5f48f2 (patch) | |
| tree | 09c4b8143e636203cbcd36626811c358e9471f4f /engines/wintermute/base/scriptables | |
| parent | a4e2fb4504f0a7ba42521f7cd4c95c997adf96f4 (diff) | |
| download | scummvm-rg350-99d4c55e88712a0b0dc0d97e4c9c52946a5f48f2.tar.gz scummvm-rg350-99d4c55e88712a0b0dc0d97e4c9c52946a5f48f2.tar.bz2 scummvm-rg350-99d4c55e88712a0b0dc0d97e4c9c52946a5f48f2.zip | |
WINTERMUTE: Remove all unneccessary #if 0 blocks
Diffstat (limited to 'engines/wintermute/base/scriptables')
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_value.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index a3bb7e2183..181be8ddd0 100644 --- a/engines/wintermute/base/scriptables/script_ext_date.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -68,9 +68,7 @@ const char *SXDate::scToString() { // TODO: Make this more stringy, and less ISO 8601-like
_strRep.format("%04d-%02d-%02d - %02d:%02d:%02d", _tm.tm_year, _tm.tm_mon, _tm.tm_mday, _tm.tm_hour, _tm.tm_min, _tm.tm_sec);
return _strRep.c_str();
-#if 0
- return asctime(&_tm);
-#endif
+ //return asctime(&_tm);
}
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index 01cb4044ff..9b83daf42f 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -166,11 +166,7 @@ ScValue *ScValue::getProp(const char *name) { if (_type == VAL_STRING && strcmp(name, "Length") == 0) {
_gameRef->_scValue->_type = VAL_INT;
-#if 0 // TODO: Remove FreeType-dependency
if (_gameRef->_textEncoding == TEXT_ANSI) {
-#else
- if (true) {
-#endif
_gameRef->_scValue->setInt(strlen(_valString));
} else {
WideString wstr = StringUtil::utf8ToWide(_valString);
|