diff options
| author | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
| commit | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (patch) | |
| tree | 5d02a8fba0559c16f2a2045b14e3e292509c6924 /graphics/sjis.cpp | |
| parent | 444934a0accec982f55db92c17ef65270fe18e66 (diff) | |
| parent | 0f5eeaed7b3c9d2f74eee7dff2114c5f4dc63f00 (diff) | |
| download | scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.gz scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.bz2 scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'graphics/sjis.cpp')
| -rw-r--r-- | graphics/sjis.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp index 33f0e562cb..59ee5af8c4 100644 --- a/graphics/sjis.cpp +++ b/graphics/sjis.cpp @@ -40,31 +40,25 @@ FontSJIS *FontSJIS::createFont(const Common::Platform platform) { // Try the font ROM of the specified platform if (platform == Common::kPlatformFMTowns) { ret = new FontTowns(); - if (ret) { - if (ret->loadData()) - return ret; - } + if (ret->loadData()) + return ret; delete ret; } else if (platform == Common::kPlatformPCEngine) { ret = new FontPCEngine(); - if (ret) { - if (ret->loadData()) - return ret; - } + if (ret->loadData()) + return ret; delete ret; } // TODO: PC98 font rom support /* else if (platform == Common::kPlatformPC98) { ret = new FontPC98(); - if (ret) { - if (ret->loadData()) - return ret; - } + if (ret->loadData()) + return ret; delete ret; }*/ // Try ScummVM's font. ret = new FontSjisSVM(platform); - if (ret && ret->loadData()) + if (ret->loadData()) return ret; delete ret; |