[Scummvm-git-logs] scummvm master -> a74293b4f1e8b8f3fe748fdcc8ceff482a206819
OMGPizzaGuy
48367439+OMGPizzaGuy at users.noreply.github.com
Sat Feb 13 03:22:07 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:
d6e9685d6a ULTIMA8: Remove dead code from old command line argument parsing
c84419654c ULTIMA8: Move _isRunning field from CoreApp to Ultima8Engine
54019d24e3 ULTIMA8: Cleanup includes from ultima8.h
a74293b4f1 ULTIMA8: add one missing include
Commit: d6e9685d6a25597a05d6245d97ef425a7d191b1c
https://github.com/scummvm/scummvm/commit/d6e9685d6a25597a05d6245d97ef425a7d191b1c
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-12T21:17:51-06:00
Commit Message:
ULTIMA8: Remove dead code from old command line argument parsing
Changed paths:
R engines/ultima/ultima8/misc/args.cpp
R engines/ultima/ultima8/misc/args.h
engines/ultima/module.mk
engines/ultima/ultima8/kernel/core_app.cpp
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index 1a3f850cf4..0a9bffa7f6 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -499,7 +499,6 @@ MODULE_OBJS := \
ultima8/kernel/object.o \
ultima8/kernel/object_manager.o \
ultima8/kernel/process.o \
- ultima8/misc/args.o \
ultima8/misc/debugger.o \
ultima8/misc/encoding.o \
ultima8/misc/id_man.o \
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index 7f6e1cd15e..e50fd9ba97 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -139,10 +139,5 @@ bool CoreApp::getGameInfo(const istring &game, GameInfo *ginfo) {
return ginfo->_type != GameInfo::GAME_UNKNOWN;
}
-
-void CoreApp::ParseArgs(const int argc, const char *const *const argv) {
- _parameters.process(argc, argv);
-}
-
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index 8cf00414b9..2c2093f719 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -23,7 +23,6 @@
#ifndef ULTIMA8_KERNEL_COREAPP_H
#define ULTIMA8_KERNEL_COREAPP_H
-#include "ultima/ultima8/misc/args.h"
#include "ultima/ultima8/games/game_info.h"
#include "ultima/detection.h"
@@ -53,9 +52,6 @@ public:
virtual bool runGame() = 0;
virtual void paint() = 0; // probably shouldn't exist
- virtual bool isPainting() {
- return false;
- }
//! Startup the application. This will prepare the application for run().
//! Should call parent class' startup().
@@ -74,16 +70,11 @@ protected:
FileSystem *_fileSystem;
ConfigFileManager *_configFileMan;
- Args _parameters;
-
static CoreApp *_application;
private:
const Ultima::UltimaGameDescription *_gameDesc;
- //! parse commandline arguments
- void ParseArgs(int argc, const char *const *argv);
-
//! Fill a GameInfo struct for the give game name
//! \param game The id of the game to check (from pentagram.cfg)
//! \param gameinfo The GameInfo struct to fill
diff --git a/engines/ultima/ultima8/misc/args.cpp b/engines/ultima/ultima8/misc/args.cpp
deleted file mode 100644
index 4c5156d7b0..0000000000
--- a/engines/ultima/ultima8/misc/args.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2000-2002 The Exult Team
- *
- * This program is free software; you can redistribute it and/or 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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "ultima/ultima8/misc/args.h"
-
-namespace Ultima {
-namespace Ultima8 {
-
-void Args::process(const int32 argc, const char *const *const argv) {
- for (int32 i = 1; i < argc; ++i) {
- for (uint32 j = 0; (j < _options.size()) && (i < argc); ++j) {
- switch (_options[j].valuetype) {
- case Option::no_type:
- continue;
- case Option::type_bool:
- if (_options[j].option == argv[i])
- *(_options[j]._bool_val) = _options[j]._bool_default;
- break;
- case Option::type_str: {
- if (_options[j].option == argv[i]) {
- // We want the _next_ argument
- if (++i >= argc) {
- warning("Data not specified for argument '%s'. Using default", _options[j].option.c_str());
- break;
- }
- *(_options[j]._str_val) = argv[i];
- }
- break;
- }
- case Option::type_sint: {
- if (_options[j].option == argv[i]) {
- // We want the _next_ argument
- if (++i >= argc) {
- warning("Data not specified for argument '%s'. Using default", _options[j].option.c_str());
- break;
- }
- *(_options[j]._sint_val) = strtol(argv[i], 0, 10);
- }
- break;
- }
- case Option::type_uint: {
- if (_options[j].option == argv[i]) {
- // We want the _next_ argument
- if (++i >= argc) {
- warning("Data not specified for argument '%s'. Using default", _options[j].option.c_str());
- break;
- }
- *(_options[j]._uint_val) = strtoul(argv[i], 0, 10);
- }
- break;
- }
- }
- }
- }
-}
-
-} // End of namespace Ultima8
-} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/misc/args.h b/engines/ultima/ultima8/misc/args.h
deleted file mode 100644
index 5b4ec0af9d..0000000000
--- a/engines/ultima/ultima8/misc/args.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * 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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ULTIMA8_MISC_ARGS_H
-#define ULTIMA8_MISC_ARGS_H
-
-// Handy argument processor. I'm certain the implementation could be better
-// but it suffices quite well at the moment.
-
-#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
-
-namespace Ultima {
-namespace Ultima8 {
-
-class Args {
-public:
- Args() { };
- ~Args() { };
-
- struct Option {
- Option() : option(""), valuetype(no_type) { };
- // bool
- Option(const char *option_cstr, bool *value, const bool defaultvalue = true)
- : option(option_cstr), _bool_val(value), _bool_default(defaultvalue),
- valuetype(Option::type_bool) {
- /**_bool_val=_bool_default;*/ /* Odd... looks like the 'default' value for bool, isn't. It's the value you set it to, if the flag is found*/
- };
- // string
- Option(const char *option_cstr, Std::string *value, const char *defaultvalue = 0)
- : option(option_cstr), _str_val(value),
- _str_default(defaultvalue ? defaultvalue : ""), valuetype(Option::type_str) {
- *_str_val = _str_default;
- };
- // sint
- Option(const char *option_cstr, int32 *value, const int32 defaultvalue = true)
- : option(option_cstr), _sint_val(value), _sint_default(defaultvalue),
- valuetype(Option::type_sint) {
- *_sint_val = _sint_default;
- };
- // uint
- Option(const char *option_cstr, uint32 *value, const uint32 defaultvalue = true)
- : option(option_cstr), _uint_val(value), _uint_default(defaultvalue),
- valuetype(Option::type_uint) {
- *_uint_val = _uint_default;
- };
-
- ~Option() { };
-
- Std::string option;
-
- bool *_bool_val;
- Std::string *_str_val;
- int32 *_sint_val;
- uint32 *_uint_val;
-
- bool _bool_default;
- Std::string _str_default;
- int32 _sint_default;
- uint32 _uint_default;
-
- enum { no_type = 0, type_bool, type_str, type_sint, type_uint } valuetype;
- };
-
- Std::vector<Option> _options;
-
- // bool
- inline void declare(const char *option_cstr, bool *value, const bool defaultvalue = true) {
- _options.push_back(Option(option_cstr, value, defaultvalue));
- };
- // string
- inline void declare(const char *option_cstr, Std::string *value, const char *defaultvalue = 0) {
- _options.push_back(Option(option_cstr, value, defaultvalue));
- };
- // sint
- inline void declare(const char *option_cstr, int32 *value, const int32 defaultvalue = 0) {
- _options.push_back(Option(option_cstr, value, defaultvalue));
- };
- // uint
- inline void declare(const char *option_cstr, uint32 *value, const uint32 defaultvalue = 0) {
- _options.push_back(Option(option_cstr, value, defaultvalue));
- };
-
- void process(const int32 argc, const char *const *const argv);
-};
-
-} // End of namespace Ultima8
-} // End of namespace Ultima
-
-#endif
-
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index ec34013c61..334681dbbe 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -116,7 +116,7 @@ Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription
_screen(nullptr), _fontManager(nullptr), _paletteManager(nullptr), _gameData(nullptr),
_world(nullptr), _desktopGump(nullptr), _gameMapGump(nullptr), _avatarMoverProcess(nullptr),
_frameSkip(false), _frameLimit(true), _interpolate(true), _animationRate(100),
- _avatarInStasis(false), _paintEditorItems(false), _inversion(0), _painting(false),
+ _avatarInStasis(false), _paintEditorItems(false), _inversion(0),
_showTouching(false), _timeOffset(0), _hasCheated(false), _cheatsEnabled(false),
_ttfOverrides(false), _audioMixer(0), _inverterGump(nullptr), _lerpFactor(256),
_inBetweenFrame(false), _unkCrusaderFlag(false), _moveKeyFrame(0) {
@@ -521,7 +521,6 @@ void Ultima8Engine::paint() {
++t;
// Begin _painting
- _painting = true;
_screen->BeginPainting();
tpaint -= g_system->getMillis();
@@ -541,7 +540,6 @@ void Ultima8Engine::paint() {
// End _painting
_screen->EndPainting();
- _painting = false;
}
void Ultima8Engine::GraphicSysInit() {
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index d50e0a9d24..0a9fe7c0e7 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -39,7 +39,7 @@
#include "ultima/shared/std/containers.h"
#include "ultima/shared/engine/ultima.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/args.h"
+#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "common/events.h"
@@ -110,7 +110,6 @@ private:
bool _avatarInStasis; //!< If this is set to true, Avatar can't move,
//!< nor can Avatar start more usecode
bool _paintEditorItems; //!< If true, paint items with the SI_EDITOR flag
- bool _painting; //!< Set true when painting
bool _showTouching; //!< If true, highlight items touching Avatar
int32 _timeOffset;
bool _hasCheated;
@@ -191,9 +190,6 @@ public:
virtual void handleEvent(const Common::Event &event);
void paint() override;
- bool isPainting() override {
- return _painting;
- }
static const int U8_DEFAULT_SCREEN_WIDTH = 320;
static const int U8_DEFAULT_SCREEN_HEIGHT = 200;
Commit: c84419654cc92ba39a29964e6cfcba8facc89ef2
https://github.com/scummvm/scummvm/commit/c84419654cc92ba39a29964e6cfcba8facc89ef2
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-12T21:17:51-06:00
Commit Message:
ULTIMA8: Move _isRunning field from CoreApp to Ultima8Engine
Changed paths:
engines/ultima/ultima8/kernel/core_app.cpp
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index e50fd9ba97..d991987540 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -34,8 +34,8 @@ using Std::string;
CoreApp *CoreApp::_application = nullptr;
CoreApp::CoreApp(const Ultima::UltimaGameDescription *gameDesc)
- : _gameDesc(gameDesc), _isRunning(false), _gameInfo(nullptr), _fileSystem(nullptr),
- _configFileMan(nullptr){
+ : _gameDesc(gameDesc), _gameInfo(nullptr), _fileSystem(nullptr),
+ _configFileMan(nullptr) {
_application = this;
}
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index 2c2093f719..1cb89d09da 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-class Console;
class FileSystem;
class ConfigFileManager;
struct GameInfo;
@@ -50,9 +49,6 @@ public:
return _application;
};
- virtual bool runGame() = 0;
- virtual void paint() = 0; // probably shouldn't exist
-
//! Startup the application. This will prepare the application for run().
//! Should call parent class' startup().
void startup();
@@ -63,7 +59,6 @@ public:
}
protected:
- bool _isRunning;
GameInfo *_gameInfo;
// minimal system
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 334681dbbe..83985e2c8e 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -111,7 +111,8 @@ struct ProcessLoader {
inline bool HasPreventSaveFlag(const Gump *g) { return g->hasFlags(Gump::FLAG_PREVENT_SAVE); }
Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc) :
- Shared::UltimaEngine(syst, gameDesc), CoreApp(gameDesc), _saveCount(0), _game(nullptr),
+ Shared::UltimaEngine(syst, gameDesc), CoreApp(gameDesc),
+ _isRunning(false), _saveCount(0), _game(nullptr),
_kernel(nullptr), _objectManager(nullptr), _mouse(nullptr), _ucMachine(nullptr),
_screen(nullptr), _fontManager(nullptr), _paletteManager(nullptr), _gameData(nullptr),
_world(nullptr), _desktopGump(nullptr), _gameMapGump(nullptr), _avatarMoverProcess(nullptr),
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 0a9fe7c0e7..fed352b0a6 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -69,6 +69,8 @@ class AudioMixer;
class Ultima8Engine : public Shared::UltimaEngine, public CoreApp {
friend class Debugger;
private:
+ bool _isRunning;
+
Std::list<ObjId> _textModes; //!< Gumps that want text mode
bool _ttfOverrides;
// Audio Mixer
@@ -186,10 +188,10 @@ public:
Graphics::Screen *getScreen() const override;
- bool runGame() override;
+ bool runGame();
virtual void handleEvent(const Common::Event &event);
- void paint() override;
+ void paint();
static const int U8_DEFAULT_SCREEN_WIDTH = 320;
static const int U8_DEFAULT_SCREEN_HEIGHT = 200;
Commit: 54019d24e3b6a3f8171c1043b1b5a0483324ada3
https://github.com/scummvm/scummvm/commit/54019d24e3b6a3f8171c1043b1b5a0483324ada3
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-12T21:17:51-06:00
Commit Message:
ULTIMA8: Cleanup includes from ultima8.h
Changed paths:
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/desktop_gump.cpp
engines/ultima/ultima8/gumps/keypad_gump.cpp
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/movie_gump.cpp
engines/ultima/ultima8/gumps/paged_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/quit_gump.cpp
engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/gumps/slider_gump.cpp
engines/ultima/ultima8/gumps/target_gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/gumps/weasel_gump.cpp
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/kernel/mouse.h
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
engines/ultima/ultima8/world/actors/pathfinder.cpp
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index 0dd20ad030..2994aea5b1 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -27,6 +27,7 @@
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/kernel.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/gumps/slider_gump.h"
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 2f12850f6e..a3822ce8cc 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -24,7 +24,7 @@
#include "ultima/ultima8/gumps/credits_gump.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/fonts/font.h"
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.cpp b/engines/ultima/ultima8/gumps/desktop_gump.cpp
index 1d133673af..20ed9d02a4 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.cpp
+++ b/engines/ultima/ultima8/gumps/desktop_gump.cpp
@@ -22,7 +22,7 @@
#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/target_gump.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/keypad_gump.cpp b/engines/ultima/ultima8/gumps/keypad_gump.cpp
index 4204de7590..7fe47e4486 100644
--- a/engines/ultima/ultima8/gumps/keypad_gump.cpp
+++ b/engines/ultima/ultima8/gumps/keypad_gump.cpp
@@ -25,7 +25,7 @@
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/usecode/uc_process.h"
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index cad9270230..4d5b800c08 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -29,6 +29,7 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/quit_gump.h"
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index 1246924855..8ca40b6984 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/graphics/render_surface.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/movie_gump.cpp b/engines/ultima/ultima8/gumps/movie_gump.cpp
index d5e254149f..2c874f8e7f 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.cpp
+++ b/engines/ultima/ultima8/gumps/movie_gump.cpp
@@ -27,6 +27,7 @@
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/fade_to_modal_process.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/paged_gump.cpp b/engines/ultima/ultima8/gumps/paged_gump.cpp
index 8a7fbedd13..6121828f2d 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paged_gump.cpp
@@ -23,7 +23,7 @@
#include "ultima/ultima8/gumps/paged_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index 9fbe2584b1..ee3e352dc9 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -33,6 +33,7 @@
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/mini_stats_gump.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/quit_gump.cpp b/engines/ultima/ultima8/gumps/quit_gump.cpp
index 2fcb0ce10b..7767d6c5b0 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.cpp
+++ b/engines/ultima/ultima8/gumps/quit_gump.cpp
@@ -27,6 +27,7 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
diff --git a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
index 778b775e7d..fbcf8cd826 100644
--- a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
@@ -26,6 +26,7 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/quit_gump.h"
#include "ultima/ultima8/games/game.h"
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 0d8b637e4e..cfa2716cc5 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -24,6 +24,7 @@
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/shape_info.h"
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index 0d0a1ae4a3..5574afcd17 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -30,6 +30,7 @@
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/usecode/uc_process.h"
#include "ultima/ultima8/kernel/kernel.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index ab6632007e..0b9e1af0f1 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -23,6 +23,7 @@
#include "ultima/ultima8/gumps/target_gump.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 58b3c4ae1f..e83ba3de32 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -24,6 +24,7 @@
#include "ultima/ultima8/gumps/widgets/edit_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.cpp b/engines/ultima/ultima8/gumps/weasel_gump.cpp
index 84b9c911f7..e63af7c319 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_gump.cpp
@@ -28,6 +28,7 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/movie_gump.h"
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index daaa743ca4..16f6104c13 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -21,6 +21,7 @@
*/
#include "graphics/cursorman.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/render_surface.h"
diff --git a/engines/ultima/ultima8/kernel/mouse.h b/engines/ultima/ultima8/kernel/mouse.h
index b10982424e..85e9e8f86d 100644
--- a/engines/ultima/ultima8/kernel/mouse.h
+++ b/engines/ultima/ultima8/kernel/mouse.h
@@ -26,6 +26,7 @@
#include "common/system.h"
#include "common/rect.h"
#include "ultima/shared/engine/events.h"
+#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/misc/direction.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index fed352b0a6..3399d7d045 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -24,25 +24,12 @@
#ifndef ULTIMA8_ULTIMA8
#define ULTIMA8_ULTIMA8
-#include "common/scummsys.h"
#include "common/stream.h"
-#include "common/system.h"
-#include "common/archive.h"
-#include "common/error.h"
-#include "common/random.h"
-#include "common/hash-str.h"
-#include "common/util.h"
-#include "engines/engine.h"
-#include "graphics/surface.h"
-#include "gui/debugger.h"
-#include "ultima/detection.h"
#include "ultima/shared/std/containers.h"
#include "ultima/shared/engine/ultima.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/kernel/mouse.h"
-#include "common/events.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
index f516f7c0da..f177703854 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
@@ -23,6 +23,7 @@
#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/ultima8.h"
+#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.cpp b/engines/ultima/ultima8/world/actors/pathfinder.cpp
index d2ba08a7cb..56d4c34ae1 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "common/system.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
Commit: a74293b4f1e8b8f3fe748fdcc8ceff482a206819
https://github.com/scummvm/scummvm/commit/a74293b4f1e8b8f3fe748fdcc8ceff482a206819
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-12T21:21:07-06:00
Commit Message:
ULTIMA8: add one missing include
Changed paths:
engines/ultima/ultima8/audio/remorse_music_process.cpp
diff --git a/engines/ultima/ultima8/audio/remorse_music_process.cpp b/engines/ultima/ultima8/audio/remorse_music_process.cpp
index de383dc20c..6fa3a29998 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.cpp
+++ b/engines/ultima/ultima8/audio/remorse_music_process.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "common/system.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/audio/remorse_music_process.h"
#include "ultima/ultima8/filesys/file_system.h"
More information about the Scummvm-git-logs
mailing list