[Scummvm-git-logs] scummvm master -> d2d4ca9d35913d9a3450eef60e1e5b5baa0dcea8
fracturehill
76959842+fracturehill at users.noreply.github.com
Thu Apr 1 18:27:01 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
57cd69b9c0 NANCY: Call correct cheat menu
97b4ef1301 NANCY: Fix console commands
85f8bf294d NANCY: Includes cleanup
d2d4ca9d35 NANCY: Remove nonexistent BOOT chunks
Commit: 57cd69b9c0a1cc6e22b7d39263205a1f89b69622
https://github.com/scummvm/scummvm/commit/57cd69b9c0a1cc6e22b7d39263205a1f89b69622
Author: fracturehill (strahy at outlook.com)
Date: 2021-04-01T21:25:31+03:00
Commit Message:
NANCY: Call correct cheat menu
Fixed an issue where the incorrect cheat menu would get called.
Changed paths:
engines/nancy/nancy.cpp
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index f37fb3272a..13f333377f 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -222,7 +222,8 @@ void NancyEngine::setMouseEnabled(bool enabled) {
}
void NancyEngine::callCheatMenu(bool eventFlags) {
- setState(NancyState::kCheat), _cheatTypeIsEventFlag = eventFlags;
+ _cheatTypeIsEventFlag = eventFlags;
+ setState(NancyState::kCheat);
}
Common::Error NancyEngine::run() {
Commit: 97b4ef1301524d52991fccaceea2f85cb51dc2ac
https://github.com/scummvm/scummvm/commit/97b4ef1301524d52991fccaceea2f85cb51dc2ac
Author: fracturehill (strahy at outlook.com)
Date: 2021-04-01T21:25:31+03:00
Commit Message:
NANCY: Fix console commands
Fixed the play_video and show_image console commands, which were using the wrong pixel format and drawing broken colors.
Changed paths:
engines/nancy/console.cpp
engines/nancy/graphics.cpp
engines/nancy/graphics.h
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index b2eeb71c34..636703419d 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -63,7 +63,6 @@ void NancyConsole::postEnter() {
if (dec->loadFile(_videoFile)) {
dec->start();
- g_system->fillScreen(0);
Common::EventManager *ev = g_system->getEventManager();
while (!g_nancy->shouldQuit() && !dec->endOfVideo()) {
Common::Event event;
@@ -76,8 +75,7 @@ void NancyConsole::postEnter() {
if (dec->needsUpdate()) {
const Graphics::Surface *frame = dec->decodeNextFrame();
if (frame) {
- g_system->copyRectToScreen(frame->getPixels(), frame->pitch, 0, 0, frame->w, frame->h);
- g_system->updateScreen();
+ g_nancy->_graphicsManager->debugDrawToScreen(*frame);
}
}
@@ -96,9 +94,7 @@ void NancyConsole::postEnter() {
if (!_imageFile.empty()) {
Graphics::Surface surf;
if (g_nancy->_resource->loadImage(_imageFile, surf)) {
- g_system->fillScreen(0);
- g_system->copyRectToScreen(surf.getPixels(), surf.pitch, 0, 0, surf.w > 640 ? 640 : surf.w, surf.h > 480 ? 480 : surf.h);
- g_system->updateScreen();
+ g_nancy->_graphicsManager->debugDrawToScreen(surf);
surf.free();
Common::EventManager *ev = g_system->getEventManager();
diff --git a/engines/nancy/graphics.cpp b/engines/nancy/graphics.cpp
index 3082114680..5e8054f9d8 100644
--- a/engines/nancy/graphics.cpp
+++ b/engines/nancy/graphics.cpp
@@ -219,6 +219,11 @@ void GraphicsManager::copyToManaged(void *src, Graphics::ManagedSurface &dst, ui
copyToManaged(surf, dst, verticalFlip, doubleSize);
}
+void GraphicsManager::debugDrawToScreen(const Graphics::Surface &surf) {
+ _screen.blitFrom(surf, Common::Point());
+ _screen.update();
+}
+
const Graphics::PixelFormat &GraphicsManager::getInputPixelFormat() {
if (g_nancy->getGameFlags() & NGF_8BITCOLOR) {
return _clut8Format;
diff --git a/engines/nancy/graphics.h b/engines/nancy/graphics.h
index bd236595de..af2cd03842 100644
--- a/engines/nancy/graphics.h
+++ b/engines/nancy/graphics.h
@@ -58,6 +58,9 @@ public:
static void copyToManaged(const Graphics::Surface &src, Graphics::ManagedSurface &dst, bool verticalFlip = false, bool doubleSize = false);
static void copyToManaged(void *src, Graphics::ManagedSurface &dst, uint srcW, uint srcH, const Graphics::PixelFormat &format, bool verticalFlip = false, bool doubleSize = false);
+ // Debug
+ void debugDrawToScreen(const Graphics::Surface &surf);
+
Graphics::ManagedSurface _object0;
Graphics::PixelFormat _screenPixelFormat;
Commit: 85f8bf294de821f85046a7b249c6ebfc6cbc51f2
https://github.com/scummvm/scummvm/commit/85f8bf294de821f85046a7b249c6ebfc6cbc51f2
Author: fracturehill (strahy at outlook.com)
Date: 2021-04-01T21:25:32+03:00
Commit Message:
NANCY: Includes cleanup
Reordered and cleaned up #includes in the engine.
Changed paths:
engines/nancy/action/actionmanager.cpp
engines/nancy/action/actionmanager.h
engines/nancy/action/actionrecord.h
engines/nancy/action/arfactory.cpp
engines/nancy/action/leverpuzzle.cpp
engines/nancy/action/leverpuzzle.h
engines/nancy/action/orderingpuzzle.cpp
engines/nancy/action/orderingpuzzle.h
engines/nancy/action/passwordpuzzle.cpp
engines/nancy/action/passwordpuzzle.h
engines/nancy/action/primaryvideo.cpp
engines/nancy/action/primaryvideo.h
engines/nancy/action/recordtypes.cpp
engines/nancy/action/recordtypes.h
engines/nancy/action/rotatinglockpuzzle.cpp
engines/nancy/action/rotatinglockpuzzle.h
engines/nancy/action/secondarymovie.cpp
engines/nancy/action/secondarymovie.h
engines/nancy/action/secondaryvideo.cpp
engines/nancy/action/secondaryvideo.h
engines/nancy/action/sliderpuzzle.cpp
engines/nancy/action/sliderpuzzle.h
engines/nancy/action/staticbitmapanim.cpp
engines/nancy/action/staticbitmapanim.h
engines/nancy/action/telephone.cpp
engines/nancy/action/telephone.h
engines/nancy/cheat.cpp
engines/nancy/cheat.h
engines/nancy/commontypes.cpp
engines/nancy/commontypes.h
engines/nancy/console.cpp
engines/nancy/console.h
engines/nancy/cursor.cpp
engines/nancy/decompress.cpp
engines/nancy/font.cpp
engines/nancy/graphics.cpp
engines/nancy/graphics.h
engines/nancy/iff.cpp
engines/nancy/iff.h
engines/nancy/input.cpp
engines/nancy/input.h
engines/nancy/nancy.cpp
engines/nancy/renderobject.cpp
engines/nancy/renderobject.h
engines/nancy/resource.cpp
engines/nancy/resource.h
engines/nancy/sound.cpp
engines/nancy/sound.h
engines/nancy/state/credits.cpp
engines/nancy/state/credits.h
engines/nancy/state/help.cpp
engines/nancy/state/help.h
engines/nancy/state/logo.cpp
engines/nancy/state/logo.h
engines/nancy/state/map.cpp
engines/nancy/state/map.h
engines/nancy/state/scene.cpp
engines/nancy/state/scene.h
engines/nancy/ui/button.cpp
engines/nancy/ui/fullscreenimage.cpp
engines/nancy/ui/inventorybox.cpp
engines/nancy/ui/inventorybox.h
engines/nancy/ui/scrollbar.cpp
engines/nancy/ui/textbox.cpp
engines/nancy/ui/textbox.h
engines/nancy/ui/viewport.cpp
engines/nancy/ui/viewport.h
engines/nancy/video.cpp
diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp
index 5ee87eca0c..3fcd82214f 100644
--- a/engines/nancy/action/actionmanager.cpp
+++ b/engines/nancy/action/actionmanager.cpp
@@ -20,17 +20,16 @@
*
*/
-#include "engines/nancy/action/actionmanager.h"
-
-
-#include "engines/nancy/state/scene.h"
+#include "common/serializer.h"
#include "engines/nancy/nancy.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/input.h"
#include "engines/nancy/sound.h"
-#include "common/serializer.h"
+#include "engines/nancy/action/actionmanager.h"
+#include "engines/nancy/action/actionrecord.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/actionmanager.h b/engines/nancy/action/actionmanager.h
index 72d00031a1..6075112d41 100644
--- a/engines/nancy/action/actionmanager.h
+++ b/engines/nancy/action/actionmanager.h
@@ -23,7 +23,7 @@
#ifndef NANCY_ACTION_ACTIONMANAGER_H
#define NANCY_ACTION_ACTIONMANAGER_H
-#include "engines/nancy/action/actionrecord.h"
+#include "common/array.h"
namespace Common {
class Serializer;
@@ -41,6 +41,8 @@ class Scene;
namespace Action {
+class ActionRecord;
+
// The class that handles ActionRecords and their execution
class ActionManager {
friend class Nancy::State::Scene;
diff --git a/engines/nancy/action/actionrecord.h b/engines/nancy/action/actionrecord.h
index ade79841bb..275339dc98 100644
--- a/engines/nancy/action/actionrecord.h
+++ b/engines/nancy/action/actionrecord.h
@@ -23,8 +23,6 @@
#ifndef NANCY_ACTION_ACTIONRECORD_H
#define NANCY_ACTION_ACTIONRECORD_H
-#include "common/str.h"
-
#include "engines/nancy/time.h"
#include "engines/nancy/cursor.h"
diff --git a/engines/nancy/action/arfactory.cpp b/engines/nancy/action/arfactory.cpp
index a981639111..52cfc84b28 100644
--- a/engines/nancy/action/arfactory.cpp
+++ b/engines/nancy/action/arfactory.cpp
@@ -20,9 +20,7 @@
*
*/
-#include "engines/nancy/action/actionmanager.h"
#include "engines/nancy/action/recordtypes.h"
-#include "engines/nancy/action/actionrecord.h"
#include "engines/nancy/action/primaryvideo.h"
#include "engines/nancy/action/secondaryvideo.h"
#include "engines/nancy/action/secondarymovie.h"
diff --git a/engines/nancy/action/leverpuzzle.cpp b/engines/nancy/action/leverpuzzle.cpp
index e63ca730d5..b15d1c383f 100644
--- a/engines/nancy/action/leverpuzzle.cpp
+++ b/engines/nancy/action/leverpuzzle.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "engines/nancy/action/leverpuzzle.h"
-
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/leverpuzzle.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/leverpuzzle.h b/engines/nancy/action/leverpuzzle.h
index 1afcf131b8..0bc5b6e677 100644
--- a/engines/nancy/action/leverpuzzle.h
+++ b/engines/nancy/action/leverpuzzle.h
@@ -23,10 +23,9 @@
#ifndef NANCY_ACTION_LEVERPUZZLE_H
#define NANCY_ACTION_LEVERPUZZLE_H
-#include "engines/nancy/action/actionrecord.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/orderingpuzzle.cpp b/engines/nancy/action/orderingpuzzle.cpp
index 7f23e2df8b..14b0a55afd 100644
--- a/engines/nancy/action/orderingpuzzle.cpp
+++ b/engines/nancy/action/orderingpuzzle.cpp
@@ -20,17 +20,16 @@
*
*/
-#include "engines/nancy/action/orderingpuzzle.h"
-
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/input.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/sound.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/orderingpuzzle.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/orderingpuzzle.h b/engines/nancy/action/orderingpuzzle.h
index df58833e19..3624c63dfe 100644
--- a/engines/nancy/action/orderingpuzzle.h
+++ b/engines/nancy/action/orderingpuzzle.h
@@ -23,10 +23,9 @@
#ifndef NANCY_ACTION_ORDERINGPUZZLE_H
#define NANCY_ACTION_ORDERINGPUZZLE_H
-#include "engines/nancy/action/actionrecord.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/passwordpuzzle.cpp b/engines/nancy/action/passwordpuzzle.cpp
index 73f131e37b..dcf4a27f28 100644
--- a/engines/nancy/action/passwordpuzzle.cpp
+++ b/engines/nancy/action/passwordpuzzle.cpp
@@ -20,16 +20,15 @@
*
*/
-#include "engines/nancy/action/passwordpuzzle.h"
-
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/nancy.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/passwordpuzzle.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/passwordpuzzle.h b/engines/nancy/action/passwordpuzzle.h
index ff1531f5a4..8732455ee0 100644
--- a/engines/nancy/action/passwordpuzzle.h
+++ b/engines/nancy/action/passwordpuzzle.h
@@ -23,10 +23,9 @@
#ifndef NANCY_ACTION_PASSWORDPUZZLE_H
#define NANCY_ACTION_PASSWORDPUZZLE_H
-#include "engines/nancy/action/actionrecord.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/primaryvideo.cpp b/engines/nancy/action/primaryvideo.cpp
index 5e9d821ab6..0f106fe0a0 100644
--- a/engines/nancy/action/primaryvideo.cpp
+++ b/engines/nancy/action/primaryvideo.cpp
@@ -20,18 +20,17 @@
*
*/
-#include "engines/nancy/action/primaryvideo.h"
-
#include "common/random.h"
-#include "engines/nancy/action/responses.cpp"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/util.h"
+#include "engines/nancy/action/primaryvideo.h"
+#include "engines/nancy/action/responses.cpp"
+
+#include "engines/nancy/state/scene.h"
+
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/primaryvideo.h b/engines/nancy/action/primaryvideo.h
index b669cccf2b..966d3c2798 100644
--- a/engines/nancy/action/primaryvideo.h
+++ b/engines/nancy/action/primaryvideo.h
@@ -23,11 +23,10 @@
#ifndef NANCY_ACTION_PRIMARYVIDEO_H
#define NANCY_ACTION_PRIMARYVIDEO_H
-#include "engines/nancy/action/actionrecord.h"
+#include "engines/nancy/video.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/video.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
diff --git a/engines/nancy/action/recordtypes.cpp b/engines/nancy/action/recordtypes.cpp
index ebe4a48364..4794a1e502 100644
--- a/engines/nancy/action/recordtypes.cpp
+++ b/engines/nancy/action/recordtypes.cpp
@@ -20,20 +20,16 @@
*
*/
-#include "engines/nancy/action/recordtypes.h"
-
-#include "engines/nancy/action/actionrecord.h"
-#include "engines/nancy/action/responses.cpp"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
-#include "engines/nancy/graphics.h"
#include "engines/nancy/sound.h"
-#include "engines/nancy/input.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/util.h"
+#include "engines/nancy/action/recordtypes.h"
+#include "engines/nancy/action/responses.cpp"
+
+#include "engines/nancy/state/scene.h"
+
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/recordtypes.h b/engines/nancy/action/recordtypes.h
index 1fa4077ae5..437d5be446 100644
--- a/engines/nancy/action/recordtypes.h
+++ b/engines/nancy/action/recordtypes.h
@@ -23,10 +23,10 @@
#ifndef NANCY_ACTION_RECORDTYPES_H
#define NANCY_ACTION_RECORDTYPES_H
-#include "engines/nancy/action/actionrecord.h"
+#include "engines/nancy/commontypes.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
diff --git a/engines/nancy/action/rotatinglockpuzzle.cpp b/engines/nancy/action/rotatinglockpuzzle.cpp
index 2a039dcdcd..c6f158464a 100644
--- a/engines/nancy/action/rotatinglockpuzzle.cpp
+++ b/engines/nancy/action/rotatinglockpuzzle.cpp
@@ -20,18 +20,18 @@
*
*/
-#include "engines/nancy/action/rotatinglockpuzzle.h"
-
#include "common/random.h"
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/rotatinglockpuzzle.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/rotatinglockpuzzle.h b/engines/nancy/action/rotatinglockpuzzle.h
index 82522b1c34..a578f51c22 100644
--- a/engines/nancy/action/rotatinglockpuzzle.h
+++ b/engines/nancy/action/rotatinglockpuzzle.h
@@ -23,10 +23,9 @@
#ifndef NANCY_ACTION_ROTATINGLOCKPUZZLE_H
#define NANCY_ACTION_ROTATINGLOCKPUZZLE_H
-#include "engines/nancy/action/actionrecord.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/secondarymovie.cpp b/engines/nancy/action/secondarymovie.cpp
index a64be98b15..d8ae742609 100644
--- a/engines/nancy/action/secondarymovie.cpp
+++ b/engines/nancy/action/secondarymovie.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "engines/nancy/action/secondarymovie.h"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/graphics.h"
#include "engines/nancy/nancy.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/sound.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/secondarymovie.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/secondarymovie.h b/engines/nancy/action/secondarymovie.h
index 581aedc3ab..dd58122ae8 100644
--- a/engines/nancy/action/secondarymovie.h
+++ b/engines/nancy/action/secondarymovie.h
@@ -23,11 +23,11 @@
#ifndef NANCY_ACTION_SECONDARYMOVIE_H
#define NANCY_ACTION_SECONDARYMOVIE_H
-#include "engines/nancy/action/actionrecord.h"
-#include "engines/nancy/renderobject.h"
-
#include "engines/nancy/video.h"
#include "engines/nancy/commontypes.h"
+#include "engines/nancy/renderobject.h"
+
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/secondaryvideo.cpp b/engines/nancy/action/secondaryvideo.cpp
index 68397f9bdd..490528cf06 100644
--- a/engines/nancy/action/secondaryvideo.cpp
+++ b/engines/nancy/action/secondaryvideo.cpp
@@ -20,17 +20,14 @@
*
*/
-#include "engines/nancy/action/secondaryvideo.h"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
-#include "engines/nancy/util.h"
-#include "engines/nancy/sound.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/input.h"
#include "engines/nancy/graphics.h"
-#include "engines/nancy/sound.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/secondaryvideo.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/secondaryvideo.h b/engines/nancy/action/secondaryvideo.h
index 85bc25d9f2..475ca21cb7 100644
--- a/engines/nancy/action/secondaryvideo.h
+++ b/engines/nancy/action/secondaryvideo.h
@@ -23,11 +23,11 @@
#ifndef NANCY_ACTION_SECONDARYVIDEO_H
#define NANCY_ACTION_SECONDARYVIDEO_H
-#include "engines/nancy/action/actionrecord.h"
-#include "engines/nancy/renderobject.h"
-
#include "engines/nancy/video.h"
#include "engines/nancy/commontypes.h"
+#include "engines/nancy/renderobject.h"
+
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/sliderpuzzle.cpp b/engines/nancy/action/sliderpuzzle.cpp
index fb9ae27012..6f2853eab6 100644
--- a/engines/nancy/action/sliderpuzzle.cpp
+++ b/engines/nancy/action/sliderpuzzle.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "engines/nancy/action/sliderpuzzle.h"
-
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/action/sliderpuzzle.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/sliderpuzzle.h b/engines/nancy/action/sliderpuzzle.h
index 1a70ea27bc..2d8d311de8 100644
--- a/engines/nancy/action/sliderpuzzle.h
+++ b/engines/nancy/action/sliderpuzzle.h
@@ -23,10 +23,10 @@
#ifndef NANCY_ACTION_SLIDERPUZZLE_H
#define NANCY_ACTION_SLIDERPUZZLE_H
-#include "engines/nancy/action/actionrecord.h"
+#include "engines/nancy/commontypes.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Common {
class Serializer;
diff --git a/engines/nancy/action/staticbitmapanim.cpp b/engines/nancy/action/staticbitmapanim.cpp
index 28a54297d6..4e041b7d56 100644
--- a/engines/nancy/action/staticbitmapanim.cpp
+++ b/engines/nancy/action/staticbitmapanim.cpp
@@ -20,17 +20,15 @@
*
*/
-#include "engines/nancy/action/staticbitmapanim.h"
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/sound.h"
+#include "engines/nancy/resource.h"
+#include "engines/nancy/util.h"
-#include "common/rational.h"
+#include "engines/nancy/action/staticbitmapanim.h"
#include "engines/nancy/state/scene.h"
-#include "engines/nancy/sound.h"
-#include "engines/nancy/nancy.h"
-#include "engines/nancy/util.h"
-#include "engines/nancy/resource.h"
-
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/staticbitmapanim.h b/engines/nancy/action/staticbitmapanim.h
index 87e9dce511..ad878c96d5 100644
--- a/engines/nancy/action/staticbitmapanim.h
+++ b/engines/nancy/action/staticbitmapanim.h
@@ -23,10 +23,10 @@
#ifndef NANCY_ACTION_STATICBITMAPANIM_H
#define NANCY_ACTION_STATICBITMAPANIM_H
-#include "engines/nancy/action/actionrecord.h"
+#include "engines/nancy/commontypes.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/telephone.cpp b/engines/nancy/action/telephone.cpp
index a98b014fc4..df5febc81e 100644
--- a/engines/nancy/action/telephone.cpp
+++ b/engines/nancy/action/telephone.cpp
@@ -20,20 +20,16 @@
*
*/
-#include "engines/nancy/action/telephone.h"
-
-#include "engines/nancy/state/scene.h"
-
-#include "engines/nancy/ui/textbox.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/sound.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+#include "engines/nancy/action/telephone.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/action/telephone.h b/engines/nancy/action/telephone.h
index e6009515ae..bed411d303 100644
--- a/engines/nancy/action/telephone.h
+++ b/engines/nancy/action/telephone.h
@@ -23,10 +23,10 @@
#ifndef NANCY_ACTION_TELEPHONE_H
#define NANCY_ACTION_TELEPHONE_H
-#include "engines/nancy/action/actionrecord.h"
+#include "engines/nancy/commontypes.h"
#include "engines/nancy/renderobject.h"
-#include "engines/nancy/commontypes.h"
+#include "engines/nancy/action/actionrecord.h"
namespace Nancy {
namespace Action {
diff --git a/engines/nancy/cheat.cpp b/engines/nancy/cheat.cpp
index ca6d56d7a2..b89432b9d4 100644
--- a/engines/nancy/cheat.cpp
+++ b/engines/nancy/cheat.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "engines/nancy/cheat.h"
-
#include "common/winexe.h"
#include "common/translation.h"
#include "common/stream.h"
@@ -30,6 +28,8 @@
#include "gui/widgets/edittext.h"
#include "engines/nancy/iff.h"
+#include "engines/nancy/cheat.h"
+
#include "engines/nancy/state/scene.h"
namespace Nancy {
diff --git a/engines/nancy/cheat.h b/engines/nancy/cheat.h
index e40b98beaa..9f7321c622 100644
--- a/engines/nancy/cheat.h
+++ b/engines/nancy/cheat.h
@@ -25,9 +25,6 @@
#include "gui/dialog.h"
-#include "common/str.h"
-#include "common/array.h"
-
namespace GUI {
class EditTextWidget;
class CheckboxWidget;
diff --git a/engines/nancy/commontypes.cpp b/engines/nancy/commontypes.cpp
index a6c358d370..3708e4b6cb 100644
--- a/engines/nancy/commontypes.cpp
+++ b/engines/nancy/commontypes.cpp
@@ -21,10 +21,8 @@
*/
#include "engines/nancy/commontypes.h"
-
-#include "common/stream.h"
-
#include "engines/nancy/util.h"
+
#include "engines/nancy/state/scene.h"
namespace Nancy {
diff --git a/engines/nancy/commontypes.h b/engines/nancy/commontypes.h
index 41a3d46db5..09b185701a 100644
--- a/engines/nancy/commontypes.h
+++ b/engines/nancy/commontypes.h
@@ -24,7 +24,6 @@
#define NANCY_COMMONYPES_H
#include "common/rect.h"
-#include "common/str.h"
namespace Common {
class SeekableReadStream;
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index 636703419d..68d82c3903 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -20,22 +20,21 @@
*
*/
-#include "engines/nancy/console.h"
-
#include "common/system.h"
#include "common/events.h"
#include "audio/audiostream.h"
#include "engines/nancy/nancy.h"
+#include "engines/nancy/console.h"
#include "engines/nancy/resource.h"
-#include "engines/nancy/video.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/iff.h"
-#include "engines/nancy/state/scene.h"
#include "engines/nancy/input.h"
#include "engines/nancy/graphics.h"
+#include "engines/nancy/state/scene.h"
+
namespace Nancy {
NancyConsole::NancyConsole() : GUI::Debugger() {
diff --git a/engines/nancy/console.h b/engines/nancy/console.h
index 38a35fadb4..efdc0aa2f2 100644
--- a/engines/nancy/console.h
+++ b/engines/nancy/console.h
@@ -25,8 +25,6 @@
#include "gui/debugger.h"
-#include "common/str.h"
-
namespace Nancy {
class NancyEngine;
diff --git a/engines/nancy/cursor.cpp b/engines/nancy/cursor.cpp
index 11395f3894..f302170bc4 100644
--- a/engines/nancy/cursor.cpp
+++ b/engines/nancy/cursor.cpp
@@ -20,11 +20,10 @@
*
*/
-#include "engines/nancy/cursor.h"
-
#include "graphics/cursorman.h"
#include "engines/nancy/nancy.h"
+#include "engines/nancy/cursor.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/util.h"
diff --git a/engines/nancy/decompress.cpp b/engines/nancy/decompress.cpp
index cc3b6e2c12..59d9a97838 100644
--- a/engines/nancy/decompress.cpp
+++ b/engines/nancy/decompress.cpp
@@ -20,11 +20,11 @@
*
*/
-#include "engines/nancy/decompress.h"
-
#include "common/memstream.h"
#include "common/textconsole.h"
+#include "engines/nancy/decompress.h"
+
namespace Nancy {
void Decompressor::init(Common::ReadStream &input, Common::WriteStream &output) {
diff --git a/engines/nancy/font.cpp b/engines/nancy/font.cpp
index 820dbb08ec..b024381d31 100644
--- a/engines/nancy/font.cpp
+++ b/engines/nancy/font.cpp
@@ -21,11 +21,10 @@
*/
#include "engines/nancy/font.h"
-
-#include "engines/nancy/util.h"
#include "engines/nancy/nancy.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/graphics.h"
+#include "engines/nancy/util.h"
namespace Nancy {
diff --git a/engines/nancy/graphics.cpp b/engines/nancy/graphics.cpp
index 5e8054f9d8..6b512146e4 100644
--- a/engines/nancy/graphics.cpp
+++ b/engines/nancy/graphics.cpp
@@ -20,15 +20,14 @@
*
*/
-#include "engines/nancy/graphics.h"
-
#include "image/bmp.h"
#include "engines/util.h"
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/graphics.h"
#include "engines/nancy/renderobject.h"
#include "engines/nancy/resource.h"
-#include "engines/nancy/nancy.h"
namespace Nancy {
diff --git a/engines/nancy/graphics.h b/engines/nancy/graphics.h
index af2cd03842..1ae03ae01d 100644
--- a/engines/nancy/graphics.h
+++ b/engines/nancy/graphics.h
@@ -23,8 +23,6 @@
#ifndef NANCY_GRAPHICS_H
#define NANCY_GRAPHICS_H
-#include "common/array.h"
-
#include "graphics/screen.h"
#include "engines/nancy/font.h"
diff --git a/engines/nancy/iff.cpp b/engines/nancy/iff.cpp
index 5ee28123d5..0aaa13d2e7 100644
--- a/engines/nancy/iff.cpp
+++ b/engines/nancy/iff.cpp
@@ -20,12 +20,11 @@
*
*/
-#include "engines/nancy/iff.h"
-
#include "common/memstream.h"
#include "common/iff_container.h"
#include "engines/nancy/nancy.h"
+#include "engines/nancy/iff.h"
#include "engines/nancy/resource.h"
namespace Nancy {
diff --git a/engines/nancy/iff.h b/engines/nancy/iff.h
index e297b5b217..4e4425f00c 100644
--- a/engines/nancy/iff.h
+++ b/engines/nancy/iff.h
@@ -24,7 +24,6 @@
#define NANCY_IFF_H
#include "common/array.h"
-#include "common/str.h"
namespace Common {
struct IFFChunk;
diff --git a/engines/nancy/input.cpp b/engines/nancy/input.cpp
index c41579a317..bba54a3dcd 100644
--- a/engines/nancy/input.cpp
+++ b/engines/nancy/input.cpp
@@ -20,17 +20,15 @@
*
*/
-#include "engines/nancy/input.h"
-
-#include "engines/nancy/nancy.h"
-
#include "common/translation.h"
-#include "common/events.h"
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymap.h"
#include "backends/keymapper/standard-actions.h"
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/input.h"
+
namespace Nancy {
void InputManager::processEvents() {
diff --git a/engines/nancy/input.h b/engines/nancy/input.h
index d53a3f06b1..29b96cc75d 100644
--- a/engines/nancy/input.h
+++ b/engines/nancy/input.h
@@ -24,7 +24,6 @@
#define NANCY_INPUT_H
#include "common/rect.h"
-#include "common/array.h"
#include "common/keyboard.h"
namespace Common {
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index 13f333377f..17d253925f 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -20,35 +20,31 @@
*
*/
-#include "engines/nancy/nancy.h"
-
#include "common/system.h"
#include "common/random.h"
#include "common/debug-channels.h"
#include "common/config-manager.h"
#include "common/memstream.h"
#include "common/installshield_cab.h"
-#include "common/savefile.h"
#include "common/serializer.h"
-#include "engines/nancy/state/logo.h"
-#include "engines/nancy/state/scene.h"
-#include "engines/nancy/state/help.h"
-#include "engines/nancy/state/map.h"
-#include "engines/nancy/state/credits.h"
-
+#include "engines/nancy/nancy.h"
#include "engines/nancy/resource.h"
#include "engines/nancy/iff.h"
-#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/graphics.h"
-#include "engines/nancy/cursor.h"
#include "engines/nancy/cheat.h"
#include "engines/nancy/console.h"
#include "engines/nancy/action/primaryvideo.h"
+#include "engines/nancy/state/logo.h"
+#include "engines/nancy/state/scene.h"
+#include "engines/nancy/state/help.h"
+#include "engines/nancy/state/map.h"
+#include "engines/nancy/state/credits.h"
+
namespace Nancy {
NancyEngine *g_nancy;
diff --git a/engines/nancy/renderobject.cpp b/engines/nancy/renderobject.cpp
index 9e3d418a2a..e29ea01db4 100644
--- a/engines/nancy/renderobject.cpp
+++ b/engines/nancy/renderobject.cpp
@@ -20,15 +20,12 @@
*
*/
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/graphics.h"
#include "engines/nancy/renderobject.h"
-#include "common/stream.h"
-
#include "engines/nancy/state/scene.h"
-#include "engines/nancy/nancy.h"
-#include "engines/nancy/graphics.h"
-
namespace Nancy {
void RenderObject::init() {
diff --git a/engines/nancy/renderobject.h b/engines/nancy/renderobject.h
index a29b1e396c..1a7ec22640 100644
--- a/engines/nancy/renderobject.h
+++ b/engines/nancy/renderobject.h
@@ -23,8 +23,6 @@
#ifndef NANCY_RENDEROBJECT_H
#define NANCY_RENDEROBJECT_H
-#include "common/rect.h"
-
#include "graphics/managed_surface.h"
namespace Nancy {
diff --git a/engines/nancy/resource.cpp b/engines/nancy/resource.cpp
index d69f80e41c..e42caf5868 100644
--- a/engines/nancy/resource.cpp
+++ b/engines/nancy/resource.cpp
@@ -20,15 +20,14 @@
*
*/
-#include "engines/nancy/resource.h"
-
#include "common/memstream.h"
#include "image/bmp.h"
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/resource.h"
#include "engines/nancy/decompress.h"
#include "engines/nancy/graphics.h"
-#include "engines/nancy/nancy.h"
namespace Nancy {
diff --git a/engines/nancy/resource.h b/engines/nancy/resource.h
index ec015192be..fa33a7c1fe 100644
--- a/engines/nancy/resource.h
+++ b/engines/nancy/resource.h
@@ -23,7 +23,6 @@
#ifndef NANCY_RESOURCE_H
#define NANCY_RESOURCE_H
-#include "common/str.h"
#include "common/array.h"
namespace Graphics {
diff --git a/engines/nancy/sound.cpp b/engines/nancy/sound.cpp
index 39d219af27..78f956e88a 100644
--- a/engines/nancy/sound.cpp
+++ b/engines/nancy/sound.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "engines/nancy/sound.h"
-
#include "common/system.h"
#include "common/substream.h"
@@ -30,6 +28,7 @@
#include "audio/decoders/vorbis.h"
#include "engines/nancy/nancy.h"
+#include "engines/nancy/sound.h"
namespace Nancy {
diff --git a/engines/nancy/sound.h b/engines/nancy/sound.h
index 6a2e8e5cf8..9b3e5c273f 100644
--- a/engines/nancy/sound.h
+++ b/engines/nancy/sound.h
@@ -23,8 +23,6 @@
#ifndef NANCY_SOUND_H
#define NANCY_SOUND_H
-#include "common/str.h"
-
#include "audio/mixer.h"
namespace Common {
diff --git a/engines/nancy/state/credits.cpp b/engines/nancy/state/credits.cpp
index 351fd8afe4..2d8b41abf1 100644
--- a/engines/nancy/state/credits.cpp
+++ b/engines/nancy/state/credits.cpp
@@ -20,15 +20,15 @@
*
*/
-#include "engines/nancy/state/credits.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/resource.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
#include "engines/nancy/cursor.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/state/credits.h"
namespace Common {
DECLARE_SINGLETON(Nancy::State::Credits);
diff --git a/engines/nancy/state/credits.h b/engines/nancy/state/credits.h
index f3ffe6ec97..057930916a 100644
--- a/engines/nancy/state/credits.h
+++ b/engines/nancy/state/credits.h
@@ -25,13 +25,13 @@
#include "common/singleton.h"
+#include "engines/nancy/time.h"
+#include "engines/nancy/commontypes.h"
+
#include "engines/nancy/state/state.h"
#include "engines/nancy/ui/fullscreenimage.h"
-#include "engines/nancy/time.h"
-#include "engines/nancy/commontypes.h"
-
namespace Nancy {
namespace State {
diff --git a/engines/nancy/state/help.cpp b/engines/nancy/state/help.cpp
index bc4ae17849..ba8c03bb2a 100644
--- a/engines/nancy/state/help.cpp
+++ b/engines/nancy/state/help.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "engines/nancy/state/help.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
#include "engines/nancy/cursor.h"
#include "engines/nancy/util.h"
+#include "engines/nancy/state/help.h"
+
namespace Common {
DECLARE_SINGLETON(Nancy::State::Help);
}
diff --git a/engines/nancy/state/help.h b/engines/nancy/state/help.h
index 981728c1c1..bb76b8cb15 100644
--- a/engines/nancy/state/help.h
+++ b/engines/nancy/state/help.h
@@ -25,12 +25,12 @@
#include "common/singleton.h"
+#include "engines/nancy/commontypes.h"
+
#include "engines/nancy/state/state.h"
#include "engines/nancy/ui/fullscreenimage.h"
-#include "engines/nancy/commontypes.h"
-
namespace Nancy {
namespace State {
diff --git a/engines/nancy/state/logo.cpp b/engines/nancy/state/logo.cpp
index 8311c1ba97..56d80e627d 100644
--- a/engines/nancy/state/logo.cpp
+++ b/engines/nancy/state/logo.cpp
@@ -20,12 +20,12 @@
*
*/
-#include "engines/nancy/state/logo.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/state/logo.h"
+
namespace Common {
DECLARE_SINGLETON(Nancy::State::Logo);
}
diff --git a/engines/nancy/state/logo.h b/engines/nancy/state/logo.h
index f85c937e92..b780beacd3 100644
--- a/engines/nancy/state/logo.h
+++ b/engines/nancy/state/logo.h
@@ -25,10 +25,10 @@
#include "common/singleton.h"
-#include "engines/nancy/state/state.h"
-
#include "engines/nancy/commontypes.h"
+#include "engines/nancy/state/state.h"
+
#include "engines/nancy/ui/fullscreenimage.h"
namespace Nancy {
diff --git a/engines/nancy/state/map.cpp b/engines/nancy/state/map.cpp
index 0df8e3e350..b2f387562f 100644
--- a/engines/nancy/state/map.cpp
+++ b/engines/nancy/state/map.cpp
@@ -20,16 +20,15 @@
*
*/
-#include "engines/nancy/state/map.h"
-
-#include "engines/nancy/state/scene.h"
-
+#include "engines/nancy/nancy.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
-#include "engines/nancy/nancy.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/cursor.h"
#include "engines/nancy/graphics.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/state/map.h"
+#include "engines/nancy/state/scene.h"
namespace Common {
DECLARE_SINGLETON(Nancy::State::Map);
diff --git a/engines/nancy/state/map.h b/engines/nancy/state/map.h
index a04d3c96b7..8e807ca9f8 100644
--- a/engines/nancy/state/map.h
+++ b/engines/nancy/state/map.h
@@ -23,7 +23,6 @@
#ifndef NANCY_STATE_MAP_H
#define NANCY_STATE_MAP_H
-#include "common/array.h"
#include "common/singleton.h"
#include "engines/nancy/state/state.h"
@@ -31,8 +30,6 @@
#include "engines/nancy/ui/viewport.h"
#include "engines/nancy/ui/button.h"
-#include "engines/nancy/renderobject.h"
-
namespace Nancy {
class NancyEngine;
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index fcb8b44f66..695f88d235 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "engines/nancy/state/scene.h"
-
#include "common/serializer.h"
#include "common/config-manager.h"
@@ -33,6 +31,8 @@
#include "engines/nancy/cursor.h"
#include "engines/nancy/util.h"
+#include "engines/nancy/state/scene.h"
+
namespace Common {
DECLARE_SINGLETON(Nancy::State::Scene);
}
diff --git a/engines/nancy/state/scene.h b/engines/nancy/state/scene.h
index 6660b18f55..9ab6724e9b 100644
--- a/engines/nancy/state/scene.h
+++ b/engines/nancy/state/scene.h
@@ -25,13 +25,12 @@
#include "common/singleton.h"
-#include "engines/nancy/state/state.h"
-
-#include "engines/nancy/time.h"
#include "engines/nancy/commontypes.h"
#include "engines/nancy/action/actionmanager.h"
+#include "engines/nancy/state/state.h"
+
#include "engines/nancy/ui/fullscreenimage.h"
#include "engines/nancy/ui/viewport.h"
#include "engines/nancy/ui/textbox.h"
diff --git a/engines/nancy/ui/button.cpp b/engines/nancy/ui/button.cpp
index 66f1407ca5..4dd6d94dff 100644
--- a/engines/nancy/ui/button.cpp
+++ b/engines/nancy/ui/button.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "engines/nancy/ui/button.h"
-
-#include "engines/nancy/state/scene.h"
-
+#include "engines/nancy/nancy.h"
#include "engines/nancy/input.h"
#include "engines/nancy/cursor.h"
-#include "engines/nancy/nancy.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/sound.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/state/scene.h"
+
+#include "engines/nancy/ui/button.h"
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/fullscreenimage.cpp b/engines/nancy/ui/fullscreenimage.cpp
index 967a38b95d..dd1eec3231 100644
--- a/engines/nancy/ui/fullscreenimage.cpp
+++ b/engines/nancy/ui/fullscreenimage.cpp
@@ -20,11 +20,11 @@
*
*/
-#include "engines/nancy/ui/fullscreenimage.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/resource.h"
+#include "engines/nancy/ui/fullscreenimage.h"
+
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/inventorybox.cpp b/engines/nancy/ui/inventorybox.cpp
index 86b9443e06..200202c4b8 100644
--- a/engines/nancy/ui/inventorybox.cpp
+++ b/engines/nancy/ui/inventorybox.cpp
@@ -20,17 +20,17 @@
*
*/
-#include "engines/nancy/ui/inventorybox.h"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/resource.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/cursor.h"
#include "engines/nancy/sound.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/ui/inventorybox.h"
+
+#include "engines/nancy/state/scene.h"
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/inventorybox.h b/engines/nancy/ui/inventorybox.h
index 58a0d01193..bb1de0f0a5 100644
--- a/engines/nancy/ui/inventorybox.h
+++ b/engines/nancy/ui/inventorybox.h
@@ -23,9 +23,6 @@
#ifndef NANCY_UI_INVENTORYBOX_H
#define NANCY_UI_INVENTORYBOX_H
-#include "common/array.h"
-#include "common/str.h"
-
#include "engines/nancy/time.h"
#include "engines/nancy/ui/scrollbar.h"
diff --git a/engines/nancy/ui/scrollbar.cpp b/engines/nancy/ui/scrollbar.cpp
index 2398b764ec..d5f625ec20 100644
--- a/engines/nancy/ui/scrollbar.cpp
+++ b/engines/nancy/ui/scrollbar.cpp
@@ -20,14 +20,12 @@
*
*/
-#include "engines/nancy/ui/scrollbar.h"
-
-#include "common/stream.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/input.h"
#include "engines/nancy/cursor.h"
+#include "engines/nancy/ui/scrollbar.h"
+
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/textbox.cpp b/engines/nancy/ui/textbox.cpp
index b848e40f0c..5df39cd527 100644
--- a/engines/nancy/ui/textbox.cpp
+++ b/engines/nancy/ui/textbox.cpp
@@ -20,17 +20,15 @@
*
*/
-#include "engines/nancy/ui/textbox.h"
-
-#include "common/util.h"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/cursor.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/state/scene.h"
+
+#include "engines/nancy/ui/textbox.h"
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/textbox.h b/engines/nancy/ui/textbox.h
index 86e20c88bd..012866f012 100644
--- a/engines/nancy/ui/textbox.h
+++ b/engines/nancy/ui/textbox.h
@@ -23,9 +23,6 @@
#ifndef NANCY_UI_TEXTBOX_H
#define NANCY_UI_TEXTBOX_H
-#include "common/str.h"
-#include "common/array.h"
-
#include "engines/nancy/ui/scrollbar.h"
namespace Nancy {
diff --git a/engines/nancy/ui/viewport.cpp b/engines/nancy/ui/viewport.cpp
index d604f88b8e..69d8b61497 100644
--- a/engines/nancy/ui/viewport.cpp
+++ b/engines/nancy/ui/viewport.cpp
@@ -20,15 +20,15 @@
*
*/
-#include "engines/nancy/ui/viewport.h"
-
-#include "engines/nancy/state/scene.h"
-
#include "engines/nancy/nancy.h"
#include "engines/nancy/graphics.h"
#include "engines/nancy/cursor.h"
-#include "engines/nancy/util.h"
#include "engines/nancy/input.h"
+#include "engines/nancy/util.h"
+
+#include "engines/nancy/state/scene.h"
+
+#include "engines/nancy/ui/viewport.h"
namespace Nancy {
namespace UI {
diff --git a/engines/nancy/ui/viewport.h b/engines/nancy/ui/viewport.h
index 033e11c47e..543130d482 100644
--- a/engines/nancy/ui/viewport.h
+++ b/engines/nancy/ui/viewport.h
@@ -23,10 +23,10 @@
#ifndef NANCY_UI_VIEWPORT_H
#define NANCY_UI_VIEWPORT_H
-#include "engines/nancy/renderobject.h"
-
-#include "engines/nancy/video.h"
#include "engines/nancy/time.h"
+#include "engines/nancy/video.h"
+
+#include "engines/nancy/renderobject.h"
namespace Common {
class String;
diff --git a/engines/nancy/video.cpp b/engines/nancy/video.cpp
index 9717562a3b..dea946a1fb 100644
--- a/engines/nancy/video.cpp
+++ b/engines/nancy/video.cpp
@@ -20,14 +20,13 @@
*
*/
-#include "engines/nancy/video.h"
-
#include "common/memstream.h"
#include "common/substream.h"
+#include "engines/nancy/nancy.h"
+#include "engines/nancy/video.h"
#include "engines/nancy/decompress.h"
#include "engines/nancy/graphics.h"
-#include "engines/nancy/nancy.h"
namespace Nancy {
Commit: d2d4ca9d35913d9a3450eef60e1e5b5baa0dcea8
https://github.com/scummvm/scummvm/commit/d2d4ca9d35913d9a3450eef60e1e5b5baa0dcea8
Author: fracturehill (strahy at outlook.com)
Date: 2021-04-01T21:25:33+03:00
Commit Message:
NANCY: Remove nonexistent BOOT chunks
Removed FR, LG, and OB from the boot chunks list inside NancyEngine::bootGameEngine() since such chunks don't actually exist.
Changed paths:
engines/nancy/nancy.cpp
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index 17d253925f..c150b24776 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -305,7 +305,7 @@ void NancyEngine::bootGameEngine() {
"SET", "CURT", "CANT", "TH1", "TH2",
"QUOT", "TMOD",
// Used in nancy2
- "FR", "LG", "OB", "CLOK", "SPEC"
+ "CLOK", "SPEC"
};
Common::String persistentSounds[] = {
More information about the Scummvm-git-logs
mailing list