[Scummvm-git-logs] scummvm master -> 1ae121a99d4e8203d074b5488550e10ee591bb8c
mduggan
mgithub at guarana.org
Mon Jan 11 03:05:44 UTC 2021
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c7c55b17d5 ULTIMA8: Remove lots of unneeded includes
723b760b63 ULTIMA8: Add some const correctness
1c59d5de36 ULTIMA8: Improve comments
e15c3b35db TINSEL: Fix build when DEBUG is defined
1ae121a99d GLK: Fix build when DEBUG defined
Commit: c7c55b17d5c2f916ca81dd6556abe6d120034285
https://github.com/scummvm/scummvm/commit/c7c55b17d5c2f916ca81dd6556abe6d120034285
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T11:15:35+09:00
Commit Message:
ULTIMA8: Remove lots of unneeded includes
Years of refactors and cleanups had left a bunch of unused includes. This
cleans up lots of them. It now relies a little bit on implicit includes in
some places, but that was also true before.
Changed paths:
R engines/ultima/ultima8/graphics/manips.h
R engines/ultima/ultima8/gumps/cru_display_shapes.h
engines/ultima/ultima8/audio/audio_mixer.cpp
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/audio/music_flex.h
engines/ultima/ultima8/audio/music_process.cpp
engines/ultima/ultima8/audio/raw_audio_sample.cpp
engines/ultima/ultima8/audio/remorse_music_process.cpp
engines/ultima/ultima8/audio/remorse_music_process.h
engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
engines/ultima/ultima8/audio/sound_flex.cpp
engines/ultima/ultima8/audio/sound_flex.h
engines/ultima/ultima8/audio/speech_flex.h
engines/ultima/ultima8/audio/u8_music_process.cpp
engines/ultima/ultima8/audio/u8_music_process.h
engines/ultima/ultima8/conf/config_file_manager.cpp
engines/ultima/ultima8/conf/ini_file.cpp
engines/ultima/ultima8/conf/setting_manager.cpp
engines/ultima/ultima8/conf/setting_manager.h
engines/ultima/ultima8/convert/convert_shape.cpp
engines/ultima/ultima8/convert/crusader/convert_shape_crusader.cpp
engines/ultima/ultima8/convert/u8/convert_shape_u8.cpp
engines/ultima/ultima8/filesys/archive.cpp
engines/ultima/ultima8/filesys/archive.h
engines/ultima/ultima8/filesys/archive_file.cpp
engines/ultima/ultima8/filesys/archive_file.h
engines/ultima/ultima8/filesys/data.cpp
engines/ultima/ultima8/filesys/file_system.cpp
engines/ultima/ultima8/filesys/flex_file.cpp
engines/ultima/ultima8/filesys/flex_file.h
engines/ultima/ultima8/filesys/idata_source.h
engines/ultima/ultima8/filesys/odata_source.h
engines/ultima/ultima8/filesys/raw_archive.cpp
engines/ultima/ultima8/filesys/raw_archive.h
engines/ultima/ultima8/filesys/savegame.cpp
engines/ultima/ultima8/filesys/savegame.h
engines/ultima/ultima8/filesys/u8_save_file.cpp
engines/ultima/ultima8/filesys/u8_save_file.h
engines/ultima/ultima8/games/game.cpp
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/remorse_game.cpp
engines/ultima/ultima8/games/start_crusader_process.cpp
engines/ultima/ultima8/games/start_u8_process.cpp
engines/ultima/ultima8/games/treasure_loader.h
engines/ultima/ultima8/games/u8_game.cpp
engines/ultima/ultima8/graphics/anim_dat.cpp
engines/ultima/ultima8/graphics/avi_player.cpp
engines/ultima/ultima8/graphics/avi_player.h
engines/ultima/ultima8/graphics/cycle_process.cpp
engines/ultima/ultima8/graphics/cycle_process.h
engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
engines/ultima/ultima8/graphics/fonts/font.h
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
engines/ultima/ultima8/graphics/fonts/jp_font.cpp
engines/ultima/ultima8/graphics/fonts/jp_font.h
engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
engines/ultima/ultima8/graphics/fonts/rendered_text.h
engines/ultima/ultima8/graphics/fonts/shape_font.cpp
engines/ultima/ultima8/graphics/fonts/shape_font.h
engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
engines/ultima/ultima8/graphics/fonts/tt_font.cpp
engines/ultima/ultima8/graphics/fonts/tt_font.h
engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
engines/ultima/ultima8/graphics/frame_id.h
engines/ultima/ultima8/graphics/gump_shape_archive.cpp
engines/ultima/ultima8/graphics/gump_shape_archive.h
engines/ultima/ultima8/graphics/inverter_process.cpp
engines/ultima/ultima8/graphics/main_shape_archive.cpp
engines/ultima/ultima8/graphics/main_shape_archive.h
engines/ultima/ultima8/graphics/palette.cpp
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/graphics/palette_manager.cpp
engines/ultima/ultima8/graphics/raw_shape_frame.cpp
engines/ultima/ultima8/graphics/render_surface.cpp
engines/ultima/ultima8/graphics/shape.cpp
engines/ultima/ultima8/graphics/shape.h
engines/ultima/ultima8/graphics/shape_archive.cpp
engines/ultima/ultima8/graphics/shape_archive.h
engines/ultima/ultima8/graphics/skf_player.cpp
engines/ultima/ultima8/graphics/soft_render_surface.cpp
engines/ultima/ultima8/graphics/texture.h
engines/ultima/ultima8/graphics/type_flags.cpp
engines/ultima/ultima8/graphics/xform_blend.cpp
engines/ultima/ultima8/gumps/ask_gump.cpp
engines/ultima/ultima8/gumps/bark_gump.cpp
engines/ultima/ultima8/gumps/book_gump.cpp
engines/ultima/ultima8/gumps/computer_gump.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
engines/ultima/ultima8/gumps/cru_energy_gump.cpp
engines/ultima/ultima8/gumps/cru_health_gump.cpp
engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_area_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
engines/ultima/ultima8/gumps/cru_stat_gump.cpp
engines/ultima/ultima8/gumps/cru_stat_gump.h
engines/ultima/ultima8/gumps/cru_status_gump.cpp
engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
engines/ultima/ultima8/gumps/desktop_gump.cpp
engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
engines/ultima/ultima8/gumps/game_map_gump.cpp
engines/ultima/ultima8/gumps/game_map_gump.h
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/gump_notify_process.cpp
engines/ultima/ultima8/gumps/inverter_gump.cpp
engines/ultima/ultima8/gumps/inverter_gump.h
engines/ultima/ultima8/gumps/item_relative_gump.cpp
engines/ultima/ultima8/gumps/keypad_gump.cpp
engines/ultima/ultima8/gumps/main_menu_process.cpp
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/mini_stats_gump.cpp
engines/ultima/ultima8/gumps/minimap_gump.cpp
engines/ultima/ultima8/gumps/minimap_gump.h
engines/ultima/ultima8/gumps/modal_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/readable_gump.cpp
engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
engines/ultima/ultima8/gumps/resizable_gump.cpp
engines/ultima/ultima8/gumps/scroll_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/translucent_gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/gumps/weasel_dat.cpp
engines/ultima/ultima8/gumps/weasel_gump.cpp
engines/ultima/ultima8/gumps/widgets/button_widget.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/kernel/core_app.cpp
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/kernel/delay_process.cpp
engines/ultima/ultima8/kernel/kernel.cpp
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/kernel/mouse.h
engines/ultima/ultima8/kernel/object.cpp
engines/ultima/ultima8/kernel/object_manager.cpp
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/meta_engine.cpp
engines/ultima/ultima8/misc/args.cpp
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/misc/encoding.cpp
engines/ultima/ultima8/misc/istring.cpp
engines/ultima/ultima8/misc/istring.h
engines/ultima/ultima8/misc/util.cpp
engines/ultima/ultima8/misc/util.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/usecode/usecode.h
engines/ultima/ultima8/usecode/usecode_flex.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
engines/ultima/ultima8/world/actors/ambush_process.cpp
engines/ultima/ultima8/world/actors/anim_action.cpp
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/attack_process.cpp
engines/ultima/ultima8/world/actors/avatar_death_process.cpp
engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/battery_charger_process.cpp
engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
engines/ultima/ultima8/world/actors/combat_process.cpp
engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
engines/ultima/ultima8/world/actors/cru_healer_process.cpp
engines/ultima/ultima8/world/actors/grant_peace_process.cpp
engines/ultima/ultima8/world/actors/guard_process.cpp
engines/ultima/ultima8/world/actors/heal_process.cpp
engines/ultima/ultima8/world/actors/loiter_process.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/pace_process.cpp
engines/ultima/ultima8/world/actors/pathfinder.cpp
engines/ultima/ultima8/world/actors/pathfinder_process.cpp
engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/resurrection_process.cpp
engines/ultima/ultima8/world/actors/scheduler_process.cpp
engines/ultima/ultima8/world/actors/surrender_process.cpp
engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
engines/ultima/ultima8/world/actors/teleport_to_egg_process.cpp
engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
engines/ultima/ultima8/world/camera_process.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/create_item_process.cpp
engines/ultima/ultima8/world/crosshair_process.cpp
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/damage_info.cpp
engines/ultima/ultima8/world/damage_info.h
engines/ultima/ultima8/world/destroy_item_process.cpp
engines/ultima/ultima8/world/egg.cpp
engines/ultima/ultima8/world/egg_hatcher_process.cpp
engines/ultima/ultima8/world/fire_type.cpp
engines/ultima/ultima8/world/fireball_process.cpp
engines/ultima/ultima8/world/get_object.cpp
engines/ultima/ultima8/world/glob_egg.cpp
engines/ultima/ultima8/world/gravity_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item_factory.cpp
engines/ultima/ultima8/world/item_selection_process.cpp
engines/ultima/ultima8/world/item_sorter.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/map_glob.cpp
engines/ultima/ultima8/world/monster_egg.cpp
engines/ultima/ultima8/world/snap_process.cpp
engines/ultima/ultima8/world/split_item_process.cpp
engines/ultima/ultima8/world/sprite_process.cpp
engines/ultima/ultima8/world/sprite_process.h
engines/ultima/ultima8/world/super_sprite_process.cpp
engines/ultima/ultima8/world/target_reticle_process.cpp
engines/ultima/ultima8/world/teleport_egg.cpp
engines/ultima/ultima8/world/world.cpp
diff --git a/engines/ultima/ultima8/audio/audio_mixer.cpp b/engines/ultima/ultima8/audio/audio_mixer.cpp
index 5de57a89fc..0cab5a165e 100644
--- a/engines/ultima/ultima8/audio/audio_mixer.cpp
+++ b/engines/ultima/ultima8/audio/audio_mixer.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/audio_mixer.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/u8_music_process.h"
@@ -29,7 +28,6 @@
#include "ultima/ultima8/audio/midi_player.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "audio/decoders/raw.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 89ce94ff7d..d755c34461 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -20,22 +20,14 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/usecode/uc_machine.h"
-#include "ultima/ultima8/kernel/object.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/audio/sound_flex.h"
#include "ultima/ultima8/audio/speech_flex.h"
-#include "ultima/ultima8/audio/audio_sample.h"
#include "ultima/ultima8/audio/audio_mixer.h"
-#include "ultima/ultima8/audio/midi_player.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/camera_process.h"
-#include "ultima/ultima8/kernel/core_app.h"
-#include "common/util.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 19bd20425d..d9542f4576 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/string.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
diff --git a/engines/ultima/ultima8/audio/music_flex.h b/engines/ultima/ultima8/audio/music_flex.h
index 90041edae6..72c78a0f02 100644
--- a/engines/ultima/ultima8/audio/music_flex.h
+++ b/engines/ultima/ultima8/audio/music_flex.h
@@ -24,7 +24,6 @@
#define ULTIMA8_AUDIO_MUSICFLEX_H
#include "ultima/ultima8/filesys/archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/music_process.cpp b/engines/ultima/ultima8/audio/music_process.cpp
index dc7b2845ba..cbb17b98ad 100644
--- a/engines/ultima/ultima8/audio/music_process.cpp
+++ b/engines/ultima/ultima8/audio/music_process.cpp
@@ -20,12 +20,7 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/audio/music_flex.h"
-#include "ultima/ultima8/audio/midi_player.h"
-#include "ultima/ultima8/audio/audio_mixer.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.cpp b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
index 65598bf6ad..1c448efc80 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/raw_audio_sample.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/remorse_music_process.cpp b/engines/ultima/ultima8/audio/remorse_music_process.cpp
index c817ea69db..abc8d8df04 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.cpp
+++ b/engines/ultima/ultima8/audio/remorse_music_process.cpp
@@ -20,13 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/audio/remorse_music_process.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/audio/music_flex.h"
-#include "ultima/ultima8/audio/midi_player.h"
-#include "ultima/ultima8/audio/audio_mixer.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "audio/mods/mod_xm_s3m.h"
diff --git a/engines/ultima/ultima8/audio/remorse_music_process.h b/engines/ultima/ultima8/audio/remorse_music_process.h
index d8ea95cb8b..a10090d331 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.h
+++ b/engines/ultima/ultima8/audio/remorse_music_process.h
@@ -24,8 +24,6 @@
#define ULTIMA8_AUDIO_REMORSEMUSICPROCESS_H
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
diff --git a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
index 55345f54d2..65118945cf 100644
--- a/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/sonarc_audio_sample.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/sound_flex.cpp b/engines/ultima/ultima8/audio/sound_flex.cpp
index 9322a67cf2..2ffa3b7de8 100644
--- a/engines/ultima/ultima8/audio/sound_flex.cpp
+++ b/engines/ultima/ultima8/audio/sound_flex.cpp
@@ -25,7 +25,6 @@
#include "ultima/ultima8/audio/sound_flex.h"
#include "ultima/ultima8/audio/sonarc_audio_sample.h"
#include "ultima/ultima8/audio/raw_audio_sample.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "common/memstream.h"
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index c50f7cefdd..49cbd65be7 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -24,7 +24,6 @@
#define ULTIMA8_AUDIO_SOUNDFLEX_H
#include "ultima/ultima8/filesys/archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/speech_flex.h b/engines/ultima/ultima8/audio/speech_flex.h
index 5420a58c68..1aed4b3146 100644
--- a/engines/ultima/ultima8/audio/speech_flex.h
+++ b/engines/ultima/ultima8/audio/speech_flex.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/audio/sound_flex.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/u8_music_process.cpp b/engines/ultima/ultima8/audio/u8_music_process.cpp
index d76ad3be54..f09eb470dc 100644
--- a/engines/ultima/ultima8/audio/u8_music_process.cpp
+++ b/engines/ultima/ultima8/audio/u8_music_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/u8_music_process.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/audio/music_flex.h"
diff --git a/engines/ultima/ultima8/audio/u8_music_process.h b/engines/ultima/ultima8/audio/u8_music_process.h
index f4ddd0d8b7..b49a8d3917 100644
--- a/engines/ultima/ultima8/audio/u8_music_process.h
+++ b/engines/ultima/ultima8/audio/u8_music_process.h
@@ -24,8 +24,6 @@
#define ULTIMA8_AUDIO_U8MUSICPROCESS_H
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "audio/mididrv.h"
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index d9fb0fd580..084ed74326 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/conf/config_file_manager.h"
-#include "ultima/ultima8/conf/ini_file.h"
#include "common/config-manager.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/conf/ini_file.cpp b/engines/ultima/ultima8/conf/ini_file.cpp
index d8cfad9726..618cd147ff 100644
--- a/engines/ultima/ultima8/conf/ini_file.cpp
+++ b/engines/ultima/ultima8/conf/ini_file.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/conf/ini_file.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/conf/setting_manager.cpp b/engines/ultima/ultima8/conf/setting_manager.cpp
index 9f3c0204d8..c9940397b8 100644
--- a/engines/ultima/ultima8/conf/setting_manager.cpp
+++ b/engines/ultima/ultima8/conf/setting_manager.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/conf/setting_manager.h"
-#include "ultima/ultima8/conf/config_file_manager.h"
#include "common/config-manager.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/conf/setting_manager.h b/engines/ultima/ultima8/conf/setting_manager.h
index da658a1b03..ad63c61618 100644
--- a/engines/ultima/ultima8/conf/setting_manager.h
+++ b/engines/ultima/ultima8/conf/setting_manager.h
@@ -27,7 +27,6 @@
#include "ultima/ultima8/misc/istring.h"
#include "ultima/shared/std/string.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/containers.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index 8dd8528b9e..1045c397b0 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/convert/convert_shape.h"
#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/filesys/odata_source.h"
diff --git a/engines/ultima/ultima8/convert/crusader/convert_shape_crusader.cpp b/engines/ultima/ultima8/convert/crusader/convert_shape_crusader.cpp
index 9097cf39fa..9ee4a9f8b8 100644
--- a/engines/ultima/ultima8/convert/crusader/convert_shape_crusader.cpp
+++ b/engines/ultima/ultima8/convert/crusader/convert_shape_crusader.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/convert/u8/convert_shape_u8.cpp b/engines/ultima/ultima8/convert/u8/convert_shape_u8.cpp
index 93aae9f114..f6f02c640d 100644
--- a/engines/ultima/ultima8/convert/u8/convert_shape_u8.cpp
+++ b/engines/ultima/ultima8/convert/u8/convert_shape_u8.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/filesys/archive.cpp b/engines/ultima/ultima8/filesys/archive.cpp
index 42d423b8c0..c83c9f4134 100644
--- a/engines/ultima/ultima8/filesys/archive.cpp
+++ b/engines/ultima/ultima8/filesys/archive.cpp
@@ -22,9 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/archive.h"
-#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/filesys/archive_file.h"
-#include "ultima/ultima8/filesys/named_archive_file.h"
#include "ultima/ultima8/filesys/flex_file.h"
#include "ultima/ultima8/filesys/u8_save_file.h"
diff --git a/engines/ultima/ultima8/filesys/archive.h b/engines/ultima/ultima8/filesys/archive.h
index ab97a1d92d..34911ec38a 100644
--- a/engines/ultima/ultima8/filesys/archive.h
+++ b/engines/ultima/ultima8/filesys/archive.h
@@ -24,8 +24,6 @@
#define ULTIMA8_FILESYS_ARCHIVE_H
#include "ultima/shared/std/string.h"
-#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/archive_file.cpp b/engines/ultima/ultima8/filesys/archive_file.cpp
index 2fdfe1b322..e37979322a 100644
--- a/engines/ultima/ultima8/filesys/archive_file.cpp
+++ b/engines/ultima/ultima8/filesys/archive_file.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/archive_file.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "common/memstream.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/filesys/archive_file.h b/engines/ultima/ultima8/filesys/archive_file.h
index 1396fbe1fd..a4d3358392 100644
--- a/engines/ultima/ultima8/filesys/archive_file.h
+++ b/engines/ultima/ultima8/filesys/archive_file.h
@@ -24,7 +24,6 @@
#define ULTIMA8_FILESYS_ARCHIVEFILE_H
#include "ultima/shared/std/string.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/data.cpp b/engines/ultima/ultima8/filesys/data.cpp
index 4a502c22e6..73f397c15a 100644
--- a/engines/ultima/ultima8/filesys/data.cpp
+++ b/engines/ultima/ultima8/filesys/data.cpp
@@ -20,12 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/file_system.h"
#ifdef BUILTIN_DATA
-#include "data/data.h"
#endif
namespace Ultima {
diff --git a/engines/ultima/ultima8/filesys/file_system.cpp b/engines/ultima/ultima8/filesys/file_system.cpp
index 304ec5fa90..c8173d6bed 100644
--- a/engines/ultima/ultima8/filesys/file_system.cpp
+++ b/engines/ultima/ultima8/filesys/file_system.cpp
@@ -20,12 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/shared/std/string.h"
#include "ultima/ultima8/ultima8.h"
-#include "common/system.h"
-#include "common/memstream.h"
#include "common/savefile.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/filesys/flex_file.cpp b/engines/ultima/ultima8/filesys/flex_file.cpp
index 453dcb6f47..43aede1dc1 100644
--- a/engines/ultima/ultima8/filesys/flex_file.cpp
+++ b/engines/ultima/ultima8/filesys/flex_file.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/flex_file.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/flex_file.h b/engines/ultima/ultima8/filesys/flex_file.h
index a8220fde26..1f917a22ea 100644
--- a/engines/ultima/ultima8/filesys/flex_file.h
+++ b/engines/ultima/ultima8/filesys/flex_file.h
@@ -24,7 +24,6 @@
#define ULTIMA8_FILESYS_FLEXFILE_H
#include "ultima/ultima8/filesys/archive_file.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/idata_source.h b/engines/ultima/ultima8/filesys/idata_source.h
index e867f7cc8e..fd7aa566e2 100644
--- a/engines/ultima/ultima8/filesys/idata_source.h
+++ b/engines/ultima/ultima8/filesys/idata_source.h
@@ -23,7 +23,6 @@
#ifndef ULTIMA8_FILESYS_IDATASOURCE_H
#define ULTIMA8_FILESYS_IDATASOURCE_H
-#include "common/file.h"
#include "common/stream.h"
#include "ultima/shared/std/misc.h"
#include "ultima/shared/std/string.h"
diff --git a/engines/ultima/ultima8/filesys/odata_source.h b/engines/ultima/ultima8/filesys/odata_source.h
index 8e2d636e3e..1bbbd25996 100644
--- a/engines/ultima/ultima8/filesys/odata_source.h
+++ b/engines/ultima/ultima8/filesys/odata_source.h
@@ -23,11 +23,8 @@
#ifndef ULTIMA8_FILESYS_ODATASOURCE_H
#define ULTIMA8_FILESYS_ODATASOURCE_H
-#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/shared/std/containers.h"
#include "common/stream.h"
-#include "common/algorithm.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/raw_archive.cpp b/engines/ultima/ultima8/filesys/raw_archive.cpp
index 3ced51683c..7fa423de86 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.cpp
+++ b/engines/ultima/ultima8/filesys/raw_archive.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/filesys/archive_file.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/raw_archive.h b/engines/ultima/ultima8/filesys/raw_archive.h
index 837f357a90..93b53b36bf 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.h
+++ b/engines/ultima/ultima8/filesys/raw_archive.h
@@ -24,7 +24,6 @@
#define ULTIMA8_FILESYS_RAWARCHIVE_H
#include "ultima/ultima8/filesys/archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/savegame.cpp b/engines/ultima/ultima8/filesys/savegame.cpp
index 58e506e266..4bd8154f9a 100644
--- a/engines/ultima/ultima8/filesys/savegame.cpp
+++ b/engines/ultima/ultima8/filesys/savegame.cpp
@@ -20,14 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/savegame.h"
#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/filesys/odata_source.h"
-#include "ultima/shared/engine/ultima.h"
-#include "common/system.h"
-#include "common/savefile.h"
-#include "graphics/thumbnail.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/savegame.h b/engines/ultima/ultima8/filesys/savegame.h
index ad505eb11f..f1ae00f211 100644
--- a/engines/ultima/ultima8/filesys/savegame.h
+++ b/engines/ultima/ultima8/filesys/savegame.h
@@ -27,7 +27,6 @@
#include "common/hashmap.h"
#include "common/stream.h"
#include "engines/metaengine.h"
-#include "graphics/surface.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.cpp b/engines/ultima/ultima8/filesys/u8_save_file.cpp
index 2c7353b5a8..4c40007340 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.cpp
+++ b/engines/ultima/ultima8/filesys/u8_save_file.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/filesys/u8_save_file.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.h b/engines/ultima/ultima8/filesys/u8_save_file.h
index 2ba99983fa..29675361b7 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.h
+++ b/engines/ultima/ultima8/filesys/u8_save_file.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/filesys/named_archive_file.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index b52c417245..a0dc27a5a1 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/games/u8_game.h"
#include "ultima/ultima8/games/remorse_game.h"
#include "ultima/ultima8/conf/setting_manager.h"
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 152ea29af2..2052718184 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -24,8 +24,6 @@
#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/usecode/usecode_flex.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/fonts/font_shape_archive.h"
@@ -37,15 +35,12 @@
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/wpn_ovlay_dat.h"
-#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/conf/config_file_manager.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
#include "ultima/ultima8/games/game_info.h"
#include "ultima/ultima8/gumps/weasel_dat.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
#include "ultima/ultima8/audio/music_flex.h"
-#include "ultima/ultima8/audio/sound_flex.h"
#include "ultima/ultima8/audio/speech_flex.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/games/remorse_game.cpp b/engines/ultima/ultima8/games/remorse_game.cpp
index 91c19256ef..dce5b3d2f9 100644
--- a/engines/ultima/ultima8/games/remorse_game.cpp
+++ b/engines/ultima/ultima8/games/remorse_game.cpp
@@ -25,18 +25,14 @@
#include "ultima/ultima8/games/start_crusader_process.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/gumps/cru_status_gump.h"
#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/graphics/xform_blend.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "common/memstream.h"
diff --git a/engines/ultima/ultima8/games/start_crusader_process.cpp b/engines/ultima/ultima8/games/start_crusader_process.cpp
index 7168e17077..9efdd34dea 100644
--- a/engines/ultima/ultima8/games/start_crusader_process.cpp
+++ b/engines/ultima/ultima8/games/start_crusader_process.cpp
@@ -20,27 +20,18 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/start_crusader_process.h"
-#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/games/remorse_game.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/egg.h"
-#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/gumps/cru_status_gump.h"
#include "ultima/ultima8/gumps/cru_pickup_area_gump.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
-#include "ultima/ultima8/audio/music_process.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/start_u8_process.cpp b/engines/ultima/ultima8/games/start_u8_process.cpp
index 0d9c0b657a..636e0b72e5 100644
--- a/engines/ultima/ultima8/games/start_u8_process.cpp
+++ b/engines/ultima/ultima8/games/start_u8_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/start_u8_process.h"
#include "ultima/ultima8/games/game.h"
@@ -33,7 +32,6 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/menu_gump.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
diff --git a/engines/ultima/ultima8/games/treasure_loader.h b/engines/ultima/ultima8/games/treasure_loader.h
index b3e4efc572..e4f591ac1d 100644
--- a/engines/ultima/ultima8/games/treasure_loader.h
+++ b/engines/ultima/ultima8/games/treasure_loader.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/world/actors/treasure_info.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/containers.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index 0c71bfaf5a..d9e3a9537a 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -26,7 +26,6 @@
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/fade_to_modal_process.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/xform_blend.h"
@@ -38,7 +37,6 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/gumps/credits_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/audio/music_process.h"
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp
index 57bc81fb68..6dff0009b2 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/graphics/anim_dat.cpp
@@ -24,14 +24,10 @@
#include "ultima/ultima8/graphics/anim_dat.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/world/actors/actor_anim.h"
-#include "ultima/ultima8/world/actors/anim_action.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/avi_player.cpp b/engines/ultima/ultima8/graphics/avi_player.cpp
index 21ae45ba22..ae5e958715 100644
--- a/engines/ultima/ultima8/graphics/avi_player.cpp
+++ b/engines/ultima/ultima8/graphics/avi_player.cpp
@@ -21,14 +21,8 @@
*/
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/avi_player.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/ultima8.h"
-#include "graphics/surface.h"
-#include "common/system.h"
-#include "common/stream.h"
#include "video/avi_decoder.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/avi_player.h b/engines/ultima/ultima8/graphics/avi_player.h
index eea972def6..fe5eb638d4 100644
--- a/engines/ultima/ultima8/graphics/avi_player.h
+++ b/engines/ultima/ultima8/graphics/avi_player.h
@@ -23,9 +23,8 @@
#ifndef ULTIMA8_GRAPHICS_AVIPLAYER_H
#define ULTIMA8_GRAPHICS_AVIPLAYER_H
-#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/graphics/movie_player.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "graphics/managed_surface.h"
namespace Video {
class AVIDecoder;
diff --git a/engines/ultima/ultima8/graphics/cycle_process.cpp b/engines/ultima/ultima8/graphics/cycle_process.cpp
index 0530a6a4d5..4970ad761d 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.cpp
+++ b/engines/ultima/ultima8/graphics/cycle_process.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/cycle_process.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/graphics/palette.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/cycle_process.h b/engines/ultima/ultima8/graphics/cycle_process.h
index 94e743f98c..565488ca75 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.h
+++ b/engines/ultima/ultima8/graphics/cycle_process.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp b/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
index 2a848eb3ec..3a54149157 100644
--- a/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
+++ b/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
#include "ultima/ultima8/graphics/fade_to_modal_process.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/fonts/font.h b/engines/ultima/ultima8/graphics/fonts/font.h
index 86d060c21c..6afa24d7ee 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.h
+++ b/engines/ultima/ultima8/graphics/fonts/font.h
@@ -26,7 +26,6 @@
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/rect.h"
#include "ultima/ultima8/misc/encoding.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index fe724881b5..e6ecaf0ae8 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -24,16 +24,13 @@
#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/fonts/shape_font.h"
#include "ultima/ultima8/graphics/fonts/font_shape_archive.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/graphics/fonts/tt_font.h"
#include "ultima/ultima8/graphics/fonts/jp_font.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "graphics/fonts/ttf.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
index f54804a5ea..c4843bed0a 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GRAPHICS_FONTS_FONTSHAPEARCHIVE_H
#include "ultima/ultima8/graphics/shape_archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp b/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
index d95bd1fe5f..be884edce5 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
@@ -23,10 +23,8 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/fonts/jp_font.h"
#include "ultima/ultima8/graphics/fonts/shape_font.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/fonts/jp_rendered_text.h"
-#include "ultima/ultima8/misc/encoding.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.h b/engines/ultima/ultima8/graphics/fonts/jp_font.h
index 2a0e137595..b25786ba7e 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_font.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GRAPHICS_FONTS_JPFONT_H
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
index 40fc1ddf51..a1c9b24dbb 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/graphics/fonts/jp_rendered_text.h"
#include "ultima/ultima8/graphics/fonts/shape_font.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/misc/encoding.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/palette_manager.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
index 0ee4dc333f..2636e7f7fe 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/rendered_text.h b/engines/ultima/ultima8/graphics/fonts/rendered_text.h
index d38c64c1e7..fe96394092 100644
--- a/engines/ultima/ultima8/graphics/fonts/rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/rendered_text.h
@@ -23,8 +23,6 @@
#ifndef ULTIMA8_GRAPHICS_FONTS_RENDEREDTEXT_H
#define ULTIMA8_GRAPHICS_FONTS_RENDEREDTEXT_H
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
-
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp b/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
index 0662e76db0..69928019ee 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/graphics/fonts/shape_font.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/fonts/shape_rendered_text.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.h b/engines/ultima/ultima8/graphics/fonts/shape_font.h
index 71619d2387..ec36fbc7f9 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_font.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
index fe7d6d4599..0069e2afd4 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
index 965fb7e9fb..a200344896 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
@@ -21,16 +21,10 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/fonts/tt_font.h"
#include "ultima/ultima8/graphics/fonts/ttf_rendered_text.h"
#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/misc/encoding.h"
-#include "common/ustr.h"
-#include "common/system.h"
-#include "graphics/managed_surface.h"
//include iomanip
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.h b/engines/ultima/ultima8/graphics/fonts/tt_font.h
index 765580bf7b..30585e637f 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.h
@@ -24,9 +24,7 @@
#define ULTIMA8_GRAPHICS_FONTS_TTFONT_H
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "graphics/font.h"
-#include "graphics/pixelformat.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
index a6d19ee2af..d5b8258a7f 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/graphics/fonts/ttf_rendered_text.h"
#include "ultima/ultima8/graphics/fonts/tt_font.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
index 3110e10e31..521ada4dad 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
@@ -25,7 +25,6 @@
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "graphics/managed_surface.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/frame_id.h b/engines/ultima/ultima8/graphics/frame_id.h
index fa6512de0b..098c3b428a 100644
--- a/engines/ultima/ultima8/graphics/frame_id.h
+++ b/engines/ultima/ultima8/graphics/frame_id.h
@@ -23,7 +23,7 @@
#ifndef ULTIMA8_GRAPHICS_FRAMEID_H
#define ULTIMA8_GRAPHICS_FRAMEID_H
-#include "common/scummsys.h"
+#include "common/stream.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
index 2a7948302f..eb3db9f11f 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/misc/rect.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.h b/engines/ultima/ultima8/graphics/gump_shape_archive.h
index 702bd430fd..6e6924b56c 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GRAPHICS_GUMPSHAPEARCHIVE_H
#include "ultima/ultima8/graphics/shape_archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/inverter_process.cpp b/engines/ultima/ultima8/graphics/inverter_process.cpp
index a4017b48a1..22889f9b10 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.cpp
+++ b/engines/ultima/ultima8/graphics/inverter_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/inverter_process.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.cpp b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
index e064ef34b0..70b4de52af 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/type_flags.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/graphics/anim_dat.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/graphics/main_shape_archive.h
index 3a8dda9f59..5eab5376c2 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GRAPHICS_MAINSHAPEARCHIVE_H
#include "ultima/ultima8/graphics/shape_archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/manips.h b/engines/ultima/ultima8/graphics/manips.h
deleted file mode 100644
index 3f3e81b3f1..0000000000
--- a/engines/ultima/ultima8/graphics/manips.h
+++ /dev/null
@@ -1,208 +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_GRAPHICS_MANIPS_H
-#define ULTIMA8_GRAPHICS_MANIPS_H
-
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
-
-namespace Ultima {
-namespace Ultima8 {
-
-template<class uintX> class Manip_Nat2Nat {
-public:
- static bool are_same() {
- return true;
- }
- static uintX copy(uintX src) {
- return src;
- }
- static void split(uintX src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- UNPACK_RGBA8(src, r, g, b, a);
- }
- static uintX merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uintX src) {
- uint8 r, g, b;
- UNPACK_RGB(src, r, g, b);
- return (r >> 3) | ((g & 0xFC) << 3) | ((b & 0xF8) << 8);
- }
-};
-
-class Manip_Nat2Nat_16 {
-public:
- static bool are_same() {
- return true;
- }
- static uint16 copy(uint16 src) {
- return src;
- }
- static void split(uint16 src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- UNPACK_RGBA8(src, r, g, b, a);
- }
- static uint16 merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uint16 src) {
- return src;
- }
-};
-
-class Manip_Nat2Nat_32 {
-public:
- static bool are_same() {
- return true;
- }
- static uint32 copy(uint32 src) {
- return src;
- }
- static void split(uint32 src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- UNPACK_RGBA8(src, r, g, b, a);
- }
- static uint32 merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uint32 src) {
- uint8 r, g, b;
- UNPACK_RGB8(src, r, g, b);
- return (r >> 3) | ((g & 0xFC) << 3) | ((b & 0xF8) << 8);
- }
-};
-
-template<class uintX> class Manip_Sta2Nat {
-public:
- static bool are_same() {
- return false;
- }
- static uintX copy(uint32 src) {
- return static_cast<uintX>(PACK_RGBA8(TEX32_R(src), TEX32_G(src), TEX32_B(src), TEX32_A(src)));
- }
- static void split(uint32 src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- r = TEX32_R(src);
- g = TEX32_G(src);
- b = TEX32_B(src);
- a = TEX32_A(src);
- }
- static uintX merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uint32 src) {
- return (src >> 3) | ((src >> 5) & 0x7E0) | ((src >> 8) & 0xF800);
- }
-};
-
-class Manip_Sta2Nat_16 {
-public:
- static bool are_same() {
- return false;
- }
- static uint16 copy(uint32 src) {
- return PACK_RGBA8(TEX32_R(src), TEX32_G(src), TEX32_B(src), TEX32_A(src));
- }
- static void split(uint32 src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- r = TEX32_R(src);
- g = TEX32_G(src);
- b = TEX32_B(src);
- a = TEX32_A(src);
- }
- static uint16 merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uint32 src) {
- return (src >> 3) | ((src >> 5) & 0x7E0) | ((src >> 8) & 0xF800);
- }
-};
-
-class Manip_Sta2Nat_32 {
-public:
- static bool are_same() {
- return false;
- }
- static uint32 copy(uint32 src) {
- return PACK_RGBA8(TEX32_R(src), TEX32_G(src), TEX32_B(src), TEX32_A(src));
- }
- static void split(uint32 src, uint8 &r, uint8 &g, uint8 &b, uint8 &a) {
- r = TEX32_R(src);
- g = TEX32_G(src);
- b = TEX32_B(src);
- a = TEX32_A(src);
- }
- static uint32 merge(uint8 r, uint8 g, uint8 b, uint8 a) {
- return PACK_RGBA8(r, g, b, a);
- }
- static uint16 to16bit(uint32 src) {
- return (src >> 3) | ((src >> 5) & 0x7E0) | ((src >> 8) & 0xF800);
- }
-};
-
-// Assumption, ABGR (but doesn't matter)
-class Manip_32_A888 {
-public:
- static bool are_same() {
- return true;
- }
- static uint32 copy(uint32 src) {
- return src;
- }
- static void split(uint32 src, uint8 &c0, uint8 &c1, uint8 &c2, uint8 &a) {
- c0 = src;
- c1 = src >> 8;
- c2 = src >> 16;
- a = src >> 24;
- }
- static uint32 merge(uint8 c0, uint8 c1, uint8 c2, uint8 a) {
- return c0 | (c1 << 8) | (c2 << 16) | (a << 24);
- }
- static uint16 to16bit(uint32 src) {
- return (src >> 3) | ((src >> 5) & 0x7E0) | ((src >> 8) & 0xF800);
- }
-};
-
-// Assumption, RGBA (but doesn't matter)
-class Manip_32_888A {
-public:
- static bool are_same() {
- return true;
- }
- static uint32 copy(uint32 src) {
- return src;
- }
- static void split(uint32 src, uint8 &c0, uint8 &c1, uint8 &c2, uint8 &a) {
- a = src;
- c2 = src >> 8;
- c1 = src >> 16;
- c0 = src >> 24;
- }
- static uint32 merge(uint8 c0, uint8 c1, uint8 c2, uint8 a) {
- return a | (c2 << 8) | (c1 << 16) | (c0 << 24);
- }
- static uint16 to16bit(uint32 src) {
- return (src >> 27) | ((src >> 13) & 0x7E0) | ((src << 8) & 0xF800);
- }
-};
-
-} // End of namespace Ultima8
-} // End of namespace Ultima
-
-#endif
diff --git a/engines/ultima/ultima8/graphics/palette.cpp b/engines/ultima/ultima8/graphics/palette.cpp
index 291ee6c871..466893e7ef 100644
--- a/engines/ultima/ultima8/graphics/palette.cpp
+++ b/engines/ultima/ultima8/graphics/palette.cpp
@@ -22,8 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/graphics/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
index 2d6cb9a5c9..f6efb2ea11 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/kernel/core_app.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/palette_manager.cpp b/engines/ultima/ultima8/graphics/palette_manager.cpp
index b6aa0a0d77..e3547b35c7 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.cpp
+++ b/engines/ultima/ultima8/graphics/palette_manager.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/texture.h"
diff --git a/engines/ultima/ultima8/graphics/raw_shape_frame.cpp b/engines/ultima/ultima8/graphics/raw_shape_frame.cpp
index fdf2e85f79..65a6ad6514 100644
--- a/engines/ultima/ultima8/graphics/raw_shape_frame.cpp
+++ b/engines/ultima/ultima8/graphics/raw_shape_frame.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/raw_shape_frame.h"
-#include "ultima/ultima8/convert/convert_shape.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/filesys/idata_source.h"
diff --git a/engines/ultima/ultima8/graphics/render_surface.cpp b/engines/ultima/ultima8/graphics/render_surface.cpp
index 8f0f7d44a2..a26f50ace1 100644
--- a/engines/ultima/ultima8/graphics/render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/render_surface.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/soft_render_surface.h"
#include "common/system.h"
#include "engines/util.h"
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index 44be2d4be7..59b89b857d 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -25,7 +25,6 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/raw_shape_frame.h"
-#include "ultima/ultima8/convert/convert_shape.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
#include "ultima/ultima8/filesys/idata_source.h"
diff --git a/engines/ultima/ultima8/graphics/shape.h b/engines/ultima/ultima8/graphics/shape.h
index 994ca65d7d..dc5a8ef958 100644
--- a/engines/ultima/ultima8/graphics/shape.h
+++ b/engines/ultima/ultima8/graphics/shape.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GRAPHICS_SHAPE_H
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/shape_archive.cpp b/engines/ultima/ultima8/graphics/shape_archive.cpp
index 5597267015..ae6eb98153 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/shape_archive.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/graphics/shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/convert/convert_shape.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/graphics/shape_archive.h
index b2b8bc7c5f..ecf6285a25 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/graphics/shape_archive.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GRAPHICS_SHAPEARCHIVE_H
#include "ultima/ultima8/filesys/archive.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/skf_player.cpp b/engines/ultima/ultima8/graphics/skf_player.cpp
index c946f74e2a..c944149d91 100644
--- a/engines/ultima/ultima8/graphics/skf_player.cpp
+++ b/engines/ultima/ultima8/graphics/skf_player.cpp
@@ -31,7 +31,6 @@
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/audio/audio_mixer.h"
#include "ultima/ultima8/audio/raw_audio_sample.h"
#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.cpp b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
index 179c552061..6c1fd5a83f 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.cpp
@@ -22,7 +22,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/soft_render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/palette.h"
diff --git a/engines/ultima/ultima8/graphics/texture.h b/engines/ultima/ultima8/graphics/texture.h
index 4492e29244..9512ec6709 100644
--- a/engines/ultima/ultima8/graphics/texture.h
+++ b/engines/ultima/ultima8/graphics/texture.h
@@ -23,8 +23,6 @@
#ifndef ULTIMA8_GRAPHICS_TEXTURE_H
#define ULTIMA8_GRAPHICS_TEXTURE_H
-#include "graphics/managed_surface.h"
-
namespace Ultima {
namespace Ultima8 {
@@ -49,9 +47,6 @@ namespace Ultima8 {
#define TEX32_R_MASK 0x000000FF
#define TEX32_R(col32) (((col32)&TEX32_R_MASK)>>TEX32_R_SHIFT)
-#define TEX32_AG(col32) (((col32) >> 8) & 0x00FF00FF)
-#define TEX32_RB(col32) (((col32) >> 0) & 0x00FF00FF)
-
#define TEX32_PACK_RGBA(r,g,b,a) (((a)<<TEX32_A_SHIFT)|((r)<<TEX32_R_SHIFT)|\
((g)<<TEX32_G_SHIFT)|((b)<<TEX32_B_SHIFT))
#define TEX32_PACK_RGBA16(r,g,b,a) ((((a)>>8)<<TEX32_A_SHIFT)|\
diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/graphics/type_flags.cpp
index 677a2fd344..a704909ffa 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -23,14 +23,12 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/type_flags.h"
-#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/conf/config_file_manager.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/games/treasure_loader.h"
-#include "ultima/ultima8/games/game_info.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/xform_blend.cpp b/engines/ultima/ultima8/graphics/xform_blend.cpp
index 927bc92325..ff07761924 100644
--- a/engines/ultima/ultima8/graphics/xform_blend.cpp
+++ b/engines/ultima/ultima8/graphics/xform_blend.cpp
@@ -20,9 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/graphics/xform_blend.h"
#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/graphics/xform_blend.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/ask_gump.cpp b/engines/ultima/ultima8/gumps/ask_gump.cpp
index 336114d0be..d13f873995 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.cpp
+++ b/engines/ultima/ultima8/gumps/ask_gump.cpp
@@ -21,7 +21,6 @@
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/ask_gump.h"
#include "ultima/ultima8/gumps/bark_gump.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/gumps/bark_gump.cpp b/engines/ultima/ultima8/gumps/bark_gump.cpp
index a425a81daf..e1a3b89df8 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.cpp
+++ b/engines/ultima/ultima8/gumps/bark_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/bark_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/gumps/book_gump.cpp b/engines/ultima/ultima8/gumps/book_gump.cpp
index 2b24ca918e..937098c225 100644
--- a/engines/ultima/ultima8/gumps/book_gump.cpp
+++ b/engines/ultima/ultima8/gumps/book_gump.cpp
@@ -20,13 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/book_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/item.h"
diff --git a/engines/ultima/ultima8/gumps/computer_gump.cpp b/engines/ultima/ultima8/gumps/computer_gump.cpp
index b6c724de88..85df7566df 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/computer_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/computer_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/games/game_data.h"
@@ -29,12 +28,6 @@
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/usecode/uc_machine.h"
-#include "ultima/ultima8/gumps/gump_notify_process.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/misc/util.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index 6e70dc0b30..f7f61fbf20 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -20,19 +20,15 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/container_gump.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/world/container.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/slider_gump.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/item_factory.h"
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 9648d704ed..9ffef45fff 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/credits_gump.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/desktop_gump.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/cru_ammo_gump.cpp b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
index 9afad1e54c..4319ff260a 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
@@ -20,15 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_ammo_gump.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/cru_display_shapes.h b/engines/ultima/ultima8/gumps/cru_display_shapes.h
deleted file mode 100644
index f872273a02..0000000000
--- a/engines/ultima/ultima8/gumps/cru_display_shapes.h
+++ /dev/null
@@ -1,63 +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_GUMPS_CRUINVENTORYGUMP_H
-#define ULTIMA8_GUMPS_CRUINVENTORYGUMP_H
-
-#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
-
-namespace Ultima {
-namespace Ultima8 {
-
-class TextWidget;
-
-/**
- * Inventory box, the 3rd box along the bottom of the screen
- */
-class CruInventoryGump : public CruStatGump {
-public:
- ENABLE_RUNTIME_CLASSTYPE()
-
- CruInventoryGump();
- CruInventoryGump(Shape *shape, int x);
- ~CruInventoryGump() override;
-
- // Init the gump, call after construction
- void InitGump(Gump *newparent, bool take_focus = true) override;
-
- // Paint this Gump
- void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
-
- bool loadData(Common::ReadStream *rs, uint32 version);
- void saveData(Common::WriteStream *ws) override;
-
-private:
- Shape *_inventoryShape;
- Gump *_inventoryItemGump;
- TextWidget *_inventoryText;
-};
-
-} // End of namespace Ultima8
-} // End of namespace Ultima
-
-#endif
diff --git a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
index 8f0cbf5e2e..ffb0bf861b 100644
--- a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
@@ -20,13 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_energy_gump.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/cru_health_gump.cpp b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
index c2b1f30b6e..4b948375cd 100644
--- a/engines/ultima/ultima8/gumps/cru_health_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
@@ -20,16 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_health_gump.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
index a120c499b8..b00cca7907 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -20,16 +20,12 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_inventory_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_area_gump.cpp b/engines/ultima/ultima8/gumps/cru_pickup_area_gump.cpp
index 202df47ca8..365daafcf0 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_area_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_pickup_area_gump.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_pickup_area_gump.h"
#include "ultima/ultima8/gumps/cru_pickup_gump.h"
-#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
index 4d95a26e9d..7cb27ead09 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_pickup_gump.h"
#include "ultima/ultima8/gumps/translucent_gump.h"
@@ -30,8 +29,6 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_stat_gump.cpp b/engines/ultima/ultima8/gumps/cru_stat_gump.cpp
index 1c041353d4..d1a91eb839 100644
--- a/engines/ultima/ultima8/gumps/cru_stat_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_stat_gump.cpp
@@ -20,15 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_stat_gump.h b/engines/ultima/ultima8/gumps/cru_stat_gump.h
index b960668276..ed000fb00e 100644
--- a/engines/ultima/ultima8/gumps/cru_stat_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_stat_gump.h
@@ -23,7 +23,6 @@
#ifndef ULTIMA8_GUMPS_CRUSTATGUMP_H
#define ULTIMA8_GUMPS_CRUSTATGUMP_H
-#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/gumps/translucent_gump.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
diff --git a/engines/ultima/ultima8/gumps/cru_status_gump.cpp b/engines/ultima/ultima8/gumps/cru_status_gump.cpp
index a33c46b170..727c823619 100644
--- a/engines/ultima/ultima8/gumps/cru_status_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_status_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_status_gump.h"
#include "ultima/ultima8/gumps/cru_weapon_gump.h"
#include "ultima/ultima8/gumps/cru_ammo_gump.h"
@@ -32,9 +31,6 @@
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp b/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
index bded985dea..c9246d5994 100644
--- a/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
@@ -20,15 +20,12 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/cru_weapon_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.cpp b/engines/ultima/ultima8/gumps/desktop_gump.cpp
index 359bffdd01..1d133673af 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.cpp
+++ b/engines/ultima/ultima8/gumps/desktop_gump.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/gumps/target_gump.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp b/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
index 0a2e05edf9..3459409463 100644
--- a/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
+++ b/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
@@ -20,9 +20,7 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/fast_area_vis_gump.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/graphics/render_surface.h"
diff --git a/engines/ultima/ultima8/gumps/game_map_gump.cpp b/engines/ultima/ultima8/gumps/game_map_gump.cpp
index 1bfc4d13c4..60771f0d4f 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.cpp
+++ b/engines/ultima/ultima8/gumps/game_map_gump.cpp
@@ -20,36 +20,21 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/map.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/item_sorter.h"
#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
#include "ultima/ultima8/world/missile_tracker.h"
-#include "ultima/ultima8/misc/direction.h"
-#include "ultima/ultima8/world/gravity_process.h" // hack...
-#include "ultima/ultima8/kernel/object_manager.h" // hack...
#include "ultima/ultima8/world/actors/pathfinder_process.h"
-#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/world/loop_script.h"
// map dumping
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/filesys/file_system.h"
-#include "image/png.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/game_map_gump.h b/engines/ultima/ultima8/gumps/game_map_gump.h
index c6678b14af..6651af737e 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.h
+++ b/engines/ultima/ultima8/gumps/game_map_gump.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GUMPS_GAMEMAPGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index 72f3b137a5..ac47d6f3a5 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/shape.h"
diff --git a/engines/ultima/ultima8/gumps/gump_notify_process.cpp b/engines/ultima/ultima8/gumps/gump_notify_process.cpp
index ebfe0549bf..120f766e59 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.cpp
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.cpp b/engines/ultima/ultima8/gumps/inverter_gump.cpp
index 10583bcca4..e3ef172ffe 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.cpp
+++ b/engines/ultima/ultima8/gumps/inverter_gump.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/inverter_gump.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.h b/engines/ultima/ultima8/gumps/inverter_gump.h
index cbd5667907..a80055ce02 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.h
+++ b/engines/ultima/ultima8/gumps/inverter_gump.h
@@ -24,7 +24,6 @@
#define ULTIMA8_GUMPS_INVERTERGUMP_H
#include "ultima/ultima8/gumps/desktop_gump.h"
-#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
index 4b9e32ae89..ae29940730 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.cpp
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/item_relative_gump.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/container.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/keypad_gump.cpp b/engines/ultima/ultima8/gumps/keypad_gump.cpp
index bacdeaaede..87e7e5f82c 100644
--- a/engines/ultima/ultima8/gumps/keypad_gump.cpp
+++ b/engines/ultima/ultima8/gumps/keypad_gump.cpp
@@ -20,19 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/gumps/keypad_gump.h"
-#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
-#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/usecode/uc_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/main_menu_process.cpp b/engines/ultima/ultima8/gumps/main_menu_process.cpp
index 2251e55515..969750118b 100644
--- a/engines/ultima/ultima8/gumps/main_menu_process.cpp
+++ b/engines/ultima/ultima8/gumps/main_menu_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/main_menu_process.h"
#include "ultima/ultima8/gumps/menu_gump.h"
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index bcbb9943e2..1338a88d70 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/gumps/remorse_menu_gump.h"
#include "ultima/ultima8/games/game_data.h"
@@ -28,16 +27,11 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/quit_gump.h"
-#include "ultima/ultima8/gumps/paged_gump.h"
#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/audio/music_process.h"
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index 82df0d0817..1246924855 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -20,23 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/message_box_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/graphics/render_surface.h"
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
index 7976390253..122ebe81c1 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
@@ -20,17 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/mini_stats_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/gumps/paperdoll_gump.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 0a743d9aa6..c79389ffc2 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -20,16 +20,12 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/minimap_gump.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.h b/engines/ultima/ultima8/gumps/minimap_gump.h
index 4cc5929225..abc628ce88 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.h
+++ b/engines/ultima/ultima8/gumps/minimap_gump.h
@@ -24,9 +24,9 @@
#define ULTIMA8_GUMPS_MINIMAPGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "graphics/managed_surface.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/modal_gump.cpp b/engines/ultima/ultima8/gumps/modal_gump.cpp
index 684aea67ce..e0144cf227 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.cpp
+++ b/engines/ultima/ultima8/gumps/modal_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/gumps/movie_gump.cpp b/engines/ultima/ultima8/gumps/movie_gump.cpp
index 57dd4234df..6050cbefa6 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.cpp
+++ b/engines/ultima/ultima8/gumps/movie_gump.cpp
@@ -20,21 +20,16 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/graphics/avi_player.h"
#include "ultima/ultima8/graphics/skf_player.h"
#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/kernel.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/gumps/cru_status_gump.h"
diff --git a/engines/ultima/ultima8/gumps/paged_gump.cpp b/engines/ultima/ultima8/gumps/paged_gump.cpp
index 811097377e..8a7fbedd13 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paged_gump.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#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/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index 9f51f3ebfb..9fbe2584b1 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/paperdoll_gump.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/games/game_data.h"
@@ -32,7 +30,6 @@
#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/mini_stats_gump.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/gumps/quit_gump.cpp b/engines/ultima/ultima8/gumps/quit_gump.cpp
index f9a24b550d..2fcb0ce10b 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.cpp
+++ b/engines/ultima/ultima8/gumps/quit_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/gumps/quit_gump.h"
#include "ultima/ultima8/games/game_data.h"
@@ -28,7 +27,6 @@
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
diff --git a/engines/ultima/ultima8/gumps/readable_gump.cpp b/engines/ultima/ultima8/gumps/readable_gump.cpp
index 425d179abf..6457f69f71 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/readable_gump.cpp
@@ -20,20 +20,15 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/readable_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/misc/util.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
index 0a8ed310d4..4749f4efd0 100644
--- a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/remorse_menu_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
@@ -31,13 +30,10 @@
#include "ultima/ultima8/gumps/quit_gump.h"
#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/gumps/u8_save_gump.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/meta_engine.h"
-#include "engines/dialogs.h"
#include "engines/dialogs.h"
#include "common/translation.h"
diff --git a/engines/ultima/ultima8/gumps/resizable_gump.cpp b/engines/ultima/ultima8/gumps/resizable_gump.cpp
index 27687f22a5..d7178ca0a6 100644
--- a/engines/ultima/ultima8/gumps/resizable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/resizable_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/resizable_gump.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.cpp b/engines/ultima/ultima8/gumps/scroll_gump.cpp
index de75adff4c..7fe6b63a9b 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/scroll_gump.cpp
@@ -20,13 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/scroll_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/item.h"
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index a7bd5f2df9..77fa2d172f 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/graphics/shape_archive.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/graphics/shape.h"
@@ -38,7 +36,6 @@
#include "ultima/ultima8/graphics/fonts/font_shape_archive.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index edc0c4ecd2..0d0a1ae4a3 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/slider_gump.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/gumps/widgets/sliding_widget.h"
#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index df7ea35903..ab6632007e 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/target_gump.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/gumps/translucent_gump.cpp b/engines/ultima/ultima8/gumps/translucent_gump.cpp
index b359998e75..1c61e3514b 100644
--- a/engines/ultima/ultima8/gumps/translucent_gump.cpp
+++ b/engines/ultima/ultima8/gumps/translucent_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/translucent_gump.h"
#include "ultima/ultima8/graphics/render_surface.h"
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 34385c0021..195ad54b10 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -20,17 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/u8_save_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/widgets/edit_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/filesys/savegame.h"
#include "ultima/ultima8/gumps/paged_gump.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/weasel_dat.cpp b/engines/ultima/ultima8/gumps/weasel_dat.cpp
index 2accff62b7..5e9c5fb7e7 100644
--- a/engines/ultima/ultima8/gumps/weasel_dat.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_dat.cpp
@@ -21,8 +21,6 @@
*/
#include "ultima/ultima8/gumps/weasel_dat.h"
-#include "common/util.h"
-#include "common/stream.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.cpp b/engines/ultima/ultima8/gumps/weasel_gump.cpp
index 39d684ebbb..afed4654aa 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_gump.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/weasel_gump.h"
#include "ultima/ultima8/gumps/weasel_dat.h"
#include "ultima/ultima8/games/game_data.h"
@@ -31,18 +30,12 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
-#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/meta_engine.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "engines/dialogs.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
index 8b00510595..e6dec49411 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
#include "ultima/ultima8/graphics/shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/kernel/mouse.h"
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index d2e1af1058..ceb3a8da8f 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -20,14 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/widgets/edit_widget.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/tt_font.h"
-#include "ultima/ultima8/misc/encoding.h"
#include "common/system.h"
#include "common/events.h"
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp b/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
index d47bd465c8..47c097e06d 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.cpp
@@ -20,10 +20,7 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/widgets/sliding_widget.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index 1422e973a6..3bb522ca55 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -20,13 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
#include "ultima/ultima8/graphics/fonts/rendered_text.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/tt_font.h"
#include "ultima/ultima8/gumps/bark_gump.h"
#include "ultima/ultima8/gumps/ask_gump.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index 7f25f655f3..531572ed54 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -23,12 +23,7 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/ultima8/conf/config_file_manager.h"
#include "ultima/ultima8/conf/setting_manager.h"
-#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/misc/args.h"
-#include "ultima/ultima8/games/game_info.h"
-#include "ultima/shared/std/misc.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index b0ec03c495..860b1e7217 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -23,10 +23,8 @@
#ifndef ULTIMA8_KERNEL_COREAPP_H
#define ULTIMA8_KERNEL_COREAPP_H
-#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/args.h"
#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "ultima/detection.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/kernel/delay_process.cpp b/engines/ultima/ultima8/kernel/delay_process.cpp
index 767b920ae6..f948777271 100644
--- a/engines/ultima/ultima8/kernel/delay_process.cpp
+++ b/engines/ultima/ultima8/kernel/delay_process.cpp
@@ -20,10 +20,7 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
-#include "ultima/shared/std/string.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/kernel/kernel.cpp b/engines/ultima/ultima8/kernel/kernel.cpp
index a8630714c9..0de700aa17 100644
--- a/engines/ultima/ultima8/kernel/kernel.cpp
+++ b/engines/ultima/ultima8/kernel/kernel.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/misc/id_man.h"
-#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index f1977d505e..daaa743ca4 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -22,16 +22,11 @@
#include "graphics/cursorman.h"
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/misc/rect.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/kernel/mouse.h b/engines/ultima/ultima8/kernel/mouse.h
index 5331039b04..b10982424e 100644
--- a/engines/ultima/ultima8/kernel/mouse.h
+++ b/engines/ultima/ultima8/kernel/mouse.h
@@ -25,9 +25,7 @@
#include "common/system.h"
#include "common/rect.h"
-#include "common/stack.h"
#include "ultima/shared/engine/events.h"
-#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/misc/direction.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/kernel/object.cpp b/engines/ultima/ultima8/kernel/object.cpp
index caea06046a..1c93806efe 100644
--- a/engines/ultima/ultima8/kernel/object.cpp
+++ b/engines/ultima/ultima8/kernel/object.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/object.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/usecode/uc_process.h"
#include "ultima/ultima8/usecode/uc_machine.h"
diff --git a/engines/ultima/ultima8/kernel/object_manager.cpp b/engines/ultima/ultima8/kernel/object_manager.cpp
index 87503616af..bb9ecde0af 100644
--- a/engines/ultima/ultima8/kernel/object_manager.cpp
+++ b/engines/ultima/ultima8/kernel/object_manager.cpp
@@ -22,24 +22,14 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/id_man.h"
-#include "ultima/ultima8/kernel/object.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/world/monster_egg.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/world/glob_egg.h"
-#include "ultima/ultima8/gumps/game_map_gump.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/ask_gump.h"
#include "ultima/ultima8/gumps/bark_gump.h"
-#include "ultima/ultima8/gumps/container_gump.h"
#include "ultima/ultima8/gumps/paperdoll_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index c15a7e20f8..ed6fd217a4 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
diff --git a/engines/ultima/ultima8/meta_engine.cpp b/engines/ultima/ultima8/meta_engine.cpp
index 3184764e4e..0d13c91429 100644
--- a/engines/ultima/ultima8/meta_engine.cpp
+++ b/engines/ultima/ultima8/meta_engine.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/ultima8.h"
#include "common/translation.h"
-#include "common/ustr.h"
#include "backends/keymapper/action.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/misc/args.cpp b/engines/ultima/ultima8/misc/args.cpp
index 349d62b71f..4c5156d7b0 100644
--- a/engines/ultima/ultima8/misc/args.cpp
+++ b/engines/ultima/ultima8/misc/args.cpp
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/misc/args.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index a628a995b3..2f75848286 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -21,14 +21,11 @@
*/
#include "image/png.h"
-#include "image/bmp.h"
-#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/filesys/file_system.h"
-#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/graphics/inverter_process.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/gumps/fast_area_vis_gump.h"
@@ -39,13 +36,11 @@
#include "ultima/ultima8/gumps/shape_viewer_gump.h"
#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/misc/id_man.h"
#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/usecode/bit_set.h"
-#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/world/get_object.h"
@@ -55,7 +50,11 @@
#include "ultima/ultima8/world/target_reticle_process.h"
#include "ultima/ultima8/world/item_selection_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
+
+#ifdef DEBUG
#include "ultima/ultima8/world/actors/pathfinder.h"
+#endif
+
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/encoding.cpp b/engines/ultima/ultima8/misc/encoding.cpp
index 0753d2f490..f6debea591 100644
--- a/engines/ultima/ultima8/misc/encoding.cpp
+++ b/engines/ultima/ultima8/misc/encoding.cpp
@@ -29,7 +29,6 @@ Copyright (C) 1999-2004 Free Software Foundation, Inc.
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/encoding.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/istring.cpp b/engines/ultima/ultima8/misc/istring.cpp
index 1b10dc16e7..461674bae2 100644
--- a/engines/ultima/ultima8/misc/istring.cpp
+++ b/engines/ultima/ultima8/misc/istring.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/misc/istring.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/misc/istring.h b/engines/ultima/ultima8/misc/istring.h
index 0bdf742512..93ebf594f4 100644
--- a/engines/ultima/ultima8/misc/istring.h
+++ b/engines/ultima/ultima8/misc/istring.h
@@ -45,7 +45,7 @@ public:
return compareToIgnoreCase(s);
}
- void split(Common::Array<istring> &arr) const ;
+ void split(Common::Array<istring> &arr) const;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/misc/util.cpp b/engines/ultima/ultima8/misc/util.cpp
index 24c1663b48..eb341a3dba 100644
--- a/engines/ultima/ultima8/misc/util.cpp
+++ b/engines/ultima/ultima8/misc/util.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/misc/istring.h"
-#include "ultima/shared/std/string.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/util.h b/engines/ultima/ultima8/misc/util.h
index ef619419b9..f6c5ffb57f 100644
--- a/engines/ultima/ultima8/misc/util.h
+++ b/engines/ultima/ultima8/misc/util.h
@@ -25,7 +25,6 @@
#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/misc.h"
-#include "ultima/ultima8/misc/istring.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 63bdc4f200..2e940bc87d 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -20,79 +20,46 @@
*
*/
-#include "common/scummsys.h"
-#include "common/translation.h"
-#include "common/unzip.h"
-#include "common/translation.h"
-#include "common/config-manager.h"
-#include "gui/saveload.h"
#include "image/png.h"
-#include "ultima/shared/engine/events.h"
-#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/misc/pent_include.h"
// TODO: !! a lot of these includes are just for some hacks... clean up sometime
-#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/conf/setting_manager.h"
-#include "ultima/ultima8/conf/config_file_manager.h"
#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/games/game_info.h"
#include "ultima/ultima8/games/start_u8_process.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/misc/direction.h"
-#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/filesys/savegame.h"
-#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/gumps/desktop_gump.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/gumps/inverter_gump.h"
-#include "ultima/ultima8/gumps/fast_area_vis_gump.h"
#include "ultima/ultima8/gumps/minimap_gump.h"
-#include "ultima/ultima8/gumps/quit_gump.h"
-#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/gumps/cru_status_gump.h"
#include "ultima/ultima8/gumps/movie_gump.h"
#include "ultima/ultima8/gumps/weasel_gump.h"
// For gump positioning... perhaps shouldn't do it this way....
-#include "ultima/ultima8/gumps/bark_gump.h"
-#include "ultima/ultima8/gumps/ask_gump.h"
-#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/gumps/message_box_gump.h"
#include "ultima/ultima8/gumps/keypad_gump.h"
#include "ultima/ultima8/gumps/computer_gump.h"
#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/battery_charger_process.h"
#include "ultima/ultima8/world/actors/cru_healer_process.h"
#include "ultima/ultima8/world/actors/targeted_anim_process.h"
#include "ultima/ultima8/usecode/u8_intrinsics.h"
#include "ultima/ultima8/usecode/remorse_intrinsics.h"
#include "ultima/ultima8/usecode/regret_intrinsics.h"
-#include "ultima/ultima8/world/egg.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/graphics/inverter_process.h"
+
#include "ultima/ultima8/graphics/cycle_process.h"
-#include "ultima/ultima8/world/actors/heal_process.h"
#include "ultima/ultima8/world/actors/scheduler_process.h"
#include "ultima/ultima8/world/egg_hatcher_process.h" // for a hack
#include "ultima/ultima8/usecode/uc_process.h" // more hacking
-#include "ultima/ultima8/gumps/gump_notify_process.h" // guess
#include "ultima/ultima8/world/actors/actor_bark_notify_process.h" // guess
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
-#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/item_selection_process.h"
#include "ultima/ultima8/world/split_item_process.h"
#include "ultima/ultima8/world/target_reticle_process.h"
@@ -105,26 +72,19 @@
#include "ultima/ultima8/world/actors/clear_feign_death_process.h"
#include "ultima/ultima8/world/actors/loiter_process.h"
#include "ultima/ultima8/world/actors/avatar_death_process.h"
-#include "ultima/ultima8/world/actors/grant_peace_process.h"
-#include "ultima/ultima8/world/actors/cru_healer_process.h"
#include "ultima/ultima8/world/actors/surrender_process.h"
#include "ultima/ultima8/world/actors/combat_process.h"
#include "ultima/ultima8/world/actors/guard_process.h"
#include "ultima/ultima8/world/actors/attack_process.h"
#include "ultima/ultima8/world/actors/pace_process.h"
-#include "ultima/ultima8/world/fireball_process.h"
#include "ultima/ultima8/world/super_sprite_process.h"
#include "ultima/ultima8/world/destroy_item_process.h"
#include "ultima/ultima8/world/actors/ambush_process.h"
-#include "ultima/ultima8/world/actors/pathfinder.h"
#include "ultima/ultima8/audio/audio_mixer.h"
#include "ultima/ultima8/audio/u8_music_process.h"
#include "ultima/ultima8/audio/remorse_music_process.h"
-#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/midi_player.h"
#include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/graphics/xform_blend.h"
-#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/meta_engine.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index c35bacb480..2e79a042e8 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -42,7 +42,6 @@
#include "ultima/ultima8/misc/args.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
#include "common/events.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index 89e3ae56fd..cd4c90d880 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -27,7 +27,6 @@
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/usecode/bit_set.h"
@@ -38,7 +37,6 @@
#include "ultima/ultima8/filesys/idata_source.h"
#include "ultima/ultima8/convert/u8/convert_usecode_u8.h"
-#include "ultima/ultima8/convert/crusader/convert_usecode_crusader.h"
#include "ultima/ultima8/convert/crusader/convert_usecode_regret.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/usecode/uc_process.cpp b/engines/ultima/ultima8/usecode/uc_process.cpp
index 31be459414..9ff4e63754 100644
--- a/engines/ultima/ultima8/usecode/uc_process.cpp
+++ b/engines/ultima/ultima8/usecode/uc_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/usecode/uc_process.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/usecode/usecode.h"
diff --git a/engines/ultima/ultima8/usecode/usecode.h b/engines/ultima/ultima8/usecode/usecode.h
index 0efc6fb9dc..b874cdcc9b 100644
--- a/engines/ultima/ultima8/usecode/usecode.h
+++ b/engines/ultima/ultima8/usecode/usecode.h
@@ -23,8 +23,6 @@
#ifndef ULTIMA8_USECODE_USECODE_H
#define ULTIMA8_USECODE_USECODE_H
-#include "ultima/shared/std/string.h"
-
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/usecode/usecode_flex.cpp b/engines/ultima/ultima8/usecode/usecode_flex.cpp
index 9d04c0dc15..86ba5d05f4 100644
--- a/engines/ultima/ultima8/usecode/usecode_flex.cpp
+++ b/engines/ultima/ultima8/usecode/usecode_flex.cpp
@@ -24,7 +24,6 @@
#include "ultima/ultima8/usecode/usecode_flex.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 63a5c81ae3..d0ddebc3d9 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -24,23 +24,17 @@
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/anim_dat.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
#include "ultima/ultima8/world/actors/anim_action.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/npc_dat.h"
-#include "ultima/ultima8/world/actors/pathfinder.h"
#include "ultima/ultima8/world/actors/resurrection_process.h"
#include "ultima/ultima8/world/actors/clear_feign_death_process.h"
#include "ultima/ultima8/world/actors/pathfinder_process.h"
@@ -52,7 +46,6 @@
#include "ultima/ultima8/world/actors/surrender_process.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/destroy_item_process.h"
#include "ultima/ultima8/world/sprite_process.h"
#include "ultima/ultima8/world/target_reticle_process.h"
#include "ultima/ultima8/world/item_selection_process.h"
@@ -60,7 +53,6 @@
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/world/fire_type.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/music_process.h"
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 9762e5dd9b..e6b731ff3f 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -20,24 +20,16 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
-#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/world/actors/animation.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
#include "ultima/ultima8/world/actors/anim_action.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/gravity_process.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/conf/setting_manager.h"
diff --git a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
index 571cc1dc95..88b14b82e5 100644
--- a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
@@ -20,13 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/world/actors/actor_bark_notify_process.h"
-#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/actors/ambush_process.cpp b/engines/ultima/ultima8/world/actors/ambush_process.cpp
index e4b974e1dc..ea2cbdf878 100644
--- a/engines/ultima/ultima8/world/actors/ambush_process.cpp
+++ b/engines/ultima/ultima8/world/actors/ambush_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/ambush_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/world/actors/anim_action.cpp b/engines/ultima/ultima8/world/actors/anim_action.cpp
index 43008c64f8..0771441f3f 100644
--- a/engines/ultima/ultima8/world/actors/anim_action.cpp
+++ b/engines/ultima/ultima8/world/actors/anim_action.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/anim_action.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/kernel/core_app.h"
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index 68d1d12eb3..d5934b8d66 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -29,13 +29,10 @@
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/anim_dat.h"
#include "ultima/ultima8/world/actors/anim_action.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/kernel/core_app.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/attack_process.cpp b/engines/ultima/ultima8/world/actors/attack_process.cpp
index 3bdeb732ee..588981bfc9 100644
--- a/engines/ultima/ultima8/world/actors/attack_process.cpp
+++ b/engines/ultima/ultima8/world/actors/attack_process.cpp
@@ -20,14 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/attack_process.h"
-#include "common/memstream.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/usecode/uc_list.h"
@@ -37,12 +34,9 @@
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/world/weapon_info.h"
-#include "ultima/ultima8/world/actors/animation_tracker.h"
#include "ultima/ultima8/world/actors/combat_dat.h"
#include "ultima/ultima8/world/actors/loiter_process.h"
#include "ultima/ultima8/world/actors/pathfinder_process.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
index 95b6dfd227..3335388d70 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/avatar_death_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
@@ -32,7 +31,6 @@
#include "ultima/ultima8/gumps/main_menu_process.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
index bbc4746e7a..f516f7c0da 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
@@ -20,13 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
index 6c8017349e..19675a1b6f 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
@@ -20,21 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/animation.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/targeted_anim_process.h"
-#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/conf/setting_manager.h"
-#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/battery_charger_process.cpp b/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
index be096080b3..52836a7370 100644
--- a/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
+++ b/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/battery_charger_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/kernel/kernel.h"
@@ -28,7 +27,6 @@
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/audio/audio_process.h"
-#include "common/util.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp b/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
index 6dfd0916ff..68e616855f 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/clear_feign_death_process.h"
#include "ultima/ultima8/world/actors/actor.h"
diff --git a/engines/ultima/ultima8/world/actors/combat_process.cpp b/engines/ultima/ultima8/world/actors/combat_process.cpp
index 64287c5f52..c153e5f468 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.cpp
+++ b/engines/ultima/ultima8/world/actors/combat_process.cpp
@@ -20,22 +20,16 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/combat_process.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/world/weapon_info.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/world/actors/pathfinder_process.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/world/actors/monster_info.h"
-#include "ultima/ultima8/misc/direction.h"
-#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/loiter_process.h"
#include "ultima/ultima8/world/actors/ambush_process.h"
diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
index aef2c65732..2405b6f1c6 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -20,19 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/cru_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/animation.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
-#include "ultima/ultima8/world/actors/targeted_anim_process.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
index 1f8ee22a12..97a6142150 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
@@ -23,9 +23,8 @@
#ifndef WORLD_ACTORS_CRUAVATARMOVERPROCESS_H
#define WORLD_ACTORS_CRUAVATARMOVERPROCESS_H
-#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
+#include "ultima/ultima8/world/actors/animation.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/cru_healer_process.cpp b/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
index 6c451b1726..aefb16e825 100644
--- a/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/cru_healer_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/kernel/kernel.h"
@@ -29,7 +28,6 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/audio/audio_process.h"
-#include "common/util.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
index 1bd74b2183..570610e37c 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
@@ -20,17 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/grant_peace_process.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/gumps/target_gump.h"
-#include "ultima/ultima8/world/weapon_info.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/world/actors/guard_process.cpp b/engines/ultima/ultima8/world/actors/guard_process.cpp
index a25d408f9f..7257f72ea3 100644
--- a/engines/ultima/ultima8/world/actors/guard_process.cpp
+++ b/engines/ultima/ultima8/world/actors/guard_process.cpp
@@ -20,15 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/guard_process.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/heal_process.cpp b/engines/ultima/ultima8/world/actors/heal_process.cpp
index b0baaea82d..5d55753213 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.cpp
+++ b/engines/ultima/ultima8/world/actors/heal_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/heal_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.cpp b/engines/ultima/ultima8/world/actors/loiter_process.cpp
index 72b75e7343..6dc38796c2 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.cpp
+++ b/engines/ultima/ultima8/world/actors/loiter_process.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/world/actors/loiter_process.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/pathfinder_process.h"
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index cfc8796799..84f2dd8e1d 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -20,25 +20,19 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
#include "ultima/ultima8/world/target_reticle_process.h"
#include "ultima/ultima8/world/camera_process.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/actors/avatar_death_process.h"
#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/conf/setting_manager.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/anim_dat.h"
#include "ultima/ultima8/graphics/wpn_ovlay_dat.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/gumps/cru_pickup_area_gump.h"
#include "ultima/ultima8/audio/audio_process.h"
diff --git a/engines/ultima/ultima8/world/actors/pace_process.cpp b/engines/ultima/ultima8/world/actors/pace_process.cpp
index 8575098d21..72de484431 100644
--- a/engines/ultima/ultima8/world/actors/pace_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pace_process.cpp
@@ -20,11 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/pace_process.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.cpp b/engines/ultima/ultima8/world/actors/pathfinder.cpp
index a7800fb700..631b85b16a 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder.cpp
@@ -20,16 +20,14 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/world/actors/pathfinder.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
+
+#ifdef DEBUG
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
-#include "ultima/ultima8/ultima8.h"
-#include "common/system.h"
+#endif
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
index b86d89217e..e6d829d52c 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/pathfinder_process.h"
#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/world/actors/pathfinder.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/misc/direction_util.h"
diff --git a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
index c3e6007ad2..c38082e952 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
@@ -20,15 +20,12 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/quick_avatar_mover_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
diff --git a/engines/ultima/ultima8/world/actors/resurrection_process.cpp b/engines/ultima/ultima8/world/actors/resurrection_process.cpp
index 30a0de2e99..7f37fe3c81 100644
--- a/engines/ultima/ultima8/world/actors/resurrection_process.cpp
+++ b/engines/ultima/ultima8/world/actors/resurrection_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/resurrection_process.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/actors/scheduler_process.cpp b/engines/ultima/ultima8/world/actors/scheduler_process.cpp
index cd40289152..17f51c68c9 100644
--- a/engines/ultima/ultima8/world/actors/scheduler_process.cpp
+++ b/engines/ultima/ultima8/world/actors/scheduler_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/scheduler_process.h"
#include "ultima/ultima8/world/actors/actor.h"
diff --git a/engines/ultima/ultima8/world/actors/surrender_process.cpp b/engines/ultima/ultima8/world/actors/surrender_process.cpp
index 3d316e34e8..28adc3bb44 100644
--- a/engines/ultima/ultima8/world/actors/surrender_process.cpp
+++ b/engines/ultima/ultima8/world/actors/surrender_process.cpp
@@ -20,17 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
-#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/actors/surrender_process.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
index 42a3867222..4685e1c31d 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/targeted_anim_process.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
diff --git a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.cpp b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.cpp
index ccd9b3a078..7a29c2c034 100644
--- a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.cpp
+++ b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/teleport_to_egg_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
index f4b2ae73d6..d589116c77 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -20,21 +20,15 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/actors/u8_avatar_mover_process.h"
-#include "ultima/ultima8/world/actors/animation.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/targeted_anim_process.h"
#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
index 3cf988b787..f10b745951 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
@@ -23,9 +23,8 @@
#ifndef WORLD_ACTORS_U8AVATARMOVERPROCESS_H
#define WORLD_ACTORS_U8AVATARMOVERPROCESS_H
-#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
+#include "ultima/ultima8/world/actors/animation.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index 370c2fb292..9be8214f70 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -20,14 +20,10 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/camera_process.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/usecode/uc_machine.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index f8390f8919..85aeaafaad 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -20,19 +20,16 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/container.h"
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/graphics/shape_info.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/create_item_process.cpp b/engines/ultima/ultima8/world/create_item_process.cpp
index 59663f94e8..41ff0d5187 100644
--- a/engines/ultima/ultima8/world/create_item_process.cpp
+++ b/engines/ultima/ultima8/world/create_item_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/create_item_process.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/item.h"
diff --git a/engines/ultima/ultima8/world/crosshair_process.cpp b/engines/ultima/ultima8/world/crosshair_process.cpp
index 74c4cfc4f8..50d0f5af75 100644
--- a/engines/ultima/ultima8/world/crosshair_process.cpp
+++ b/engines/ultima/ultima8/world/crosshair_process.cpp
@@ -26,8 +26,6 @@
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/actors/cru_avatar_mover_process.h"
#include "ultima/ultima8/world/crosshair_process.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 945db6d2e2..b3c6a3a777 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -23,26 +23,18 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/map.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/glob_egg.h"
-#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/world_point.h"
-#include "ultima/ultima8/world/container.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/usecode/uc_machine.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/world/egg_hatcher_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/misc/rect.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/damage_info.cpp b/engines/ultima/ultima8/world/damage_info.cpp
index cd8f4efae8..8ecd045294 100644
--- a/engines/ultima/ultima8/world/damage_info.cpp
+++ b/engines/ultima/ultima8/world/damage_info.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/world/damage_info.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/audio/audio_process.h"
diff --git a/engines/ultima/ultima8/world/damage_info.h b/engines/ultima/ultima8/world/damage_info.h
index 62bb68501f..05537f2570 100644
--- a/engines/ultima/ultima8/world/damage_info.h
+++ b/engines/ultima/ultima8/world/damage_info.h
@@ -23,8 +23,6 @@
#ifndef WORLD_DAMAGE_INFO_H
#define WORLD_DAMAGE_INFO_H
-#include "common/stream.h"
-
#include "ultima/shared/std/string.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/destroy_item_process.cpp b/engines/ultima/ultima8/world/destroy_item_process.cpp
index bf683da802..24bcd0d6d6 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.cpp
+++ b/engines/ultima/ultima8/world/destroy_item_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/destroy_item_process.h"
#include "ultima/ultima8/world/item.h"
diff --git a/engines/ultima/ultima8/world/egg.cpp b/engines/ultima/ultima8/world/egg.cpp
index 629b4b6859..f42b7896ac 100644
--- a/engines/ultima/ultima8/world/egg.cpp
+++ b/engines/ultima/ultima8/world/egg.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.cpp b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
index fac50d9311..a4d9578fae 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.cpp
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/egg_hatcher_process.h"
-#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/fire_type.cpp b/engines/ultima/ultima8/world/fire_type.cpp
index 5780a5643f..a9cc12e8e6 100644
--- a/engines/ultima/ultima8/world/fire_type.cpp
+++ b/engines/ultima/ultima8/world/fire_type.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/sprite_process.h"
#include "ultima/ultima8/world/fire_type.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/loop_script.h"
#include "ultima/ultima8/world/get_object.h"
@@ -32,7 +30,6 @@
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/misc/point3.h"
#include "ultima/ultima8/audio/audio_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/fireball_process.cpp b/engines/ultima/ultima8/world/fireball_process.cpp
index 7bc9c03bca..cb478c5988 100644
--- a/engines/ultima/ultima8/world/fireball_process.cpp
+++ b/engines/ultima/ultima8/world/fireball_process.cpp
@@ -20,19 +20,13 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/fireball_process.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
-#include "ultima/ultima8/world/weapon_info.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/shared/std/misc.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/get_object.cpp b/engines/ultima/ultima8/world/get_object.cpp
index 5b9e15ff7b..f52d6b0ff5 100644
--- a/engines/ultima/ultima8/world/get_object.cpp
+++ b/engines/ultima/ultima8/world/get_object.cpp
@@ -21,7 +21,6 @@
*/
#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/world/glob_egg.cpp b/engines/ultima/ultima8/world/glob_egg.cpp
index f2e026c729..ceefcd1c3d 100644
--- a/engines/ultima/ultima8/world/glob_egg.cpp
+++ b/engines/ultima/ultima8/world/glob_egg.cpp
@@ -20,13 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/glob_egg.h"
#include "ultima/ultima8/world/map_glob.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/kernel/core_app.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/gravity_process.cpp b/engines/ultima/ultima8/world/gravity_process.cpp
index 66f017def6..dc1c3d5ddd 100644
--- a/engines/ultima/ultima8/world/gravity_process.cpp
+++ b/engines/ultima/ultima8/world/gravity_process.cpp
@@ -25,12 +25,8 @@
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
-#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 161a027442..8b2d0c6854 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -20,36 +20,24 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/usecode/usecode.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/world/container.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/fire_type.h"
-#include "ultima/ultima8/usecode/uc_stack.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/gumps/bark_gump.h"
#include "ultima/ultima8/gumps/ask_gump.h"
-#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/world/actors/actor_bark_notify_process.h"
-#include "ultima/ultima8/gumps/container_gump.h"
#include "ultima/ultima8/gumps/paperdoll_gump.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/world/world_point.h"
@@ -64,7 +52,6 @@
#include "ultima/ultima8/world/snap_process.h"
#include "ultima/ultima8/world/super_sprite_process.h"
#include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/games/game_info.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/missile_tracker.h"
#include "ultima/ultima8/world/crosshair_process.h"
diff --git a/engines/ultima/ultima8/world/item_factory.cpp b/engines/ultima/ultima8/world/item_factory.cpp
index c2fc0c7319..fdbebdebd1 100644
--- a/engines/ultima/ultima8/world/item_factory.cpp
+++ b/engines/ultima/ultima8/world/item_factory.cpp
@@ -25,17 +25,11 @@
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/container.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/glob_egg.h"
-#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/world/monster_egg.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index c875920d44..f8cd238c32 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -20,21 +20,16 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
-#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/item_selection_process.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/loop_script.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/usecode/uc_list.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/item_sorter.cpp b/engines/ultima/ultima8/world/item_sorter.cpp
index 9fb79fc969..39556e6075 100644
--- a/engines/ultima/ultima8/world/item_sorter.cpp
+++ b/engines/ultima/ultima8/world/item_sorter.cpp
@@ -25,7 +25,6 @@
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/misc/rect.h"
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index 4c28aba4b0..5bee3f9e6b 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -23,12 +23,9 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/map.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/container.h"
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/kernel/core_app.h"
-#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/graphics/shape_info.h" // debugging only
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/graphics/main_shape_archive.h"
diff --git a/engines/ultima/ultima8/world/map_glob.cpp b/engines/ultima/ultima8/world/map_glob.cpp
index 10ed5813eb..e09c613dd4 100644
--- a/engines/ultima/ultima8/world/map_glob.cpp
+++ b/engines/ultima/ultima8/world/map_glob.cpp
@@ -23,7 +23,6 @@
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/map_glob.h"
-#include "ultima/ultima8/filesys/idata_source.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/monster_egg.cpp b/engines/ultima/ultima8/world/monster_egg.cpp
index 77896b9520..eb00c3e227 100644
--- a/engines/ultima/ultima8/world/monster_egg.cpp
+++ b/engines/ultima/ultima8/world/monster_egg.cpp
@@ -20,15 +20,12 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/monster_egg.h"
#include "ultima/ultima8/usecode/uc_machine.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/graphics/shape_info.h"
-#include "ultima/ultima8/world/actors/monster_info.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/snap_process.cpp b/engines/ultima/ultima8/world/snap_process.cpp
index 2d76785556..46126a6565 100644
--- a/engines/ultima/ultima8/world/snap_process.cpp
+++ b/engines/ultima/ultima8/world/snap_process.cpp
@@ -20,9 +20,7 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/snap_process.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/camera_process.h"
diff --git a/engines/ultima/ultima8/world/split_item_process.cpp b/engines/ultima/ultima8/world/split_item_process.cpp
index b39c5d960b..bde44729b9 100644
--- a/engines/ultima/ultima8/world/split_item_process.cpp
+++ b/engines/ultima/ultima8/world/split_item_process.cpp
@@ -20,10 +20,8 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/split_item_process.h"
#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/graphics/shape_info.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/world/sprite_process.cpp b/engines/ultima/ultima8/world/sprite_process.cpp
index f9e5abf4ec..35bd0d8c8a 100644
--- a/engines/ultima/ultima8/world/sprite_process.cpp
+++ b/engines/ultima/ultima8/world/sprite_process.cpp
@@ -20,11 +20,9 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/sprite_process.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/sprite_process.h b/engines/ultima/ultima8/world/sprite_process.h
index b4682aa454..6fcf0cfccb 100644
--- a/engines/ultima/ultima8/world/sprite_process.h
+++ b/engines/ultima/ultima8/world/sprite_process.h
@@ -70,7 +70,6 @@ public:
void run() override;
INTRINSIC(I_createSprite);
-// INTRINSIC(I_createSpriteEx);
protected:
void init();
diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index 91dccd334c..6bff54a33c 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -20,15 +20,11 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/super_sprite_process.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/kernel/kernel.h"
-#include "ultima/ultima8/kernel/core_app.h"
#include "ultima/ultima8/kernel/delay_process.h"
-#include "ultima/ultima8/misc/direction.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
@@ -36,7 +32,6 @@
#include "ultima/ultima8/world/fire_type.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/sprite_process.h"
diff --git a/engines/ultima/ultima8/world/target_reticle_process.cpp b/engines/ultima/ultima8/world/target_reticle_process.cpp
index 0b214fe4b9..cacc121481 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.cpp
+++ b/engines/ultima/ultima8/world/target_reticle_process.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/gumps/message_box_gump.h"
#include "ultima/ultima8/games/game_data.h"
@@ -28,7 +27,6 @@
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/target_reticle_process.h"
#include "ultima/ultima8/world/sprite_process.h"
-#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/teleport_egg.cpp b/engines/ultima/ultima8/world/teleport_egg.cpp
index 33305bcb8c..bfcc99d79f 100644
--- a/engines/ultima/ultima8/world/teleport_egg.cpp
+++ b/engines/ultima/ultima8/world/teleport_egg.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/world/teleport_egg.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index 4ecfb8b8f0..3c83c76d74 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -27,23 +27,18 @@
#include "ultima/ultima8/filesys/flex_file.h"
#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/world/item_factory.h"
-#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/loop_script.h"
#include "ultima/ultima8/usecode/uc_list.h"
-#include "ultima/ultima8/misc/id_man.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/object_manager.h"
-#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/camera_process.h" // for resetting the camera
#include "ultima/ultima8/gumps/gump.h" // For CloseItemDependents notification
-#include "ultima/ultima8/world/actors/animation.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/filesys/idata_source.h"
-#include "ultima/ultima8/usecode/intrinsics.h"
namespace Ultima {
namespace Ultima8 {
Commit: 723b760b63f621c52ccfc53304dbe49b5fb27af9
https://github.com/scummvm/scummvm/commit/723b760b63f621c52ccfc53304dbe49b5fb27af9
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T11:15:40+09:00
Commit Message:
ULTIMA8: Add some const correctness
Changed paths:
engines/ultima/ultima8/world/actors/actor_anim.h
engines/ultima/ultima8/world/missile_tracker.cpp
engines/ultima/ultima8/world/missile_tracker.h
diff --git a/engines/ultima/ultima8/world/actors/actor_anim.h b/engines/ultima/ultima8/world/actors/actor_anim.h
index 31e9df0651..01e0a3c134 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim.h
@@ -38,7 +38,7 @@ public:
delete _actions[i];
}
- AnimAction *getAction(unsigned int n) {
+ const AnimAction *getAction(unsigned int n) const {
if (n >= _actions.size())
return nullptr;
return _actions[n];
diff --git a/engines/ultima/ultima8/world/missile_tracker.cpp b/engines/ultima/ultima8/world/missile_tracker.cpp
index bb6aa67564..f38a48c54d 100644
--- a/engines/ultima/ultima8/world/missile_tracker.cpp
+++ b/engines/ultima/ultima8/world/missile_tracker.cpp
@@ -32,7 +32,7 @@
namespace Ultima {
namespace Ultima8 {
-MissileTracker::MissileTracker(Item *item, int32 sx, int32 sy, int32 sz,
+MissileTracker::MissileTracker(const Item *item, int32 sx, int32 sy, int32 sz,
int32 tx, int32 ty, int32 tz,
int32 speed, int32 gravity) :
_destX(tx), _destY(ty), _destZ(tz), _gravity(gravity) {
@@ -41,7 +41,7 @@ MissileTracker::MissileTracker(Item *item, int32 sx, int32 sy, int32 sz,
init(sx, sy, sz, speed);
}
-MissileTracker::MissileTracker(Item *item, int32 tx, int32 ty, int32 tz,
+MissileTracker::MissileTracker(const Item *item, int32 tx, int32 ty, int32 tz,
int32 speed, int32 gravity) :
_destX(tx), _destY(ty), _destZ(tz), _gravity(gravity) {
assert(item->getParent() == 0);
@@ -120,7 +120,7 @@ void MissileTracker::init(int32 x, int32 y, int32 z, int32 speed) {
MissileTracker::~MissileTracker() {
}
-bool MissileTracker::isPathClear() {
+bool MissileTracker::isPathClear() const {
int32 start[3];
int32 end[3];
int32 dims[3];
diff --git a/engines/ultima/ultima8/world/missile_tracker.h b/engines/ultima/ultima8/world/missile_tracker.h
index deac82e09d..20cb8920d5 100644
--- a/engines/ultima/ultima8/world/missile_tracker.h
+++ b/engines/ultima/ultima8/world/missile_tracker.h
@@ -30,14 +30,14 @@ class Item;
class MissileTracker {
public:
- MissileTracker(Item *item, int32 sx, int32 sy, int32 sz,
+ MissileTracker(const Item *item, int32 sx, int32 sy, int32 sz,
int32 tx, int32 ty, int32 tz,
int32 speed, int32 gravity);
- MissileTracker(Item *item, int32 tx, int32 ty, int32 tz,
+ MissileTracker(const Item *item, int32 tx, int32 ty, int32 tz,
int32 speed, int32 gravity);
~MissileTracker();
- bool isPathClear();
+ bool isPathClear() const;
void launchItem();
Commit: 1c59d5de36de1eaae44ba9203a7e6e634aceb8a6
https://github.com/scummvm/scummvm/commit/1c59d5de36de1eaae44ba9203a7e6e634aceb8a6
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T11:15:47+09:00
Commit Message:
ULTIMA8: Improve comments
Changed paths:
engines/ultima/ultima8/usecode/global_storage.h
engines/ultima/ultima8/usecode/usecode.h
engines/ultima/ultima8/usecode/usecode_flex.h
engines/ultima/ultima8/world/actors/actor_anim_process.h
diff --git a/engines/ultima/ultima8/usecode/global_storage.h b/engines/ultima/ultima8/usecode/global_storage.h
index 38223e12ac..12544305b7 100644
--- a/engines/ultima/ultima8/usecode/global_storage.h
+++ b/engines/ultima/ultima8/usecode/global_storage.h
@@ -26,6 +26,10 @@
namespace Ultima {
namespace Ultima8 {
+/**
+ * Base class for globals that are accessed by the Usecode.
+ * In U8 this is a bitfield, in Crusader it's a byte array.
+ */
class GlobalStorage {
public:
virtual ~GlobalStorage() {};
diff --git a/engines/ultima/ultima8/usecode/usecode.h b/engines/ultima/ultima8/usecode/usecode.h
index b874cdcc9b..732ff45eac 100644
--- a/engines/ultima/ultima8/usecode/usecode.h
+++ b/engines/ultima/ultima8/usecode/usecode.h
@@ -26,6 +26,10 @@
namespace Ultima {
namespace Ultima8 {
+/**
+ * Usecode is the main engine code in the U8 engine. It has a simple assembly language
+ * executed by the UCMachine.
+ */
class Usecode {
public:
Usecode() { }
diff --git a/engines/ultima/ultima8/usecode/usecode_flex.h b/engines/ultima/ultima8/usecode/usecode_flex.h
index 5ac9583570..0b776378e1 100644
--- a/engines/ultima/ultima8/usecode/usecode_flex.h
+++ b/engines/ultima/ultima8/usecode/usecode_flex.h
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// multiple inheritance. um, yes :-)
class UsecodeFlex : public Usecode, protected RawArchive {
public:
UsecodeFlex(Common::SeekableReadStream *rs) : RawArchive(rs) { }
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.h b/engines/ultima/ultima8/world/actors/actor_anim_process.h
index 33440bc584..37c47836f2 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.h
@@ -39,7 +39,6 @@ class Item;
class ActorAnimProcess : public Process {
public:
ActorAnimProcess();
- //! note: this probably needs some more parameters
ActorAnimProcess(Actor *actor, Animation::Sequence action, Direction dir,
uint32 steps = 0);
Commit: e15c3b35db996391e39ab7e9b6acfc1340c62f1d
https://github.com/scummvm/scummvm/commit/e15c3b35db996391e39ab7e9b6acfc1340c62f1d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T11:44:56+09:00
Commit Message:
TINSEL: Fix build when DEBUG is defined
Changed paths:
engines/tinsel/dialogs.cpp
engines/tinsel/pdisplay.cpp
engines/tinsel/polygons.cpp
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 40d20a1982..9d2c81a234 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -5081,7 +5081,7 @@ void Dialogs::setInvWinParts(SCNHANDLE hf) {
_hWinParts = hf;
#ifdef DEBUG
- pfilm = (const FILM *)LockMem(hf);
+ pfilm = (const FILM *)_vm->_handle->LockMem(hf);
assert(FROM_32(pfilm->numreels) >= (uint32)(TinselV2 ? T2_HOPEDFORREELS : T1_HOPEDFORREELS)); // not as many reels as expected
#endif
}
@@ -5098,7 +5098,7 @@ void Dialogs::setFlagFilms(SCNHANDLE hf) {
_flagFilm = hf;
#ifdef DEBUG
- pfilm = (const FILM *)LockMem(hf);
+ pfilm = (const FILM *)_vm->_handle->LockMem(hf);
assert(FROM_32(pfilm->numreels) >= HOPEDFORFREELS); // not as many reels as expected
#endif
}
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 9eb578be7f..da780ddea0 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -152,12 +152,12 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
PMOVER pActor; // Lead actor
while (1) {
- PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
+ _vm->_bg->PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
/*-----------------------------------*\
| Cursor's position and path display. |
\*-----------------------------------*/
- GetCursorXY(&aniX, &aniY, false);
+ _vm->_cursor->GetCursorXY(&aniX, &aniY, false);
// Change in cursor position?
if (aniX != _ctx->prevcX || aniY != _ctx->prevcY ||
@@ -174,7 +174,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
// New text objects
sprintf(PositionString, "%d %d", aniX + Loffset, aniY + Toffset);
_ctx->cpText = ObjectTextOut(_vm->_bg->GetPlayfieldList(FIELD_STATUS), PositionString,
- 0, CPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
+ 0, CPOSX, POSY, _vm->_font->GetTagFontHandle(), TXT_CENTER);
if (g_DispPath) {
HPOLYGON hp = InPolygon(aniX + Loffset, aniY + Toffset, PATH);
if (hp == NOPOLY)
@@ -186,7 +186,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
PolyCornerX(hp, 2), PolyCornerY(hp, 2),
PolyCornerX(hp, 3), PolyCornerY(hp, 3));
_ctx->cpathText = ObjectTextOut(_vm->_bg->GetPlayfieldList(FIELD_STATUS), PositionString,
- 0, 4, POSY+ 10, GetTagFontHandle(), 0);
+ 0, 4, POSY+ 10, _vm->_font->GetTagFontHandle(), 0);
}
// update previous position
@@ -219,7 +219,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
pActor = GetMover(LEAD_ACTOR);
if (pActor && getMActorState(pActor)) {
// get lead's animation position
- GetActorPos(LEAD_ACTOR, &aniX, &aniY);
+ _vm->_actor->GetActorPos(LEAD_ACTOR, &aniX, &aniY);
// Change in position?
if (aniX != _ctx->prevlX || aniY != _ctx->prevlY ||
@@ -232,7 +232,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
// create new text object list
sprintf(PositionString, "%d %d", aniX, aniY);
_ctx->rpText = ObjectTextOut(_vm->_bg->GetPlayfieldList(FIELD_STATUS), PositionString,
- 0, LPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
+ 0, LPOSX, POSY, _vm->_font->GetTagFontHandle(), TXT_CENTER);
// update previous position
_ctx->prevlX = aniX;
@@ -251,7 +251,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
sprintf(PositionString, "String: %d", g_newestString);
_ctx->spText = ObjectTextOut(_vm->_bg->GetPlayfieldList(FIELD_STATUS), PositionString,
- 0, SPOSX, POSY+10, GetTalkFontHandle(), TXT_CENTER);
+ 0, SPOSX, POSY+10, _vm->_font->GetTalkFontHandle(), TXT_CENTER);
// update previous value
_ctx->prevString = g_newestString;
diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp
index 662a4d6b4e..1b1a2fb088 100644
--- a/engines/tinsel/polygons.cpp
+++ b/engines/tinsel/polygons.cpp
@@ -1408,7 +1408,7 @@ void CheckNPathIntegrity() {
int i, j; // Loop counters
int n; // Last node in current path
- pps = LockMem(pHandle); // All polygons
+ pps = _vm->_handle->LockMem(pHandle); // All polygons
for (i = 0; i < MAX_POLY; i++) { // For each polygon..
rp = Polys[i];
@@ -1422,9 +1422,9 @@ void CheckNPathIntegrity() {
hp = PolygonIndex(rp);
for (j = 0; j <= n; j++) {
if (!IsInPolygon(cp.getNodeX(j), cp.getNodeY(j), hp)) {
- sprintf(TextBufferAddr(), "Node (%d, %d) is not in its own path (starting (%d, %d))",
+ sprintf(_vm->_font->TextBufferAddr(), "Node (%d, %d) is not in its own path (starting (%d, %d))",
cp.getNodeX(j), cp.getNodeY(j), rp->cx[0], rp->cy[0]);
- error(TextBufferAddr());
+ error(_vm->_font->TextBufferAddr());
}
}
@@ -1434,14 +1434,14 @@ void CheckNPathIntegrity() {
break;
if (IsInPolygon(cp.getNodeX(0), cp.getNodeY(0), PolygonIndex(rp->adjpaths[j]))) {
- sprintf(TextBufferAddr(), "Node (%d, %d) is in another path (starting (%d, %d))",
+ sprintf(_vm->_font->TextBufferAddr(), "Node (%d, %d) is in another path (starting (%d, %d))",
cp.getNodeX(0), cp.getNodeY(0), rp->adjpaths[j]->cx[0], rp->adjpaths[j]->cy[0]);
- error(TextBufferAddr());
+ error(_vm->_font->TextBufferAddr());
}
if (IsInPolygon(cp.getNodeX(n), cp.getNodeY(n), PolygonIndex(rp->adjpaths[j]))) {
- sprintf(TextBufferAddr(), "Node (%d, %d) is in another path (starting (%d, %d))",
+ sprintf(_vm->_font->TextBufferAddr(), "Node (%d, %d) is in another path (starting (%d, %d))",
cp.getNodeX(n), cp.getNodeY(n), rp->adjpaths[j]->cx[0], rp->adjpaths[j]->cy[0]);
- error(TextBufferAddr());
+ error(_vm->_font->TextBufferAddr());
}
}
}
@@ -1659,9 +1659,9 @@ static void PseudoCenter(POLYGON *p) {
#ifdef DEBUG
// assert(IsInPolygon(p->pcenterx, p->pcentery, PolygonIndex(p))); // Pseudo-center is not in path
if (!IsInPolygon(p->pcenterx, p->pcentery, PolygonIndex(p))) {
- sprintf(TextBufferAddr(), "Pseudo-center is not in path (starting (%d, %d)) - polygon reversed?",
+ sprintf(_vm->_font->TextBufferAddr(), "Pseudo-center is not in path (starting (%d, %d)) - polygon reversed?",
p->cx[0], p->cy[0]);
- error(TextBufferAddr());
+ error(_vm->_font->TextBufferAddr());
}
#endif
}
Commit: 1ae121a99d4e8203d074b5488550e10ee591bb8c
https://github.com/scummvm/scummvm/commit/1ae121a99d4e8203d074b5488550e10ee591bb8c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T12:05:14+09:00
Commit Message:
GLK: Fix build when DEBUG defined
Changed paths:
engines/glk/tads/tads2/error.cpp
engines/glk/tads/tads2/line_source_file.cpp
engines/glk/tads/tads2/memory_cache_swap.cpp
diff --git a/engines/glk/tads/tads2/error.cpp b/engines/glk/tads/tads2/error.cpp
index 731341f806..9f6ee0489c 100644
--- a/engines/glk/tads/tads2/error.cpp
+++ b/engines/glk/tads/tads2/error.cpp
@@ -161,11 +161,6 @@ int errfmt(char *outbuf, int outbufl, const char *fmt, int argc, const erradef *
return(outlen);
}
-#ifdef DEBUG
-#error longjump unsupported in ScummVM
-#endif /* DEBUG */
-
-
#ifdef ERR_NO_MACRO
diff --git a/engines/glk/tads/tads2/line_source_file.cpp b/engines/glk/tads/tads2/line_source_file.cpp
index 24a7d67643..67ad66b628 100644
--- a/engines/glk/tads/tads2/line_source_file.cpp
+++ b/engines/glk/tads/tads2/line_source_file.cpp
@@ -366,7 +366,7 @@ int linfget(lindef *lin)
/* make sure buffer pointer is correct */
lin->linbuf = linf->linfbuf;
- LINFDEBUG(printf("%s\n", linf->linfbuf));
+ LINFDEBUG(debug(10, "%s\n", linf->linfbuf));
/* success */
return FALSE;
diff --git a/engines/glk/tads/tads2/memory_cache_swap.cpp b/engines/glk/tads/tads2/memory_cache_swap.cpp
index c2d2f0eea0..cdb1aad6be 100644
--- a/engines/glk/tads/tads2/memory_cache_swap.cpp
+++ b/engines/glk/tads/tads2/memory_cache_swap.cpp
@@ -178,7 +178,7 @@ mcsseg mcsout(mcscxdef *ctx, uint objid, uchar *ptr, ushort siz,
mcsseg cur;
ushort minsiz = 0;
- IF_DEBUG(printf("<< mcsout: objid=%d, ptr=%lx, siz=%u, oldseg=%u >>\n",
+ IF_DEBUG(debug(10, "<< mcsout: objid=%d, ptr=%lx, siz=%u, oldseg=%u >>\n",
objid, (unsigned long)ptr, siz, oldseg));
/* see if old segment can be reused */
@@ -258,7 +258,7 @@ mcsseg mcsout(mcscxdef *ctx, uint objid, uchar *ptr, ushort siz,
void mcsin(mcscxdef *ctx, mcsseg seg, uchar *ptr, ushort siz) {
mcsdsdef *desc = mcsdsc(ctx, seg);
- IF_DEBUG(printf("<< mcsin: seg=%u, ptr=%lx, siz=%d, objid=%u >>\n",
+ IF_DEBUG(debug(10, "<< mcsin: seg=%u, ptr=%lx, siz=%d, objid=%u >>\n",
seg, (unsigned long)ptr, siz, desc->mcsdsobj));
assert(seg < ctx->mcscxmsg);
More information about the Scummvm-git-logs
mailing list