diff options
25 files changed, 76 insertions, 12 deletions
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 2e7eb9cb5e..dd52f42abc 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -25,6 +25,8 @@ +#ifdef ENABLE_AGOS2 + #include "common/endian.h" #include "common/events.h" #include "common/file.h" @@ -542,3 +544,5 @@ MoviePlayer *makeMoviePlayer(AGOSEngine_Feeble *vm, const char *name) { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/animation.h b/engines/agos/animation.h index 3ce6aa9ab2..f0a975f1d4 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_AGOS2 + #ifndef AGOS_ANIMATION_H #define AGOS_ANIMATION_H @@ -112,3 +114,5 @@ MoviePlayer *makeMoviePlayer(AGOSEngine_Feeble *vm, const char *name); } // End of namespace AGOS #endif + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/feeble.cpp b/engines/agos/feeble.cpp index 89b6f6da27..7dbeacd62f 100644 --- a/engines/agos/feeble.cpp +++ b/engines/agos/feeble.cpp @@ -23,6 +23,10 @@ * */ + + +#ifdef ENABLE_AGOS2 + #include "common/config-manager.h" #include "agos/intern.h" @@ -383,3 +387,5 @@ void AGOSEngine_FeebleDemo::waitForSpace() { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index e7192ea2ec..b0ecc679c0 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -25,6 +25,8 @@ +#ifdef ENABLE_AGOS2 + #include "common/savefile.h" #include "common/system.h" @@ -520,3 +522,5 @@ void AGOSEngine_Feeble::windowBackSpace(WindowBlock *window) { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/pn.cpp b/engines/agos/pn.cpp index e8135f56cd..6a8dba47f1 100644 --- a/engines/agos/pn.cpp +++ b/engines/agos/pn.cpp @@ -298,4 +298,4 @@ void AGOSEngine_PN::setqptrs() { } // End of namespace AGOS -#endif +#endif // ENABLE_PN diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index f20086b268..c1cc8ca9a0 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -25,6 +25,8 @@ +#ifdef ENABLE_AGOS2 + #include "common/system.h" #include "agos/animation.h" @@ -675,3 +677,5 @@ void AGOSEngine_Feeble::off_b3NotZero() { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index 2885781a9f..9dba3d305d 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -1120,4 +1120,4 @@ void AGOSEngine_PN::popstack(int type) { } // End of namespace AGOS -#endif +#endif // ENABLE_PN diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp index 7c83165274..3fbfd43afd 100644 --- a/engines/agos/script_pp.cpp +++ b/engines/agos/script_pp.cpp @@ -25,6 +25,8 @@ +#ifdef ENABLE_AGOS2 + #include "common/system.h" #include "agos/agos.h" @@ -457,3 +459,5 @@ void AGOSEngine_PuzzlePack::opp_restartClock() { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index 694aa3ba28..a92be159e7 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -25,6 +25,8 @@ +#ifdef ENABLE_AGOS2 + #include "agos/agos.h" #include "agos/intern.h" @@ -486,3 +488,5 @@ void AGOSEngine_PuzzlePack::startAnOverlayAnim() { } } // End of namespace AGOS + +#endif // ENABLE_AGOS2 diff --git a/engines/agos/vga_pn.cpp b/engines/agos/vga_pn.cpp index 54326e277c..27152ef2dd 100644 --- a/engines/agos/vga_pn.cpp +++ b/engines/agos/vga_pn.cpp @@ -220,4 +220,4 @@ void AGOSEngine_PN::clearVideoWindow(uint16 num, uint16 color) { } // End of namespace AGOS -#endif +#endif // ENABLE_PN diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 0cc4419778..2ca17161db 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" @@ -103,3 +103,5 @@ void MoviePlayer::setPalette(byte *pal) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 39f03960c4..cf5d054ead 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -23,7 +23,7 @@ * */ -#ifndef SCUMM_HE_ANIMATION_H +#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE) #define SCUMM_HE_ANIMATION_H #include "common/file.h" diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 39615edb6a..a284632fb1 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -23,6 +23,7 @@ * */ +#ifdef ENABLE_HE #include "common/system.h" #include "sound/audiostream.h" @@ -521,3 +522,5 @@ void CUP_Player::handleTOIL(Common::SeekableReadStream &dataStream, uint32 dataS } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index d3578e2189..491b91c17e 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/floodfill_he.h" #include "scumm/he/intern_he.h" @@ -293,3 +293,5 @@ void Wiz::fillWizFlood(const WizParameters *params) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index a24f4d4665..b7d2c9264c 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/intern_he.h" #include "scumm/he/logic_he.h" @@ -1058,3 +1058,5 @@ int LogicHEmoonbase::versionID() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index 29304b7468..f5ecdd429a 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -26,8 +26,6 @@ #if !defined(SCUMM_HE_LOGIC_HE_H) && defined(ENABLE_HE) #define SCUMM_HE_LOGIC_HE_H - - namespace Scumm { class ScummEngine_v90he; diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index d055b77ee2..7fe04f223e 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -8,6 +8,7 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -22,6 +23,7 @@ * */ +#ifdef ENABLE_HE #include "common/system.h" #include "scumm/scumm.h" @@ -317,3 +319,5 @@ void ScummEngine_v99he::updatePalette() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 84fec085cc..44a38401ce 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/system.h" #include "scumm/actor.h" @@ -3014,3 +3016,5 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v71he.cpp b/engines/scumm/he/script_v71he.cpp index c832d64316..46a8868949 100644 --- a/engines/scumm/he/script_v71he.cpp +++ b/engines/scumm/he/script_v71he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "scumm/actor.h" #include "scumm/he/intern_he.h" #include "scumm/scumm.h" @@ -446,3 +448,5 @@ void ScummEngine_v71he::o71_polygonHit() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 6224ef5b47..1d73f0da76 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" @@ -2043,3 +2045,5 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index d7e36106ea..5b10944899 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/config-file.h" #include "common/config-manager.h" #include "common/savefile.h" @@ -529,3 +531,5 @@ void ScummEngine_v80he::o80_pickVarRandom() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index 2da58b4480..be20a229f0 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/he/animation_he.h" @@ -2353,3 +2355,5 @@ void ScummEngine_v90he::o90_kernelSetFunctions() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 67248f4c22..01f29d5db9 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -23,7 +23,6 @@ * */ - #include "scumm/actor.h" #include "scumm/file.h" #include "scumm/imuse/imuse.h" diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index aed03f746b..5f751d8285 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/intern_he.h" #include "scumm/resource.h" @@ -1442,3 +1442,5 @@ void Sprite::saveOrLoadSpriteData(Serializer *s) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 6b1db38b23..549877090c 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "common/system.h" #include "graphics/cursorman.h" @@ -2405,3 +2405,5 @@ int ScummEngine_v90he::computeWizHistogram(int resNum, int state, int x, int y, } } // End of namespace Scumm + +#endif // ENABLE_HE |