[Scummvm-git-logs] scummvm master -> b8346b951aecda073783738b363d4be7d13ed729
OMGPizzaGuy
48367439+OMGPizzaGuy at users.noreply.github.com
Wed Feb 24 03:04:50 UTC 2021
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e3bdc488e9 ULTIMA8: Rename file for class type handling and remove comment references to p_dynamic_cast
577525fbd6 ULTIMA8: Add comments for class type to clarify purpose
b8346b951a ULTIMA8: Cleanup macro formatting for class type
Commit: e3bdc488e9a664fbf13b19301920e3eec9d7fffa
https://github.com/scummvm/scummvm/commit/e3bdc488e9a664fbf13b19301920e3eec9d7fffa
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-23T21:04:32-06:00
Commit Message:
ULTIMA8: Rename file for class type handling and remove comment references to p_dynamic_cast
Changed paths:
A engines/ultima/ultima8/misc/classtype.h
R engines/ultima/ultima8/misc/p_dynamic_cast.h
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/audio/music_process.cpp
engines/ultima/ultima8/audio/music_process.h
engines/ultima/ultima8/audio/remorse_music_process.cpp
engines/ultima/ultima8/audio/remorse_music_process.h
engines/ultima/ultima8/audio/u8_music_process.cpp
engines/ultima/ultima8/audio/u8_music_process.h
engines/ultima/ultima8/filesys/named_archive_file.h
engines/ultima/ultima8/games/start_crusader_process.cpp
engines/ultima/ultima8/games/start_crusader_process.h
engines/ultima/ultima8/games/start_u8_process.cpp
engines/ultima/ultima8/games/start_u8_process.h
engines/ultima/ultima8/graphics/cycle_process.h
engines/ultima/ultima8/graphics/fade_to_modal_process.h
engines/ultima/ultima8/graphics/inverter_process.h
engines/ultima/ultima8/graphics/palette_fader_process.h
engines/ultima/ultima8/gumps/ask_gump.h
engines/ultima/ultima8/gumps/bark_gump.h
engines/ultima/ultima8/gumps/book_gump.h
engines/ultima/ultima8/gumps/computer_gump.h
engines/ultima/ultima8/gumps/container_gump.h
engines/ultima/ultima8/gumps/credits_gump.h
engines/ultima/ultima8/gumps/cru_ammo_gump.h
engines/ultima/ultima8/gumps/cru_energy_gump.h
engines/ultima/ultima8/gumps/cru_health_gump.h
engines/ultima/ultima8/gumps/cru_inventory_gump.h
engines/ultima/ultima8/gumps/cru_pickup_area_gump.h
engines/ultima/ultima8/gumps/cru_pickup_gump.h
engines/ultima/ultima8/gumps/cru_stat_gump.h
engines/ultima/ultima8/gumps/cru_status_gump.h
engines/ultima/ultima8/gumps/cru_weapon_gump.h
engines/ultima/ultima8/gumps/desktop_gump.h
engines/ultima/ultima8/gumps/fast_area_vis_gump.h
engines/ultima/ultima8/gumps/game_map_gump.h
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/gumps/gump_notify_process.h
engines/ultima/ultima8/gumps/inverter_gump.h
engines/ultima/ultima8/gumps/item_relative_gump.h
engines/ultima/ultima8/gumps/keypad_gump.h
engines/ultima/ultima8/gumps/main_menu_process.cpp
engines/ultima/ultima8/gumps/main_menu_process.h
engines/ultima/ultima8/gumps/menu_gump.h
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/mini_stats_gump.h
engines/ultima/ultima8/gumps/minimap_gump.h
engines/ultima/ultima8/gumps/modal_gump.h
engines/ultima/ultima8/gumps/movie_gump.h
engines/ultima/ultima8/gumps/paged_gump.h
engines/ultima/ultima8/gumps/paperdoll_gump.h
engines/ultima/ultima8/gumps/quit_gump.h
engines/ultima/ultima8/gumps/readable_gump.h
engines/ultima/ultima8/gumps/remorse_menu_gump.h
engines/ultima/ultima8/gumps/scroll_gump.h
engines/ultima/ultima8/gumps/shape_viewer_gump.h
engines/ultima/ultima8/gumps/slider_gump.h
engines/ultima/ultima8/gumps/target_gump.h
engines/ultima/ultima8/gumps/translucent_gump.h
engines/ultima/ultima8/gumps/u8_save_gump.h
engines/ultima/ultima8/gumps/weasel_gump.h
engines/ultima/ultima8/gumps/widgets/button_widget.h
engines/ultima/ultima8/gumps/widgets/edit_widget.h
engines/ultima/ultima8/gumps/widgets/sliding_widget.h
engines/ultima/ultima8/gumps/widgets/text_widget.h
engines/ultima/ultima8/kernel/delay_process.h
engines/ultima/ultima8/kernel/object.cpp
engines/ultima/ultima8/kernel/object.h
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/kernel/process.h
engines/ultima/ultima8/misc/pent_include.h
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/usecode/uc_process.h
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.h
engines/ultima/ultima8/world/actors/ambush_process.cpp
engines/ultima/ultima8/world/actors/ambush_process.h
engines/ultima/ultima8/world/actors/attack_process.cpp
engines/ultima/ultima8/world/actors/attack_process.h
engines/ultima/ultima8/world/actors/avatar_death_process.cpp
engines/ultima/ultima8/world/actors/avatar_death_process.h
engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
engines/ultima/ultima8/world/actors/avatar_gravity_process.h
engines/ultima/ultima8/world/actors/battery_charger_process.cpp
engines/ultima/ultima8/world/actors/battery_charger_process.h
engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
engines/ultima/ultima8/world/actors/clear_feign_death_process.h
engines/ultima/ultima8/world/actors/combat_process.cpp
engines/ultima/ultima8/world/actors/combat_process.h
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/cru_healer_process.h
engines/ultima/ultima8/world/actors/grant_peace_process.cpp
engines/ultima/ultima8/world/actors/grant_peace_process.h
engines/ultima/ultima8/world/actors/guard_process.cpp
engines/ultima/ultima8/world/actors/guard_process.h
engines/ultima/ultima8/world/actors/heal_process.cpp
engines/ultima/ultima8/world/actors/heal_process.h
engines/ultima/ultima8/world/actors/loiter_process.cpp
engines/ultima/ultima8/world/actors/loiter_process.h
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/pace_process.cpp
engines/ultima/ultima8/world/actors/pace_process.h
engines/ultima/ultima8/world/actors/pathfinder_process.cpp
engines/ultima/ultima8/world/actors/pathfinder_process.h
engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
engines/ultima/ultima8/world/actors/resurrection_process.cpp
engines/ultima/ultima8/world/actors/resurrection_process.h
engines/ultima/ultima8/world/actors/scheduler_process.cpp
engines/ultima/ultima8/world/actors/scheduler_process.h
engines/ultima/ultima8/world/actors/surrender_process.cpp
engines/ultima/ultima8/world/actors/surrender_process.h
engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
engines/ultima/ultima8/world/actors/targeted_anim_process.h
engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
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/camera_process.h
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/container.h
engines/ultima/ultima8/world/create_item_process.h
engines/ultima/ultima8/world/crosshair_process.cpp
engines/ultima/ultima8/world/crosshair_process.h
engines/ultima/ultima8/world/destroy_item_process.cpp
engines/ultima/ultima8/world/destroy_item_process.h
engines/ultima/ultima8/world/egg_hatcher_process.h
engines/ultima/ultima8/world/fireball_process.cpp
engines/ultima/ultima8/world/fireball_process.h
engines/ultima/ultima8/world/glob_egg.cpp
engines/ultima/ultima8/world/glob_egg.h
engines/ultima/ultima8/world/gravity_process.cpp
engines/ultima/ultima8/world/gravity_process.h
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/item_selection_process.cpp
engines/ultima/ultima8/world/item_selection_process.h
engines/ultima/ultima8/world/snap_process.cpp
engines/ultima/ultima8/world/snap_process.h
engines/ultima/ultima8/world/split_item_process.cpp
engines/ultima/ultima8/world/split_item_process.h
engines/ultima/ultima8/world/target_reticle_process.cpp
engines/ultima/ultima8/world/target_reticle_process.h
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index d9542f4576..025946d678 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -26,7 +26,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/shared/std/string.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/audio/music_process.cpp b/engines/ultima/ultima8/audio/music_process.cpp
index cbb17b98ad..0a3571fe2e 100644
--- a/engines/ultima/ultima8/audio/music_process.cpp
+++ b/engines/ultima/ultima8/audio/music_process.cpp
@@ -25,7 +25,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(MusicProcess)
MusicProcess *MusicProcess::_theMusicProcess = nullptr;
diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h
index 76d0736028..12991a81ae 100644
--- a/engines/ultima/ultima8/audio/music_process.h
+++ b/engines/ultima/ultima8/audio/music_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "audio/mididrv.h"
namespace Ultima {
@@ -48,7 +48,6 @@ public:
MusicProcess();
~MusicProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! Get the current instance of the Music Processes
diff --git a/engines/ultima/ultima8/audio/remorse_music_process.cpp b/engines/ultima/ultima8/audio/remorse_music_process.cpp
index 3d9741e2ab..732f9a1cf9 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.cpp
+++ b/engines/ultima/ultima8/audio/remorse_music_process.cpp
@@ -93,7 +93,6 @@ static const int REGRET_MAP_TRACKS[] = {
15, 9, 12, 10, 19, 14, 21, 0};
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(RemorseMusicProcess)
RemorseMusicProcess::RemorseMusicProcess() : MusicProcess(), _currentTrack(0), _savedTrack(0), _m16offset(0), _combatMusicActive(false) {
diff --git a/engines/ultima/ultima8/audio/remorse_music_process.h b/engines/ultima/ultima8/audio/remorse_music_process.h
index a10090d331..0231ba0c02 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.h
+++ b/engines/ultima/ultima8/audio/remorse_music_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_AUDIO_REMORSEMUSICPROCESS_H
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
@@ -61,7 +61,6 @@ public:
RemorseMusicProcess();
~RemorseMusicProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! Play some background music. Does not change the current track if combat music is active. If another track is currently queued, just queues this track for play.
diff --git a/engines/ultima/ultima8/audio/u8_music_process.cpp b/engines/ultima/ultima8/audio/u8_music_process.cpp
index cd0916a5ea..abcd97aa2f 100644
--- a/engines/ultima/ultima8/audio/u8_music_process.cpp
+++ b/engines/ultima/ultima8/audio/u8_music_process.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(U8MusicProcess)
U8MusicProcess::U8MusicProcess() : _midiPlayer(nullptr), _state(PLAYBACK_NORMAL),
diff --git a/engines/ultima/ultima8/audio/u8_music_process.h b/engines/ultima/ultima8/audio/u8_music_process.h
index b49a8d3917..c86036d411 100644
--- a/engines/ultima/ultima8/audio/u8_music_process.h
+++ b/engines/ultima/ultima8/audio/u8_music_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_AUDIO_U8MUSICPROCESS_H
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "audio/mididrv.h"
namespace Ultima {
@@ -82,7 +82,6 @@ public:
U8MusicProcess(MidiPlayer *player); // Note that this does NOT delete the driver
~U8MusicProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! Get the current instance of the Music Processes
diff --git a/engines/ultima/ultima8/filesys/named_archive_file.h b/engines/ultima/ultima8/filesys/named_archive_file.h
index ff57a5f7e4..10fca507d6 100644
--- a/engines/ultima/ultima8/filesys/named_archive_file.h
+++ b/engines/ultima/ultima8/filesys/named_archive_file.h
@@ -24,7 +24,7 @@
#define ULTIMA8_FILESYS_NAMEDARCHIVEFILE_H
#include "ultima/ultima8/filesys/archive_file.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/start_crusader_process.cpp b/engines/ultima/ultima8/games/start_crusader_process.cpp
index 1ffb48af9c..24bb6dfcc5 100644
--- a/engines/ultima/ultima8/games/start_crusader_process.cpp
+++ b/engines/ultima/ultima8/games/start_crusader_process.cpp
@@ -36,7 +36,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(StartCrusaderProcess)
StartCrusaderProcess::StartCrusaderProcess(int saveSlot) : Process(),
diff --git a/engines/ultima/ultima8/games/start_crusader_process.h b/engines/ultima/ultima8/games/start_crusader_process.h
index 42b13c9b69..a5db7efa93 100644
--- a/engines/ultima/ultima8/games/start_crusader_process.h
+++ b/engines/ultima/ultima8/games/start_crusader_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GAMES_STARTCRUSADERPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -47,7 +47,6 @@ protected:
public:
StartCrusaderProcess(int saveSlot = -1);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/games/start_u8_process.cpp b/engines/ultima/ultima8/games/start_u8_process.cpp
index 636e0b72e5..af3f7526a8 100644
--- a/engines/ultima/ultima8/games/start_u8_process.cpp
+++ b/engines/ultima/ultima8/games/start_u8_process.cpp
@@ -38,7 +38,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(StartU8Process)
StartU8Process::StartU8Process(int saveSlot) : Process(),
diff --git a/engines/ultima/ultima8/games/start_u8_process.h b/engines/ultima/ultima8/games/start_u8_process.h
index b629ade995..6e8d44590c 100644
--- a/engines/ultima/ultima8/games/start_u8_process.h
+++ b/engines/ultima/ultima8/games/start_u8_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GAMES_STARTU8PROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -40,7 +40,6 @@ protected:
public:
StartU8Process(int saveSlot = -1);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/graphics/cycle_process.h b/engines/ultima/ultima8/graphics/cycle_process.h
index 565488ca75..15624eea1b 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.h
+++ b/engines/ultima/ultima8/graphics/cycle_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fade_to_modal_process.h b/engines/ultima/ultima8/graphics/fade_to_modal_process.h
index 486b93bd6d..50c7d9af90 100644
--- a/engines/ultima/ultima8/graphics/fade_to_modal_process.h
+++ b/engines/ultima/ultima8/graphics/fade_to_modal_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/graphics/inverter_process.h
index c9535eab18..f2bfe7e665 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/graphics/inverter_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/graphics/palette_fader_process.h
index 8838419b16..e91e08369b 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.h
@@ -26,7 +26,7 @@
#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"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/ask_gump.h b/engines/ultima/ultima8/gumps/ask_gump.h
index 640ca067c5..ab5003ecd5 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.h
+++ b/engines/ultima/ultima8/gumps/ask_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_ASKGUMP_H
#include "ultima/ultima8/gumps/item_relative_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/bark_gump.h b/engines/ultima/ultima8/gumps/bark_gump.h
index cb627a4222..86626ffc18 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.h
+++ b/engines/ultima/ultima8/gumps/bark_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_BARKGUMP_H
#include "ultima/ultima8/gumps/item_relative_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/book_gump.h b/engines/ultima/ultima8/gumps/book_gump.h
index 68b59e5799..c81e9981dc 100644
--- a/engines/ultima/ultima8/gumps/book_gump.h
+++ b/engines/ultima/ultima8/gumps/book_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/computer_gump.h b/engines/ultima/ultima8/gumps/computer_gump.h
index 1189da26e6..8db1032970 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.h
+++ b/engines/ultima/ultima8/gumps/computer_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/container_gump.h b/engines/ultima/ultima8/gumps/container_gump.h
index a17a54c13e..25c25b4d22 100644
--- a/engines/ultima/ultima8/gumps/container_gump.h
+++ b/engines/ultima/ultima8/gumps/container_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CONTAINERGUMP_H
#include "ultima/ultima8/gumps/item_relative_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/credits_gump.h b/engines/ultima/ultima8/gumps/credits_gump.h
index dce9483b37..0682b3f82c 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.h
+++ b/engines/ultima/ultima8/gumps/credits_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CREDITSGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_ammo_gump.h b/engines/ultima/ultima8/gumps/cru_ammo_gump.h
index c1f974b57d..2eab0945af 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUAMMOGUMP_H
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_energy_gump.h b/engines/ultima/ultima8/gumps/cru_energy_gump.h
index 40d6d36b66..71a02f5eb9 100644
--- a/engines/ultima/ultima8/gumps/cru_energy_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_energy_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUENERGYGUMP_H
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_health_gump.h b/engines/ultima/ultima8/gumps/cru_health_gump.h
index 3bfab54987..890d44ed85 100644
--- a/engines/ultima/ultima8/gumps/cru_health_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_health_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUHEALTHGUMP_H
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.h b/engines/ultima/ultima8/gumps/cru_inventory_gump.h
index f872273a02..c074085dbb 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUINVENTORYGUMP_H
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_area_gump.h b/engines/ultima/ultima8/gumps/cru_pickup_area_gump.h
index bc5fbcb2c6..9cc247ce42 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_area_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_pickup_area_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUPICKUPAREAGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_gump.h b/engines/ultima/ultima8/gumps/cru_pickup_gump.h
index 2e47f8addf..9f17ff2849 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_pickup_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUPICKUPGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.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 ed000fb00e..af2a2da032 100644
--- a/engines/ultima/ultima8/gumps/cru_stat_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_stat_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUSTATGUMP_H
#include "ultima/ultima8/gumps/translucent_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_status_gump.h b/engines/ultima/ultima8/gumps/cru_status_gump.h
index 40003f5510..50f6aff8d8 100644
--- a/engines/ultima/ultima8/gumps/cru_status_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_status_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/cru_weapon_gump.h b/engines/ultima/ultima8/gumps/cru_weapon_gump.h
index 414632608c..8868e0e418 100644
--- a/engines/ultima/ultima8/gumps/cru_weapon_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_weapon_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_CRUWEAPONGUMP_H
#include "ultima/ultima8/gumps/cru_stat_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.h b/engines/ultima/ultima8/gumps/desktop_gump.h
index ca8909901d..69c0142dd3 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.h
+++ b/engines/ultima/ultima8/gumps/desktop_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_DESKTOPGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
index 9cf16fa234..a7b0eb8e6b 100644
--- a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
+++ b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_FASTAREAVISGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.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 6651af737e..d0ac89e4ae 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.h
+++ b/engines/ultima/ultima8/gumps/game_map_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_GAMEMAPGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index 1e35cbd183..da16816944 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -27,7 +27,7 @@
#include "ultima/ultima8/misc/rect.h"
#include "ultima/ultima8/graphics/frame_id.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/gump_notify_process.h b/engines/ultima/ultima8/gumps/gump_notify_process.h
index 4d566998b0..de6bd6e86d 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.h
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_GUMPNOTIFYPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.h b/engines/ultima/ultima8/gumps/inverter_gump.h
index a80055ce02..d9031806f1 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.h
+++ b/engines/ultima/ultima8/gumps/inverter_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_INVERTERGUMP_H
#include "ultima/ultima8/gumps/desktop_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.h b/engines/ultima/ultima8/gumps/item_relative_gump.h
index 0e99a1add3..0d28894d18 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.h
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_ITEMRELATIVEGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/keypad_gump.h b/engines/ultima/ultima8/gumps/keypad_gump.h
index 2ce472ab22..68be322944 100644
--- a/engines/ultima/ultima8/gumps/keypad_gump.h
+++ b/engines/ultima/ultima8/gumps/keypad_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/main_menu_process.cpp b/engines/ultima/ultima8/gumps/main_menu_process.cpp
index 969750118b..c33cf1d314 100644
--- a/engines/ultima/ultima8/gumps/main_menu_process.cpp
+++ b/engines/ultima/ultima8/gumps/main_menu_process.cpp
@@ -30,7 +30,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(MainMenuProcess)
MainMenuProcess::MainMenuProcess() : Process() {
diff --git a/engines/ultima/ultima8/gumps/main_menu_process.h b/engines/ultima/ultima8/gumps/main_menu_process.h
index 1033e388ad..0547ea59c8 100644
--- a/engines/ultima/ultima8/gumps/main_menu_process.h
+++ b/engines/ultima/ultima8/gumps/main_menu_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_MAINMENUPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -35,7 +35,6 @@ class MainMenuProcess : public Process {
public:
MainMenuProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/gumps/menu_gump.h b/engines/ultima/ultima8/gumps/menu_gump.h
index 6e81a7a4dd..f4f3e70cf9 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.h
+++ b/engines/ultima/ultima8/gumps/menu_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_MENUGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index 5323a7fcb1..2a6d78231b 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -27,7 +27,7 @@
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.h b/engines/ultima/ultima8/gumps/mini_stats_gump.h
index fb4e250613..7e62b3b0c3 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.h
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_MINISTATSGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.h b/engines/ultima/ultima8/gumps/minimap_gump.h
index abc628ce88..e9e96cac01 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.h
+++ b/engines/ultima/ultima8/gumps/minimap_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "graphics/managed_surface.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/modal_gump.h b/engines/ultima/ultima8/gumps/modal_gump.h
index 2026f7f5ad..b0bab9cc51 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.h
+++ b/engines/ultima/ultima8/gumps/modal_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_MODALGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/movie_gump.h b/engines/ultima/ultima8/gumps/movie_gump.h
index 4ca5188889..fc90558a63 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.h
+++ b/engines/ultima/ultima8/gumps/movie_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/paged_gump.h b/engines/ultima/ultima8/gumps/paged_gump.h
index d085e109e2..91cd14ecb5 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.h
+++ b/engines/ultima/ultima8/gumps/paged_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_PAGEDGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.h b/engines/ultima/ultima8/gumps/paperdoll_gump.h
index 1af10f90e5..9aec736f3e 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.h
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_PAPERDOLLGUMP_H
#include "ultima/ultima8/gumps/container_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/quit_gump.h b/engines/ultima/ultima8/gumps/quit_gump.h
index 08dacb447d..a3b478eb77 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.h
+++ b/engines/ultima/ultima8/gumps/quit_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_QUITGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/readable_gump.h b/engines/ultima/ultima8/gumps/readable_gump.h
index ce528a0ca6..0a4bb2ae16 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.h
+++ b/engines/ultima/ultima8/gumps/readable_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/remorse_menu_gump.h b/engines/ultima/ultima8/gumps/remorse_menu_gump.h
index 55de6709d0..dd8f112e6d 100644
--- a/engines/ultima/ultima8/gumps/remorse_menu_gump.h
+++ b/engines/ultima/ultima8/gumps/remorse_menu_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_REMORSEMENUGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.h b/engines/ultima/ultima8/gumps/scroll_gump.h
index 40ddef86d0..e96c10917c 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.h
+++ b/engines/ultima/ultima8/gumps/scroll_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.h b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
index 89f4f4139c..0b2bfc6750 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.h
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
@@ -26,7 +26,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/slider_gump.h b/engines/ultima/ultima8/gumps/slider_gump.h
index f3c87ebacd..3dcdd5917b 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.h
+++ b/engines/ultima/ultima8/gumps/slider_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_SLIDERGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/target_gump.h b/engines/ultima/ultima8/gumps/target_gump.h
index bc7b33e2b7..ac86ca9691 100644
--- a/engines/ultima/ultima8/gumps/target_gump.h
+++ b/engines/ultima/ultima8/gumps/target_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/translucent_gump.h b/engines/ultima/ultima8/gumps/translucent_gump.h
index 492673d089..36e437d7c4 100644
--- a/engines/ultima/ultima8/gumps/translucent_gump.h
+++ b/engines/ultima/ultima8/gumps/translucent_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_TRANSLUCENTGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.h b/engines/ultima/ultima8/gumps/u8_save_gump.h
index f7ebf6fae5..dbd9044d63 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.h
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_U8SAVEGUMP_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.h b/engines/ultima/ultima8/gumps/weasel_gump.h
index 7e6a3e23a8..d8d99a9fee 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.h
+++ b/engines/ultima/ultima8/gumps/weasel_gump.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_REMORSEMENUGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index b68ecb80ab..fa2dfce94f 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/graphics/frame_id.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.h b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
index fc527c249d..a56602cefd 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
@@ -30,7 +30,7 @@
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
index 09c32579f1..617fb0b661 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
@@ -24,7 +24,7 @@
#define ULTIMA8_GUMPS_WIDGETS_SLIDINGWIDGET_H
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.h b/engines/ultima/ultima8/gumps/widgets/text_widget.h
index cd46c3abf0..01cd4574fe 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.h
@@ -29,7 +29,7 @@
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/kernel/delay_process.h b/engines/ultima/ultima8/kernel/delay_process.h
index eead897303..e297716657 100644
--- a/engines/ultima/ultima8/kernel/delay_process.h
+++ b/engines/ultima/ultima8/kernel/delay_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_KERNEL_DELAYPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/kernel/object.cpp b/engines/ultima/ultima8/kernel/object.cpp
index 1c93806efe..5bce0a75db 100644
--- a/engines/ultima/ultima8/kernel/object.cpp
+++ b/engines/ultima/ultima8/kernel/object.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(Object)
Object::~Object() {
diff --git a/engines/ultima/ultima8/kernel/object.h b/engines/ultima/ultima8/kernel/object.h
index 67af51fda0..f0300764fe 100644
--- a/engines/ultima/ultima8/kernel/object.h
+++ b/engines/ultima/ultima8/kernel/object.h
@@ -23,7 +23,7 @@
#ifndef ULTIMA8_KERNEL_OBJECT_H
#define ULTIMA8_KERNEL_OBJECT_H
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "ultima/ultima8/misc/pent_include.h"
namespace Ultima {
@@ -36,7 +36,6 @@ public:
Object() : _objId(0xFFFF) {}
virtual ~Object();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE_BASE()
//! get this Object's objID
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index d4fffc0330..1ea67cd8a5 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -27,7 +27,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(Process)
Process::Process(ObjId it, uint16 ty)
diff --git a/engines/ultima/ultima8/kernel/process.h b/engines/ultima/ultima8/kernel/process.h
index 887acc0a5f..43baf98f7e 100644
--- a/engines/ultima/ultima8/kernel/process.h
+++ b/engines/ultima/ultima8/kernel/process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_KERNEL_USECODE_PROCESS_H
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
#include "ultima/ultima8/misc/pent_include.h"
namespace Ultima {
@@ -41,7 +41,6 @@ public:
Process(ObjId _itemNum = 0, uint16 type = 0);
virtual ~Process() { }
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE_BASE()
uint32 getProcessFlags() const {
diff --git a/engines/ultima/ultima8/misc/p_dynamic_cast.h b/engines/ultima/ultima8/misc/classtype.h
similarity index 96%
rename from engines/ultima/ultima8/misc/p_dynamic_cast.h
rename to engines/ultima/ultima8/misc/classtype.h
index 41568d123a..7560799b4c 100644
--- a/engines/ultima/ultima8/misc/p_dynamic_cast.h
+++ b/engines/ultima/ultima8/misc/classtype.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef ULTIMA8_MISC_P_DYNAMIC_CAST_H
-#define ULTIMA8_MISC_P_DYNAMIC_CAST_H
+#ifndef ULTIMA8_MISC_CLASSTYPE_H
+#define ULTIMA8_MISC_CLASSTYPE_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/pent_include.h b/engines/ultima/ultima8/misc/pent_include.h
index f17795bf4b..68774549c5 100644
--- a/engines/ultima/ultima8/misc/pent_include.h
+++ b/engines/ultima/ultima8/misc/pent_include.h
@@ -30,9 +30,9 @@
//
-// p_dynamic_cast support
+// RuntimeClassType
//
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
//
diff --git a/engines/ultima/ultima8/usecode/uc_process.cpp b/engines/ultima/ultima8/usecode/uc_process.cpp
index 9ff4e63754..a1ad1217f7 100644
--- a/engines/ultima/ultima8/usecode/uc_process.cpp
+++ b/engines/ultima/ultima8/usecode/uc_process.cpp
@@ -28,7 +28,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(UCProcess)
UCProcess::UCProcess() : Process(), _classId(0xFFFF), _ip(0xFFFF),
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index b00d5d428c..41a1d48d49 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -41,7 +41,6 @@ public:
int thissize = 0, const uint8 *args = 0, int argsize = 0);
~UCProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 4628c8dc77..e6d544ac28 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -61,7 +61,6 @@ namespace Ultima8 {
static const unsigned int BACKPACK_SHAPE = 529;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(Actor)
Actor::Actor() : _strength(0), _dexterity(0), _intelligence(0),
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 95ae160956..c83077c914 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -50,7 +50,6 @@ namespace Ultima8 {
static const int watchactor = WATCHACTOR;
#endif
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(ActorAnimProcess)
ActorAnimProcess::ActorAnimProcess() : Process(), _tracker(nullptr),
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.h b/engines/ultima/ultima8/world/actors/actor_anim_process.h
index 37c47836f2..c161110511 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.h
@@ -42,7 +42,6 @@ public:
ActorAnimProcess(Actor *actor, Animation::Sequence action, Direction dir,
uint32 steps = 0);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
static const uint16 ACTOR_ANIM_PROC_TYPE = 0x00F0;
diff --git a/engines/ultima/ultima8/world/actors/ambush_process.cpp b/engines/ultima/ultima8/world/actors/ambush_process.cpp
index ea2cbdf878..468733029e 100644
--- a/engines/ultima/ultima8/world/actors/ambush_process.cpp
+++ b/engines/ultima/ultima8/world/actors/ambush_process.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(AmbushProcess)
AmbushProcess::AmbushProcess() : Process(), _delayCount(0) {
diff --git a/engines/ultima/ultima8/world/actors/ambush_process.h b/engines/ultima/ultima8/world/actors/ambush_process.h
index 77ee841d0e..5762e4935c 100644
--- a/engines/ultima/ultima8/world/actors/ambush_process.h
+++ b/engines/ultima/ultima8/world/actors/ambush_process.h
@@ -35,7 +35,6 @@ public:
AmbushProcess();
AmbushProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/attack_process.cpp b/engines/ultima/ultima8/world/actors/attack_process.cpp
index 653e4da4a4..7241f0833b 100644
--- a/engines/ultima/ultima8/world/actors/attack_process.cpp
+++ b/engines/ultima/ultima8/world/actors/attack_process.cpp
@@ -42,7 +42,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(AttackProcess)
static const int16 ATTACK_SFX_1[] = {0x15, 0x78, 0x80, 0x83, 0xDC, 0xDD};
diff --git a/engines/ultima/ultima8/world/actors/attack_process.h b/engines/ultima/ultima8/world/actors/attack_process.h
index 041c9aaa53..18065acccd 100644
--- a/engines/ultima/ultima8/world/actors/attack_process.h
+++ b/engines/ultima/ultima8/world/actors/attack_process.h
@@ -46,7 +46,6 @@ public:
virtual ~AttackProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
index 56146ac706..b37fbc6f36 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
@@ -37,7 +37,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(AvatarDeathProcess)
AvatarDeathProcess::AvatarDeathProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.h b/engines/ultima/ultima8/world/actors/avatar_death_process.h
index 919d61f8d3..df29d461c2 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.h
@@ -34,7 +34,6 @@ class AvatarDeathProcess : public Process {
public:
AvatarDeathProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
index f177703854..cc47fac400 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(AvatarGravityProcess)
AvatarGravityProcess::AvatarGravityProcess()
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
index 55ead2bf43..34ce074276 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
@@ -35,7 +35,6 @@ public:
AvatarGravityProcess();
AvatarGravityProcess(MainActor *avatar, int gravity);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/battery_charger_process.cpp b/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
index 52836a7370..f91f1f85b3 100644
--- a/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
+++ b/engines/ultima/ultima8/world/actors/battery_charger_process.cpp
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(BatteryChargerProcess)
// These SFX IDs are the same in both No Regret and No Remorse.
diff --git a/engines/ultima/ultima8/world/actors/battery_charger_process.h b/engines/ultima/ultima8/world/actors/battery_charger_process.h
index d8f625ac48..5b5678394e 100644
--- a/engines/ultima/ultima8/world/actors/battery_charger_process.h
+++ b/engines/ultima/ultima8/world/actors/battery_charger_process.h
@@ -33,7 +33,6 @@ class BatteryChargerProcess : public Process {
public:
BatteryChargerProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
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 68e616855f..87e92aff66 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(ClearFeignDeathProcess)
ClearFeignDeathProcess::ClearFeignDeathProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
index e039d67181..8b34f2cbc9 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
@@ -35,7 +35,6 @@ public:
ClearFeignDeathProcess();
ClearFeignDeathProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/combat_process.cpp b/engines/ultima/ultima8/world/actors/combat_process.cpp
index c153e5f468..8bcd33f25d 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.cpp
+++ b/engines/ultima/ultima8/world/actors/combat_process.cpp
@@ -37,7 +37,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(CombatProcess)
CombatProcess::CombatProcess() : Process(), _target(0), _fixedTarget(0), _combatMode(CM_WAITING) {
diff --git a/engines/ultima/ultima8/world/actors/combat_process.h b/engines/ultima/ultima8/world/actors/combat_process.h
index 02272b3fbd..d8f1117bd7 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.h
+++ b/engines/ultima/ultima8/world/actors/combat_process.h
@@ -36,7 +36,6 @@ public:
CombatProcess();
CombatProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
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 7974c1d22d..de378b5139 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -32,7 +32,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(CruAvatarMoverProcess)
CruAvatarMoverProcess::CruAvatarMoverProcess() : AvatarMoverProcess(), _avatarAngle(0) {
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 97a6142150..00b0b90eee 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.h
@@ -39,7 +39,6 @@ public:
CruAvatarMoverProcess();
~CruAvatarMoverProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/cru_healer_process.cpp b/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
index aefb16e825..4783dcdaf8 100644
--- a/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_healer_process.cpp
@@ -37,7 +37,6 @@ namespace Ultima8 {
static const uint16 HEAL_START_SFX = 0xdb;
static const uint16 HEAL_GOING_SFX = 0xba;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(CruHealerProcess)
CruHealerProcess::CruHealerProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/cru_healer_process.h b/engines/ultima/ultima8/world/actors/cru_healer_process.h
index 62ff8a22ec..fabba68f34 100644
--- a/engines/ultima/ultima8/world/actors/cru_healer_process.h
+++ b/engines/ultima/ultima8/world/actors/cru_healer_process.h
@@ -33,7 +33,6 @@ class CruHealerProcess : public Process {
public:
CruHealerProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
index 570610e37c..64cb1a1997 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
@@ -37,7 +37,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(GrantPeaceProcess)
GrantPeaceProcess::GrantPeaceProcess() : Process(), _haveTarget(false) {
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.h b/engines/ultima/ultima8/world/actors/grant_peace_process.h
index de16e0996c..648d8514fa 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.h
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.h
@@ -36,7 +36,6 @@ public:
GrantPeaceProcess();
GrantPeaceProcess(Actor *caster);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/guard_process.cpp b/engines/ultima/ultima8/world/actors/guard_process.cpp
index 7257f72ea3..676e582288 100644
--- a/engines/ultima/ultima8/world/actors/guard_process.cpp
+++ b/engines/ultima/ultima8/world/actors/guard_process.cpp
@@ -30,7 +30,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(GuardProcess)
GuardProcess::GuardProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/guard_process.h b/engines/ultima/ultima8/world/actors/guard_process.h
index 121b375aba..0f54264261 100644
--- a/engines/ultima/ultima8/world/actors/guard_process.h
+++ b/engines/ultima/ultima8/world/actors/guard_process.h
@@ -35,7 +35,6 @@ public:
GuardProcess();
GuardProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/heal_process.cpp b/engines/ultima/ultima8/world/actors/heal_process.cpp
index 5d55753213..8003821b54 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.cpp
+++ b/engines/ultima/ultima8/world/actors/heal_process.cpp
@@ -28,7 +28,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(HealProcess)
HealProcess::HealProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/heal_process.h b/engines/ultima/ultima8/world/actors/heal_process.h
index ea5828a936..88873ef822 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.h
+++ b/engines/ultima/ultima8/world/actors/heal_process.h
@@ -33,7 +33,6 @@ class HealProcess : public Process {
public:
HealProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.cpp b/engines/ultima/ultima8/world/actors/loiter_process.cpp
index 16223e9b24..416bd1d7b2 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.cpp
+++ b/engines/ultima/ultima8/world/actors/loiter_process.cpp
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(LoiterProcess)
LoiterProcess::LoiterProcess() : Process(), _count(0) {
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.h b/engines/ultima/ultima8/world/actors/loiter_process.h
index f961bc6765..696a144dd5 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.h
+++ b/engines/ultima/ultima8/world/actors/loiter_process.h
@@ -35,7 +35,6 @@ public:
LoiterProcess();
LoiterProcess(Actor *actor, int32 count = -1);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index e865d23bc2..b72169f0d5 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -50,7 +50,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(MainActor)
MainActor::MainActor() : _justTeleported(false), _accumStr(0), _accumDex(0),
diff --git a/engines/ultima/ultima8/world/actors/pace_process.cpp b/engines/ultima/ultima8/world/actors/pace_process.cpp
index 72de484431..675ef4b790 100644
--- a/engines/ultima/ultima8/world/actors/pace_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pace_process.cpp
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(PaceProcess)
PaceProcess::PaceProcess() : Process(), _counter(0) {
diff --git a/engines/ultima/ultima8/world/actors/pace_process.h b/engines/ultima/ultima8/world/actors/pace_process.h
index 07acca6c92..9ae8d83a0e 100644
--- a/engines/ultima/ultima8/world/actors/pace_process.h
+++ b/engines/ultima/ultima8/world/actors/pace_process.h
@@ -35,7 +35,6 @@ public:
PaceProcess();
PaceProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
index e6d829d52c..85985fc757 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
@@ -34,7 +34,6 @@ static const unsigned int PATH_FAILED = 0;
const uint16 PathfinderProcess::PATHFINDER_PROC_TYPE = 0x204;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(PathfinderProcess)
PathfinderProcess::PathfinderProcess() : Process(),
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.h b/engines/ultima/ultima8/world/actors/pathfinder_process.h
index 104c4a2d7a..f42bc7b862 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.h
@@ -39,7 +39,6 @@ public:
PathfinderProcess(Actor *actor, int32 x, int32 y, int32 z);
~PathfinderProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
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 c38082e952..15d5890484 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.cpp
@@ -33,7 +33,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(QuickAvatarMoverProcess)
ProcId QuickAvatarMoverProcess::_amp[6] = { 0, 0, 0, 0, 0, 0 };
diff --git a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
index c2e04ce34f..735d1f0a57 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
@@ -35,7 +35,6 @@ public:
QuickAvatarMoverProcess(int x, int y, int z, int _dir);
~QuickAvatarMoverProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/resurrection_process.cpp b/engines/ultima/ultima8/world/actors/resurrection_process.cpp
index 7f37fe3c81..0024b8b48d 100644
--- a/engines/ultima/ultima8/world/actors/resurrection_process.cpp
+++ b/engines/ultima/ultima8/world/actors/resurrection_process.cpp
@@ -27,7 +27,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(ResurrectionProcess)
ResurrectionProcess::ResurrectionProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/resurrection_process.h b/engines/ultima/ultima8/world/actors/resurrection_process.h
index 542f3e4b40..74ac05b3c7 100644
--- a/engines/ultima/ultima8/world/actors/resurrection_process.h
+++ b/engines/ultima/ultima8/world/actors/resurrection_process.h
@@ -35,7 +35,6 @@ public:
ResurrectionProcess();
ResurrectionProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/scheduler_process.cpp b/engines/ultima/ultima8/world/actors/scheduler_process.cpp
index 17f51c68c9..6f53691737 100644
--- a/engines/ultima/ultima8/world/actors/scheduler_process.cpp
+++ b/engines/ultima/ultima8/world/actors/scheduler_process.cpp
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(SchedulerProcess)
SchedulerProcess::SchedulerProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/actors/scheduler_process.h b/engines/ultima/ultima8/world/actors/scheduler_process.h
index a40812635c..4fbb90fe43 100644
--- a/engines/ultima/ultima8/world/actors/scheduler_process.h
+++ b/engines/ultima/ultima8/world/actors/scheduler_process.h
@@ -24,7 +24,7 @@
#define WORLD_ACTORS_SCHEDULERPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -33,7 +33,6 @@ class SchedulerProcess : public Process {
public:
SchedulerProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/surrender_process.cpp b/engines/ultima/ultima8/world/actors/surrender_process.cpp
index 21a6e5cd64..3229bfcb4d 100644
--- a/engines/ultima/ultima8/world/actors/surrender_process.cpp
+++ b/engines/ultima/ultima8/world/actors/surrender_process.cpp
@@ -30,7 +30,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(SurrenderProcess)
static const uint16 SUIT_SUR_SNDS[] = {0xe9, 0xe0, 0xeb, 0xe1, 0xea};
diff --git a/engines/ultima/ultima8/world/actors/surrender_process.h b/engines/ultima/ultima8/world/actors/surrender_process.h
index 7dbcab8daa..d59cf46e94 100644
--- a/engines/ultima/ultima8/world/actors/surrender_process.h
+++ b/engines/ultima/ultima8/world/actors/surrender_process.h
@@ -35,7 +35,6 @@ public:
SurrenderProcess();
SurrenderProcess(Actor *actor);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
index 4685e1c31d..0bbde970da 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
@@ -27,7 +27,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(TargetedAnimProcess)
TargetedAnimProcess::TargetedAnimProcess() : ActorAnimProcess(),
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.h b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
index 82500a9069..73e078489d 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/animation.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -37,7 +37,6 @@ public:
TargetedAnimProcess(Actor *actor, Animation::Sequence action, Direction dir,
int32 coords[3]);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
bool loadData(Common::ReadStream *rs, uint32 version);
diff --git a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
index 0ac39aa970..bfca18d8eb 100644
--- a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
+++ b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
@@ -24,7 +24,7 @@
#define WORLD_ACTORS_TELEPORTTOEGGPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -34,7 +34,6 @@ public:
TeleportToEggProcess();
TeleportToEggProcess(int mapnum, int teleportId, int arrivalAnim = 0);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
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 543c6c3fe9..5603c4bd41 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -35,7 +35,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(U8AvatarMoverProcess)
U8AvatarMoverProcess::U8AvatarMoverProcess() : AvatarMoverProcess(),
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 f10b745951..ff0c63c404 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.h
@@ -39,7 +39,6 @@ public:
U8AvatarMoverProcess();
~U8AvatarMoverProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
bool loadData(Common::ReadStream *rs, uint32 version);
diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index 07c3f1c1f1..44221fc0fb 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(CameraProcess)
//
diff --git a/engines/ultima/ultima8/world/camera_process.h b/engines/ultima/ultima8/world/camera_process.h
index a1aeab1af5..f6433baf35 100644
--- a/engines/ultima/ultima8/world/camera_process.h
+++ b/engines/ultima/ultima8/world/camera_process.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -47,7 +47,6 @@ public:
~CameraProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index 5117999a51..0f263867ec 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -34,7 +34,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(Container)
Container::Container() {
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index 3f26dae10d..3fd5a6e433 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -27,7 +27,7 @@
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -42,7 +42,6 @@ public:
Container();
~Container() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! Check if an item can be added to the container
diff --git a/engines/ultima/ultima8/world/create_item_process.h b/engines/ultima/ultima8/world/create_item_process.h
index fcac9aa43d..6186620a30 100644
--- a/engines/ultima/ultima8/world/create_item_process.h
+++ b/engines/ultima/ultima8/world/create_item_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_WORLD_CREATEITEMPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/crosshair_process.cpp b/engines/ultima/ultima8/world/crosshair_process.cpp
index 50d0f5af75..373bda1955 100644
--- a/engines/ultima/ultima8/world/crosshair_process.cpp
+++ b/engines/ultima/ultima8/world/crosshair_process.cpp
@@ -35,7 +35,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(CrosshairProcess)
static const uint32 CROSSHAIR_SHAPE = 0x4CC;
diff --git a/engines/ultima/ultima8/world/crosshair_process.h b/engines/ultima/ultima8/world/crosshair_process.h
index 8bf706e1f7..b871545024 100644
--- a/engines/ultima/ultima8/world/crosshair_process.h
+++ b/engines/ultima/ultima8/world/crosshair_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_WORLD_CROSSHAIRPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -38,7 +38,6 @@ class CrosshairProcess : public Process {
public:
CrosshairProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/destroy_item_process.cpp b/engines/ultima/ultima8/world/destroy_item_process.cpp
index 24bcd0d6d6..8f389744c5 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.cpp
+++ b/engines/ultima/ultima8/world/destroy_item_process.cpp
@@ -28,7 +28,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(DestroyItemProcess)
DestroyItemProcess::DestroyItemProcess() : Process() {
diff --git a/engines/ultima/ultima8/world/destroy_item_process.h b/engines/ultima/ultima8/world/destroy_item_process.h
index 060fc1142b..2955e8ea2b 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.h
+++ b/engines/ultima/ultima8/world/destroy_item_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_WORLD_DESTROYITEMPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -39,7 +39,6 @@ public:
//! \param item The item to destroy. If 0, use process result as ObjId.
DestroyItemProcess(Item *item);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.h b/engines/ultima/ultima8/world/egg_hatcher_process.h
index 56428c8068..8f0f20c3ad 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.h
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.h
@@ -36,7 +36,6 @@ public:
EggHatcherProcess();
~EggHatcherProcess() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/fireball_process.cpp b/engines/ultima/ultima8/world/fireball_process.cpp
index cb478c5988..c7de076a65 100644
--- a/engines/ultima/ultima8/world/fireball_process.cpp
+++ b/engines/ultima/ultima8/world/fireball_process.cpp
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(FireballProcess)
FireballProcess::FireballProcess()
diff --git a/engines/ultima/ultima8/world/fireball_process.h b/engines/ultima/ultima8/world/fireball_process.h
index 4a2ed7264f..1c55007b7e 100644
--- a/engines/ultima/ultima8/world/fireball_process.h
+++ b/engines/ultima/ultima8/world/fireball_process.h
@@ -36,7 +36,6 @@ public:
FireballProcess();
FireballProcess(Item *item, Item *target);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/glob_egg.cpp b/engines/ultima/ultima8/world/glob_egg.cpp
index 3774f754ca..bb2a9bd5f2 100644
--- a/engines/ultima/ultima8/world/glob_egg.cpp
+++ b/engines/ultima/ultima8/world/glob_egg.cpp
@@ -30,7 +30,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(GlobEgg)
GlobEgg::GlobEgg() {
diff --git a/engines/ultima/ultima8/world/glob_egg.h b/engines/ultima/ultima8/world/glob_egg.h
index 15ade7a61c..a14e594502 100644
--- a/engines/ultima/ultima8/world/glob_egg.h
+++ b/engines/ultima/ultima8/world/glob_egg.h
@@ -36,7 +36,6 @@ public:
GlobEgg();
~GlobEgg() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! The item has entered the fast area
diff --git a/engines/ultima/ultima8/world/gravity_process.cpp b/engines/ultima/ultima8/world/gravity_process.cpp
index 8327cb1bc7..8401a3b45d 100644
--- a/engines/ultima/ultima8/world/gravity_process.cpp
+++ b/engines/ultima/ultima8/world/gravity_process.cpp
@@ -32,7 +32,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(GravityProcess)
GravityProcess::GravityProcess()
diff --git a/engines/ultima/ultima8/world/gravity_process.h b/engines/ultima/ultima8/world/gravity_process.h
index ed25e1dd4c..d81115b5a7 100644
--- a/engines/ultima/ultima8/world/gravity_process.h
+++ b/engines/ultima/ultima8/world/gravity_process.h
@@ -42,7 +42,6 @@ public:
void init();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 80a76f6905..f7c27236e4 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -63,7 +63,6 @@ namespace Ultima8 {
static const uint32 SNAP_EGG_SHAPE = 0x4fe;
static const uint32 BULLET_SPLASH_SHAPE = 0x1d9;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(Item)
Item::Item()
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index 2a4a7c3570..e17097c849 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -47,7 +47,6 @@ public:
Item();
~Item() override;
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
//! Get the Container this Item is in, if any. (0 if not in a Container)
diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index b6f8b5f07a..a8a5c60895 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -41,7 +41,6 @@ static const uint32 SELECTOR_SHAPE = 0x5a3;
static const uint16 SELECT_FAILED_SFX_REMORSE = 0xb0;
static const uint16 SELECT_FAILED_SFX_REGRET = 0x1a7;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(ItemSelectionProcess)
ItemSelectionProcess::ItemSelectionProcess() : Process(), _selectedItem(0),
diff --git a/engines/ultima/ultima8/world/item_selection_process.h b/engines/ultima/ultima8/world/item_selection_process.h
index 11541349f6..22aaf2e298 100644
--- a/engines/ultima/ultima8/world/item_selection_process.h
+++ b/engines/ultima/ultima8/world/item_selection_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_WORLD_ITEMSELECTIONPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -38,7 +38,6 @@ class ItemSelectionProcess : public Process {
public:
ItemSelectionProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/snap_process.cpp b/engines/ultima/ultima8/world/snap_process.cpp
index 46126a6565..9d9ff7146b 100644
--- a/engines/ultima/ultima8/world/snap_process.cpp
+++ b/engines/ultima/ultima8/world/snap_process.cpp
@@ -31,7 +31,6 @@ namespace Ultima8 {
SnapProcess *SnapProcess::_instance = nullptr;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(SnapProcess)
SnapProcess::SnapProcess() : Process(), _currentSnapEgg() {
diff --git a/engines/ultima/ultima8/world/snap_process.h b/engines/ultima/ultima8/world/snap_process.h
index c6ee38b9ec..2801c13337 100644
--- a/engines/ultima/ultima8/world/snap_process.h
+++ b/engines/ultima/ultima8/world/snap_process.h
@@ -35,7 +35,6 @@ class SnapProcess : public Process {
public:
SnapProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/split_item_process.cpp b/engines/ultima/ultima8/world/split_item_process.cpp
index bde44729b9..58ebb10567 100644
--- a/engines/ultima/ultima8/world/split_item_process.cpp
+++ b/engines/ultima/ultima8/world/split_item_process.cpp
@@ -27,7 +27,6 @@
namespace Ultima {
namespace Ultima8 {
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(SplitItemProcess)
SplitItemProcess::SplitItemProcess() : Process(), _target(0) {
diff --git a/engines/ultima/ultima8/world/split_item_process.h b/engines/ultima/ultima8/world/split_item_process.h
index 655ea95bbb..3ba9925a70 100644
--- a/engines/ultima/ultima8/world/split_item_process.h
+++ b/engines/ultima/ultima8/world/split_item_process.h
@@ -35,7 +35,6 @@ public:
SplitItemProcess();
SplitItemProcess(Item *original, Item *target);
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
diff --git a/engines/ultima/ultima8/world/target_reticle_process.cpp b/engines/ultima/ultima8/world/target_reticle_process.cpp
index cacc121481..7b8e6c88e6 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.cpp
+++ b/engines/ultima/ultima8/world/target_reticle_process.cpp
@@ -36,7 +36,6 @@ namespace Ultima8 {
TargetReticleProcess *TargetReticleProcess::_instance = nullptr;
-// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(TargetReticleProcess)
TargetReticleProcess::TargetReticleProcess() : Process(), _reticleEnabled(true),
diff --git a/engines/ultima/ultima8/world/target_reticle_process.h b/engines/ultima/ultima8/world/target_reticle_process.h
index e7d45590ec..49446afc3a 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.h
+++ b/engines/ultima/ultima8/world/target_reticle_process.h
@@ -24,7 +24,7 @@
#define ULTIMA8_WORLD_TARGETRETICLEPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/misc/p_dynamic_cast.h"
+#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
namespace Ultima8 {
@@ -39,7 +39,6 @@ class TargetReticleProcess : public Process {
public:
TargetReticleProcess();
- // p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
void run() override;
Commit: 577525fbd6dce1db12939c61ca90b5bb88774dc7
https://github.com/scummvm/scummvm/commit/577525fbd6dce1db12939c61ca90b5bb88774dc7
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-23T21:04:32-06:00
Commit Message:
ULTIMA8: Add comments for class type to clarify purpose
Changed paths:
engines/ultima/ultima8/misc/classtype.h
diff --git a/engines/ultima/ultima8/misc/classtype.h b/engines/ultima/ultima8/misc/classtype.h
index 7560799b4c..d6ee65fa15 100644
--- a/engines/ultima/ultima8/misc/classtype.h
+++ b/engines/ultima/ultima8/misc/classtype.h
@@ -26,7 +26,8 @@
namespace Ultima {
namespace Ultima8 {
-// This is just a 'type' used to differentiate each class.
+// This is 'type' used to differentiate each class.
+// The class name is used primarily to define entities in game saves
struct RunTimeClassType {
const char *_className;
inline bool operator == (const RunTimeClassType &other) const {
Commit: b8346b951aecda073783738b363d4be7d13ed729
https://github.com/scummvm/scummvm/commit/b8346b951aecda073783738b363d4be7d13ed729
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-23T21:04:32-06:00
Commit Message:
ULTIMA8: Cleanup macro formatting for class type
Changed paths:
engines/ultima/ultima8/misc/classtype.h
diff --git a/engines/ultima/ultima8/misc/classtype.h b/engines/ultima/ultima8/misc/classtype.h
index d6ee65fa15..fd6da54a1a 100644
--- a/engines/ultima/ultima8/misc/classtype.h
+++ b/engines/ultima/ultima8/misc/classtype.h
@@ -35,18 +35,16 @@ struct RunTimeClassType {
}
};
-#define ENABLE_RUNTIME_CLASSTYPE() \
- static const RunTimeClassType ClassType; \
+#define ENABLE_RUNTIME_CLASSTYPE() \
+ static const RunTimeClassType ClassType; \
virtual const RunTimeClassType & GetClassType() const override { return ClassType; }
-#define ENABLE_RUNTIME_CLASSTYPE_BASE() \
- static const RunTimeClassType ClassType; \
+#define ENABLE_RUNTIME_CLASSTYPE_BASE() \
+ static const RunTimeClassType ClassType; \
virtual const RunTimeClassType & GetClassType() const { return ClassType; }
-#define DEFINE_RUNTIME_CLASSTYPE_CODE(Classname) \
- const RunTimeClassType Classname::ClassType = { \
- #Classname \
- };
+#define DEFINE_RUNTIME_CLASSTYPE_CODE(Classname) \
+ const RunTimeClassType Classname::ClassType = { #Classname };
} // End of namespace Ultima8
} // End of namespace Ultima
More information about the Scummvm-git-logs
mailing list