diff options
| author | Filippos Karapetis | 2009-09-24 17:52:53 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-24 17:52:53 +0000 |
| commit | b4f1960318e3e0460e4fa00bb74d75ffda9f4e79 (patch) | |
| tree | fda717a83a3e9442d950aa23d673f267d3283631 /engines/parallaction | |
| parent | 0ea3cde160dc5c45ff5571258b838920e11ebe2b (diff) | |
| download | scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.tar.gz scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.tar.bz2 scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.zip | |
Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44314
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/disk_ns.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/objects.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index bb59aa3a32..383937aa7e 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -620,7 +620,7 @@ private: uint16 getCrunchType(uint32 signature) { - byte eff; + byte eff = 0; switch (signature) { case 0x50503230: /* PP20 */ diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index 3a77077702..fe5b4a7302 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -303,8 +303,7 @@ int16 ScriptVar::getValue() { } error("Parameter is not an r-value"); - - //return 0; + return 0; // for compilers that don't support NORETURN } void ScriptVar::setValue(int16 value) { |