diff options
| author | uruk | 2013-09-04 10:09:56 +0200 |
|---|---|---|
| committer | uruk | 2013-09-04 10:09:56 +0200 |
| commit | d148d08683606f3feadf4f461762eb2487ea2eca (patch) | |
| tree | 1d7aaf1b29a5a78a36ec3fbda4f88414e75f0080 /engines/avalanche/avalanche.cpp | |
| parent | b38fd85d707ec78f2b3d693bf292669a4b54e749 (diff) | |
| parent | a8d9978de8440bb402f55cdaf0338b947e346491 (diff) | |
| download | scummvm-rg350-d148d08683606f3feadf4f461762eb2487ea2eca.tar.gz scummvm-rg350-d148d08683606f3feadf4f461762eb2487ea2eca.tar.bz2 scummvm-rg350-d148d08683606f3feadf4f461762eb2487ea2eca.zip | |
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Diffstat (limited to 'engines/avalanche/avalanche.cpp')
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index e96a2497ad..68272c8c88 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -609,11 +609,14 @@ Common::String AvalancheEngine::elmToStr(Elm how) { switch (how) { case kNormal: case kMusical: - return "jsb"; + return Common::String("jsb"); case kRegi: - return "REGI"; + return Common::String("REGI"); case kElmpoyten: - return "ELMPOYTEN"; + return Common::String("ELMPOYTEN"); + // Useless, but silent a warning + default: + return Common::String(""); } } |