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 | |
| 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')
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 9 | ||||
| -rw-r--r-- | engines/avalanche/dropdown2.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/dropdown2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/module.mk | 2 |
4 files changed, 11 insertions, 8 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(""); } } diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 224fb0128c..4ef65046cc 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -106,7 +106,7 @@ void onemenu::start_afresh() { } void onemenu::opt(Common::String n, char tr, Common::String key, bool val) { - int16 l = (n + key).size() + 3; + uint16 l = (n + key).size() + 3; if (width < l) width = l; @@ -127,9 +127,9 @@ void onemenu::displayopt(byte y, bool highlit) { //bar((flx1 + 1) * 8, 3 + y * 10, (flx2 + 1) * 8, 12 + y * 10); Common::String data = oo[y].title; - while ((data + oo[y].shortcut).size() < width) + while (data.size() + oo[y].shortcut.size() < width) data += ' '; /* Pad oo[y] spaces. */ - data = data + oo[y].shortcut; + data += oo[y].shortcut; if (highlit) _dr->hlchalk(left, 4 + (y + 1) * 10, oo[y].trigger, data, oo[y].valid); diff --git a/engines/avalanche/dropdown2.h b/engines/avalanche/dropdown2.h index 73325a30bc..f0f3917457 100644 --- a/engines/avalanche/dropdown2.h +++ b/engines/avalanche/dropdown2.h @@ -72,7 +72,7 @@ class onemenu { public: optiontype oo[12]; byte number; - int16 width, left; + uint16 width, left; bool firstlix; int16 flx1, flx2, fly; byte oldy; /* used by Lightup */ diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk index 7f2e40c945..dbaa5460c6 100644 --- a/engines/avalanche/module.mk +++ b/engines/avalanche/module.mk @@ -3,7 +3,7 @@ MODULE := engines/avalanche MODULE_OBJS = \ avalanche.o \ graphics.o \ - parser.o\ + parser.o \ avalot.o \ console.o \ detection.o \ |