aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen_lok.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-24 17:52:53 +0000
committerFilippos Karapetis2009-09-24 17:52:53 +0000
commitb4f1960318e3e0460e4fa00bb74d75ffda9f4e79 (patch)
treefda717a83a3e9442d950aa23d673f267d3283631 /engines/kyra/screen_lok.cpp
parent0ea3cde160dc5c45ff5571258b838920e11ebe2b (diff)
downloadscummvm-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/kyra/screen_lok.cpp')
-rw-r--r--engines/kyra/screen_lok.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index de01eadccb..9ecdef325d 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -340,7 +340,7 @@ void Screen_LoK_16::getFadeParams(const Palette &pal, int delay, int &delayInc,
int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) {
error("Screen_LoK_16::fadePalStep called");
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
void Screen_LoK_16::paletteMap(uint8 idx, int r, int g, int b) {