[Scummvm-git-logs] scummvm master -> 8e19a24130ec5bfb06deecac178bac813f6a82d4

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8e19a24130 KYRA: Fix compilation when kyra is enabled but lol isn't


Commit: 8e19a24130ec5bfb06deecac178bac813f6a82d4
    https://github.com/scummvm/scummvm/commit/8e19a24130ec5bfb06deecac178bac813f6a82d4
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-05-18T11:02:48+03:00

Commit Message:
KYRA: Fix compilation when kyra is enabled but lol isn't

Changed paths:
    engines/kyra/graphics/screen.cpp
    engines/kyra/graphics/screen.h


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index 8aa4424cc34..3266e6ad2aa 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -1398,11 +1398,15 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 				if (_vm->game() == GI_KYRA2) {
 					fn1 = new ChineseOneByteFontHOF(SCREEN_W);
 					fn2 = new ChineseTwoByteFontHOF(SCREEN_W);
-				} else if (_vm->game() == GI_LOL) {
+				}
+#ifdef ENABLE_LOL
+				else if (_vm->game() == GI_LOL) {
 					// Same as next one but with different spacing
 					fn1 = new ChineseOneByteFontLoL(SCREEN_W);
 					fn2 = new ChineseTwoByteFontLoL(SCREEN_W);
-				} else {
+				}
+#endif
+				else {
 					fn1 = new ChineseOneByteFontMR(SCREEN_W);
 					fn2 = new ChineseTwoByteFontMR(SCREEN_W);
 				}
diff --git a/engines/kyra/graphics/screen.h b/engines/kyra/graphics/screen.h
index 74e20c70ab8..4377d785ca9 100644
--- a/engines/kyra/graphics/screen.h
+++ b/engines/kyra/graphics/screen.h
@@ -366,6 +366,8 @@ private:
 	void processColorMap() override;
 };
 
+#ifdef ENABLE_LOL
+
 class ChineseOneByteFontLoL final : public ChineseFont {
 public:
 	ChineseOneByteFontLoL(int pitch) : ChineseFont(pitch, 8, 14, 8, 16, 0, 0) { _pixelColorShading = false; }
@@ -388,6 +390,8 @@ private:
 	void processColorMap() override;
 };
 
+#endif
+
 class ChineseOneByteFontHOF final : public ChineseFont {
 public:
 	ChineseOneByteFontHOF(int pitch) : ChineseFont(pitch, 8, 14, 9, 15, 0, 0) {}