[Scummvm-git-logs] scummvm master -> d9eef44b5250601181b2cfe8a2db8559a6bcfc5b
lephilousophe
noreply at scummvm.org
Mon Jun 3 17:46:43 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d9eef44b52 ULTIMA8: Fix name clashes with common graphics code
Commit: d9eef44b5250601181b2cfe8a2db8559a6bcfc5b
https://github.com/scummvm/scummvm/commit/d9eef44b5250601181b2cfe8a2db8559a6bcfc5b
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-06-03T19:46:22+02:00
Commit Message:
ULTIMA8: Fix name clashes with common graphics code
This should solve MSVC build
Changed paths:
A engines/ultima/ultima8/gfx/anim_dat.cpp
A engines/ultima/ultima8/gfx/anim_dat.h
A engines/ultima/ultima8/gfx/avi_player.cpp
A engines/ultima/ultima8/gfx/avi_player.h
A engines/ultima/ultima8/gfx/cycle_process.cpp
A engines/ultima/ultima8/gfx/cycle_process.h
A engines/ultima/ultima8/gfx/fade_to_modal_process.cpp
A engines/ultima/ultima8/gfx/fade_to_modal_process.h
A engines/ultima/ultima8/gfx/fonts/font.cpp
A engines/ultima/ultima8/gfx/fonts/font.h
A engines/ultima/ultima8/gfx/fonts/font_manager.cpp
A engines/ultima/ultima8/gfx/fonts/font_manager.h
A engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
A engines/ultima/ultima8/gfx/fonts/font_shape_archive.h
A engines/ultima/ultima8/gfx/fonts/jp_font.cpp
A engines/ultima/ultima8/gfx/fonts/jp_font.h
A engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
A engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
A engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
A engines/ultima/ultima8/gfx/fonts/rendered_text.h
A engines/ultima/ultima8/gfx/fonts/shape_font.cpp
A engines/ultima/ultima8/gfx/fonts/shape_font.h
A engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
A engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
A engines/ultima/ultima8/gfx/fonts/tt_font.cpp
A engines/ultima/ultima8/gfx/fonts/tt_font.h
A engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
A engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
A engines/ultima/ultima8/gfx/frame_id.cpp
A engines/ultima/ultima8/gfx/frame_id.h
A engines/ultima/ultima8/gfx/gump_shape_archive.cpp
A engines/ultima/ultima8/gfx/gump_shape_archive.h
A engines/ultima/ultima8/gfx/inverter_process.cpp
A engines/ultima/ultima8/gfx/inverter_process.h
A engines/ultima/ultima8/gfx/main_shape_archive.cpp
A engines/ultima/ultima8/gfx/main_shape_archive.h
A engines/ultima/ultima8/gfx/mouse_shape_archive.h
A engines/ultima/ultima8/gfx/movie_player.h
A engines/ultima/ultima8/gfx/pal_transforms.h
A engines/ultima/ultima8/gfx/palette.cpp
A engines/ultima/ultima8/gfx/palette.h
A engines/ultima/ultima8/gfx/palette_fader_process.cpp
A engines/ultima/ultima8/gfx/palette_fader_process.h
A engines/ultima/ultima8/gfx/palette_manager.cpp
A engines/ultima/ultima8/gfx/palette_manager.h
A engines/ultima/ultima8/gfx/raw_shape_frame.cpp
A engines/ultima/ultima8/gfx/raw_shape_frame.h
A engines/ultima/ultima8/gfx/render_surface.cpp
A engines/ultima/ultima8/gfx/render_surface.h
A engines/ultima/ultima8/gfx/shape.cpp
A engines/ultima/ultima8/gfx/shape.h
A engines/ultima/ultima8/gfx/shape_archive.cpp
A engines/ultima/ultima8/gfx/shape_archive.h
A engines/ultima/ultima8/gfx/shape_frame.cpp
A engines/ultima/ultima8/gfx/shape_frame.h
A engines/ultima/ultima8/gfx/shape_info.cpp
A engines/ultima/ultima8/gfx/shape_info.h
A engines/ultima/ultima8/gfx/skf_player.cpp
A engines/ultima/ultima8/gfx/skf_player.h
A engines/ultima/ultima8/gfx/texture.h
A engines/ultima/ultima8/gfx/type_flags.cpp
A engines/ultima/ultima8/gfx/type_flags.h
A engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
A engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
A engines/ultima/ultima8/gfx/xform_blend.cpp
A engines/ultima/ultima8/gfx/xform_blend.h
R engines/ultima/ultima8/graphics/anim_dat.cpp
R engines/ultima/ultima8/graphics/anim_dat.h
R engines/ultima/ultima8/graphics/avi_player.cpp
R engines/ultima/ultima8/graphics/avi_player.h
R engines/ultima/ultima8/graphics/cycle_process.cpp
R engines/ultima/ultima8/graphics/cycle_process.h
R engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
R engines/ultima/ultima8/graphics/fade_to_modal_process.h
R engines/ultima/ultima8/graphics/fonts/font.cpp
R engines/ultima/ultima8/graphics/fonts/font.h
R engines/ultima/ultima8/graphics/fonts/font_manager.cpp
R engines/ultima/ultima8/graphics/fonts/font_manager.h
R engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
R engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
R engines/ultima/ultima8/graphics/fonts/jp_font.cpp
R engines/ultima/ultima8/graphics/fonts/jp_font.h
R engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
R engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
R engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
R engines/ultima/ultima8/graphics/fonts/rendered_text.h
R engines/ultima/ultima8/graphics/fonts/shape_font.cpp
R engines/ultima/ultima8/graphics/fonts/shape_font.h
R engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
R engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
R engines/ultima/ultima8/graphics/fonts/tt_font.cpp
R engines/ultima/ultima8/graphics/fonts/tt_font.h
R engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
R engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
R engines/ultima/ultima8/graphics/frame_id.cpp
R engines/ultima/ultima8/graphics/frame_id.h
R engines/ultima/ultima8/graphics/gump_shape_archive.cpp
R engines/ultima/ultima8/graphics/gump_shape_archive.h
R engines/ultima/ultima8/graphics/inverter_process.cpp
R engines/ultima/ultima8/graphics/inverter_process.h
R engines/ultima/ultima8/graphics/main_shape_archive.cpp
R engines/ultima/ultima8/graphics/main_shape_archive.h
R engines/ultima/ultima8/graphics/mouse_shape_archive.h
R engines/ultima/ultima8/graphics/movie_player.h
R engines/ultima/ultima8/graphics/pal_transforms.h
R engines/ultima/ultima8/graphics/palette.cpp
R engines/ultima/ultima8/graphics/palette.h
R engines/ultima/ultima8/graphics/palette_fader_process.cpp
R engines/ultima/ultima8/graphics/palette_fader_process.h
R engines/ultima/ultima8/graphics/palette_manager.cpp
R engines/ultima/ultima8/graphics/palette_manager.h
R engines/ultima/ultima8/graphics/raw_shape_frame.cpp
R engines/ultima/ultima8/graphics/raw_shape_frame.h
R engines/ultima/ultima8/graphics/render_surface.cpp
R engines/ultima/ultima8/graphics/render_surface.h
R engines/ultima/ultima8/graphics/shape.cpp
R engines/ultima/ultima8/graphics/shape.h
R engines/ultima/ultima8/graphics/shape_archive.cpp
R engines/ultima/ultima8/graphics/shape_archive.h
R engines/ultima/ultima8/graphics/shape_frame.cpp
R engines/ultima/ultima8/graphics/shape_frame.h
R engines/ultima/ultima8/graphics/shape_info.cpp
R engines/ultima/ultima8/graphics/shape_info.h
R engines/ultima/ultima8/graphics/skf_player.cpp
R engines/ultima/ultima8/graphics/skf_player.h
R engines/ultima/ultima8/graphics/texture.h
R engines/ultima/ultima8/graphics/type_flags.cpp
R engines/ultima/ultima8/graphics/type_flags.h
R engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
R engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
R engines/ultima/ultima8/graphics/xform_blend.cpp
R engines/ultima/ultima8/graphics/xform_blend.h
engines/ultima/module.mk
engines/ultima/ultima8/games/cru_game.cpp
engines/ultima/ultima8/games/game.cpp
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/game_data.h
engines/ultima/ultima8/games/start_crusader_process.cpp
engines/ultima/ultima8/games/start_u8_process.cpp
engines/ultima/ultima8/games/u8_game.cpp
engines/ultima/ultima8/gumps/book_gump.cpp
engines/ultima/ultima8/gumps/computer_gump.cpp
engines/ultima/ultima8/gumps/computer_gump.h
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/cru_credits_gump.cpp
engines/ultima/ultima8/gumps/cru_demo_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_menu_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
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/difficulty_gump.cpp
engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/gumps/inverter_gump.cpp
engines/ultima/ultima8/gumps/keypad_gump.cpp
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/mini_stats_gump.cpp
engines/ultima/ultima8/gumps/minimap_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/scroll_gump.cpp
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/gumps/slider_gump.cpp
engines/ultima/ultima8/gumps/translucent_gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/gumps/weasel_gump.cpp
engines/ultima/ultima8/gumps/widgets/button_widget.cpp
engines/ultima/ultima8/gumps/widgets/button_widget.h
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.h
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.h
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/usecode/u8_intrinsics.h
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/avatar_death_process.cpp
engines/ultima/ultima8/world/actors/grant_peace_process.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/item_factory.cpp
engines/ultima/ultima8/world/item_sorter.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/minimap.cpp
engines/ultima/ultima8/world/world.cpp
diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index 1a60f83f034..5d17e4ef596 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -428,37 +428,37 @@ MODULE_OBJS += \
ultima8/games/start_u8_process.o \
ultima8/games/treasure_loader.o \
ultima8/games/u8_game.o \
- ultima8/graphics/anim_dat.o \
- ultima8/graphics/avi_player.o \
- ultima8/graphics/cycle_process.o \
- ultima8/graphics/frame_id.o \
- ultima8/graphics/fade_to_modal_process.o \
- ultima8/graphics/gump_shape_archive.o \
- ultima8/graphics/inverter_process.o \
- ultima8/graphics/main_shape_archive.o \
- ultima8/graphics/palette.o \
- ultima8/graphics/palette_fader_process.o \
- ultima8/graphics/palette_manager.o \
- ultima8/graphics/raw_shape_frame.o \
- ultima8/graphics/render_surface.o \
- ultima8/graphics/shape.o \
- ultima8/graphics/shape_archive.o \
- ultima8/graphics/shape_frame.o \
- ultima8/graphics/shape_info.o \
- ultima8/graphics/skf_player.o \
- ultima8/graphics/type_flags.o \
- ultima8/graphics/wpn_ovlay_dat.o \
- ultima8/graphics/xform_blend.o \
- ultima8/graphics/fonts/font.o \
- ultima8/graphics/fonts/font_manager.o \
- ultima8/graphics/fonts/font_shape_archive.o \
- ultima8/graphics/fonts/jp_font.o \
- ultima8/graphics/fonts/jp_rendered_text.o \
- ultima8/graphics/fonts/rendered_text.o \
- ultima8/graphics/fonts/shape_font.o \
- ultima8/graphics/fonts/shape_rendered_text.o \
- ultima8/graphics/fonts/ttf_rendered_text.o \
- ultima8/graphics/fonts/tt_font.o \
+ ultima8/gfx/anim_dat.o \
+ ultima8/gfx/avi_player.o \
+ ultima8/gfx/cycle_process.o \
+ ultima8/gfx/frame_id.o \
+ ultima8/gfx/fade_to_modal_process.o \
+ ultima8/gfx/gump_shape_archive.o \
+ ultima8/gfx/inverter_process.o \
+ ultima8/gfx/main_shape_archive.o \
+ ultima8/gfx/palette.o \
+ ultima8/gfx/palette_fader_process.o \
+ ultima8/gfx/palette_manager.o \
+ ultima8/gfx/raw_shape_frame.o \
+ ultima8/gfx/render_surface.o \
+ ultima8/gfx/shape.o \
+ ultima8/gfx/shape_archive.o \
+ ultima8/gfx/shape_frame.o \
+ ultima8/gfx/shape_info.o \
+ ultima8/gfx/skf_player.o \
+ ultima8/gfx/type_flags.o \
+ ultima8/gfx/wpn_ovlay_dat.o \
+ ultima8/gfx/xform_blend.o \
+ ultima8/gfx/fonts/font.o \
+ ultima8/gfx/fonts/font_manager.o \
+ ultima8/gfx/fonts/font_shape_archive.o \
+ ultima8/gfx/fonts/jp_font.o \
+ ultima8/gfx/fonts/jp_rendered_text.o \
+ ultima8/gfx/fonts/rendered_text.o \
+ ultima8/gfx/fonts/shape_font.o \
+ ultima8/gfx/fonts/shape_rendered_text.o \
+ ultima8/gfx/fonts/ttf_rendered_text.o \
+ ultima8/gfx/fonts/tt_font.o \
ultima8/gumps/ask_gump.o \
ultima8/gumps/bark_gump.o \
ultima8/gumps/book_gump.o \
diff --git a/engines/ultima/ultima8/games/cru_game.cpp b/engines/ultima/ultima8/games/cru_game.cpp
index 672532496e9..e57e78b48ba 100644
--- a/engines/ultima/ultima8/games/cru_game.cpp
+++ b/engines/ultima/ultima8/games/cru_game.cpp
@@ -26,7 +26,7 @@
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/games/cru_game.h"
#include "ultima/ultima8/games/start_crusader_process.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/gumps/movie_gump.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/gumps/main_menu_process.h"
@@ -35,7 +35,7 @@
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/graphics/xform_blend.h"
+#include "ultima/ultima8/gfx/xform_blend.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/world/item_factory.h"
diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index c49b0429e58..b29374969f7 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -24,7 +24,7 @@
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/games/u8_game.h"
#include "ultima/ultima8/games/cru_game.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/main_menu_process.h"
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index d7b4a244c8c..4f4ebebe2b5 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -26,17 +26,17 @@
#include "ultima/ultima8/misc/util.h"
#include "ultima/ultima8/games/game_data.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"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
#include "ultima/ultima8/world/map_glob.h"
#include "ultima/ultima8/world/fire_type_table.h"
#include "ultima/ultima8/world/actors/npc_dat.h"
#include "ultima/ultima8/world/actors/combat_dat.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/wpn_ovlay_dat.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/wpn_ovlay_dat.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "ultima/ultima8/games/game_info.h"
#include "ultima/ultima8/gumps/weasel_dat.h"
#include "ultima/ultima8/conf/config_file_manager.h"
diff --git a/engines/ultima/ultima8/games/game_data.h b/engines/ultima/ultima8/games/game_data.h
index c783f1049e3..b119d11c81e 100644
--- a/engines/ultima/ultima8/games/game_data.h
+++ b/engines/ultima/ultima8/games/game_data.h
@@ -24,7 +24,7 @@
#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/string.h"
-#include "ultima/ultima8/graphics/frame_id.h"
+#include "ultima/ultima8/gfx/frame_id.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 26a84728e2d..171512d4ab8 100644
--- a/engines/ultima/ultima8/games/start_crusader_process.cpp
+++ b/engines/ultima/ultima8/games/start_crusader_process.cpp
@@ -31,8 +31,8 @@
#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/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/gfx/texture.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 cac7bbf4eda..565fb9810c0 100644
--- a/engines/ultima/ultima8/games/start_u8_process.cpp
+++ b/engines/ultima/ultima8/games/start_u8_process.cpp
@@ -32,7 +32,7 @@
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/graphics/palette_fader_process.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index b8e3cb937c0..9c2db5fe30d 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -26,10 +26,10 @@
#include "ultima/ultima8/games/u8_game.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/fade_to_modal_process.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/fade_to_modal_process.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/xform_blend.h"
+#include "ultima/ultima8/gfx/xform_blend.h"
#include "ultima/ultima8/filesys/u8_save_file.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/actors/main_actor.h"
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/gfx/anim_dat.cpp
similarity index 99%
rename from engines/ultima/ultima8/graphics/anim_dat.cpp
rename to engines/ultima/ultima8/gfx/anim_dat.cpp
index fb3834de759..91e4a6e8442 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/gfx/anim_dat.cpp
@@ -21,7 +21,7 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
#include "ultima/ultima8/world/actors/actor_anim.h"
#include "ultima/ultima8/world/actors/actor.h"
diff --git a/engines/ultima/ultima8/graphics/anim_dat.h b/engines/ultima/ultima8/gfx/anim_dat.h
similarity index 95%
rename from engines/ultima/ultima8/graphics/anim_dat.h
rename to engines/ultima/ultima8/gfx/anim_dat.h
index 723f58b6300..02bd14e7bc3 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.h
+++ b/engines/ultima/ultima8/gfx/anim_dat.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_ANIMDAT_H
-#define ULTIMA8_GRAPHICS_ANIMDAT_H
+#ifndef ULTIMA8_GFX_ANIMDAT_H
+#define ULTIMA8_GFX_ANIMDAT_H
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/world/actors/animation.h"
diff --git a/engines/ultima/ultima8/graphics/avi_player.cpp b/engines/ultima/ultima8/gfx/avi_player.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/avi_player.cpp
rename to engines/ultima/ultima8/gfx/avi_player.cpp
index 7b0581e902a..f110f0370b7 100644
--- a/engines/ultima/ultima8/graphics/avi_player.cpp
+++ b/engines/ultima/ultima8/gfx/avi_player.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/graphics/avi_player.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/avi_player.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "video/avi_decoder.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/avi_player.h b/engines/ultima/ultima8/gfx/avi_player.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/avi_player.h
rename to engines/ultima/ultima8/gfx/avi_player.h
index 45207cdecd7..f8442d4ea83 100644
--- a/engines/ultima/ultima8/graphics/avi_player.h
+++ b/engines/ultima/ultima8/gfx/avi_player.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_AVIPLAYER_H
-#define ULTIMA8_GRAPHICS_AVIPLAYER_H
+#ifndef ULTIMA8_GFX_AVIPLAYER_H
+#define ULTIMA8_GFX_AVIPLAYER_H
-#include "ultima/ultima8/graphics/movie_player.h"
+#include "ultima/ultima8/gfx/movie_player.h"
#include "graphics/managed_surface.h"
namespace Video {
diff --git a/engines/ultima/ultima8/graphics/cycle_process.cpp b/engines/ultima/ultima8/gfx/cycle_process.cpp
similarity index 97%
rename from engines/ultima/ultima8/graphics/cycle_process.cpp
rename to engines/ultima/ultima8/gfx/cycle_process.cpp
index 05d041c74a2..ee1b8adefa8 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.cpp
+++ b/engines/ultima/ultima8/gfx/cycle_process.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "ultima/ultima8/graphics/cycle_process.h"
-#include "ultima/ultima8/graphics/palette.h"
+#include "ultima/ultima8/gfx/cycle_process.h"
+#include "ultima/ultima8/gfx/palette.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/cycle_process.h b/engines/ultima/ultima8/gfx/cycle_process.h
similarity index 92%
rename from engines/ultima/ultima8/graphics/cycle_process.h
rename to engines/ultima/ultima8/gfx/cycle_process.h
index 2eed94a866c..acee17e59c2 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.h
+++ b/engines/ultima/ultima8/gfx/cycle_process.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_CYCLEPROCESS_H
-#define ULTIMA8_GRAPHICS_CYCLEPROCESS_H
+#ifndef ULTIMA8_GFX_CYCLEPROCESS_H
+#define ULTIMA8_GFX_CYCLEPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp b/engines/ultima/ultima8/gfx/fade_to_modal_process.cpp
similarity index 94%
rename from engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
rename to engines/ultima/ultima8/gfx/fade_to_modal_process.cpp
index ae81f98ea0b..ddee2e60d20 100644
--- a/engines/ultima/ultima8/graphics/fade_to_modal_process.cpp
+++ b/engines/ultima/ultima8/gfx/fade_to_modal_process.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "ultima/ultima8/graphics/palette_fader_process.h"
-#include "ultima/ultima8/graphics/fade_to_modal_process.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/gfx/fade_to_modal_process.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
diff --git a/engines/ultima/ultima8/graphics/fade_to_modal_process.h b/engines/ultima/ultima8/gfx/fade_to_modal_process.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/fade_to_modal_process.h
rename to engines/ultima/ultima8/gfx/fade_to_modal_process.h
index 0fc2787e94d..0cb90d1fa38 100644
--- a/engines/ultima/ultima8/graphics/fade_to_modal_process.h
+++ b/engines/ultima/ultima8/gfx/fade_to_modal_process.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FADETOMODALPROCESS_H
-#define ULTIMA8_GRAPHICS_FADETOMODALPROCESS_H
+#ifndef ULTIMA8_GFX_FADETOMODALPROCESS_H
+#define ULTIMA8_GFX_FADETOMODALPROCESS_H
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/gumps/modal_gump.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/font.cpp b/engines/ultima/ultima8/gfx/fonts/font.cpp
similarity index 99%
rename from engines/ultima/ultima8/graphics/fonts/font.cpp
rename to engines/ultima/ultima8/gfx/fonts/font.cpp
index d4be6cd7867..96aaa231373 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font.cpp
@@ -22,7 +22,7 @@
#include "ultima/ultima.h"
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/font.h b/engines/ultima/ultima8/gfx/fonts/font.h
similarity index 98%
rename from engines/ultima/ultima8/graphics/fonts/font.h
rename to engines/ultima/ultima8/gfx/fonts/font.h
index 82ed1f9ff5a..aa2358d0845 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.h
+++ b/engines/ultima/ultima8/gfx/fonts/font.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_FONT_H
-#define ULTIMA8_GRAPHICS_FONTS_FONT_H
+#ifndef ULTIMA8_GFX_FONTS_FONT_H
+#define ULTIMA8_GFX_FONTS_FONT_H
#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/string.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/gfx/fonts/font_manager.cpp
similarity index 93%
rename from engines/ultima/ultima8/graphics/fonts/font_manager.cpp
rename to engines/ultima/ultima8/gfx/fonts/font_manager.cpp
index 157511405e4..a9d2d161f46 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.cpp
@@ -25,15 +25,15 @@
#include "ultima/ultima.h"
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.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/graphics/fonts/tt_font.h"
-#include "ultima/ultima8/graphics/fonts/jp_font.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
+#include "ultima/ultima8/gfx/fonts/tt_font.h"
+#include "ultima/ultima8/gfx/fonts/jp_font.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "graphics/fonts/ttf.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.h b/engines/ultima/ultima8/gfx/fonts/font_manager.h
similarity index 97%
rename from engines/ultima/ultima8/graphics/fonts/font_manager.h
rename to engines/ultima/ultima8/gfx/fonts/font_manager.h
index 67a343c92fa..c2e8f0b900d 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_FONTMANAGER_H
-#define ULTIMA8_GRAPHICS_FONTS_FONTMANAGER_H
+#ifndef ULTIMA8_GFX_FONTS_FONTMANAGER_H
+#define ULTIMA8_GFX_FONTS_FONTMANAGER_H
#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/string.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
similarity index 95%
rename from engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
rename to engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
index 6954fe66b5f..a3bce7eb843 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
@@ -21,9 +21,9 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/fonts/font_shape_archive.h"
+#include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
#include "ultima/ultima8/misc/util.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
#include "ultima/ultima8/conf/config_file_manager.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.h
similarity index 91%
rename from engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
rename to engines/ultima/ultima8/gfx/fonts/font_shape_archive.h
index 46e2602bb13..92e2f507e72 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_FONTSHAPEARCHIVE_H
-#define ULTIMA8_GRAPHICS_FONTS_FONTSHAPEARCHIVE_H
+#ifndef ULTIMA8_GFX_FONTS_FONTSHAPEARCHIVE_H
+#define ULTIMA8_GFX_FONTS_FONTSHAPEARCHIVE_H
-#include "ultima/ultima8/graphics/shape_archive.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
similarity index 93%
rename from engines/ultima/ultima8/graphics/fonts/jp_font.cpp
rename to engines/ultima/ultima8/gfx/fonts/jp_font.cpp
index be935800c85..04b4552c21a 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
@@ -21,10 +21,10 @@
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/fonts/jp_font.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/fonts/jp_rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/jp_font.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/fonts/jp_rendered_text.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.h b/engines/ultima/ultima8/gfx/fonts/jp_font.h
similarity index 93%
rename from engines/ultima/ultima8/graphics/fonts/jp_font.h
rename to engines/ultima/ultima8/gfx/fonts/jp_font.h
index 161e79f2cb8..c0854a52315 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_JPFONT_H
-#define ULTIMA8_GRAPHICS_FONTS_JPFONT_H
+#ifndef ULTIMA8_GFX_FONTS_JPFONT_H
+#define ULTIMA8_GFX_FONTS_JPFONT_H
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
similarity index 92%
rename from engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
rename to engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
index aa94ee3e54a..3277d2d0227 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
@@ -21,12 +21,12 @@
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/misc/common_types.h"
-#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/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/fonts/jp_rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
similarity index 88%
rename from engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
rename to engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
index d74e15bbe97..2c01c6fcc09 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_JPRENDEREDTEXT_H
-#define ULTIMA8_GRAPHICS_FONTS_JPRENDEREDTEXT_H
+#ifndef ULTIMA8_GFX_FONTS_JPRENDEREDTEXT_H
+#define ULTIMA8_GFX_FONTS_JPRENDEREDTEXT_H
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
similarity index 95%
rename from engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
rename to engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
index 85a43e9e996..f6b84d7ed3e 100644
--- a/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/rendered_text.cpp
@@ -20,7 +20,7 @@
*/
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/rendered_text.h b/engines/ultima/ultima8/gfx/fonts/rendered_text.h
similarity index 95%
rename from engines/ultima/ultima8/graphics/fonts/rendered_text.h
rename to engines/ultima/ultima8/gfx/fonts/rendered_text.h
index 7d7e2574294..72e14858cfb 100644
--- a/engines/ultima/ultima8/graphics/fonts/rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/rendered_text.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_RENDEREDTEXT_H
-#define ULTIMA8_GRAPHICS_FONTS_RENDEREDTEXT_H
+#ifndef ULTIMA8_GFX_FONTS_RENDEREDTEXT_H
+#define ULTIMA8_GFX_FONTS_RENDEREDTEXT_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
similarity index 95%
rename from engines/ultima/ultima8/graphics/fonts/shape_font.cpp
rename to engines/ultima/ultima8/gfx/fonts/shape_font.cpp
index 5cc8377a95b..0e75802702c 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
@@ -21,9 +21,9 @@
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/fonts/shape_rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/fonts/shape_rendered_text.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.h b/engines/ultima/ultima8/gfx/fonts/shape_font.h
similarity index 91%
rename from engines/ultima/ultima8/graphics/fonts/shape_font.h
rename to engines/ultima/ultima8/gfx/fonts/shape_font.h
index 462edce56e9..bf569d1a831 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_SHAPEFONT_H
-#define ULTIMA8_GRAPHICS_FONTS_SHAPEFONT_H
+#ifndef ULTIMA8_GFX_FONTS_SHAPEFONT_H
+#define ULTIMA8_GFX_FONTS_SHAPEFONT_H
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/shape.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/shape.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
similarity index 93%
rename from engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
rename to engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
index d99f159dea6..1a1fe4be3c2 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
@@ -20,11 +20,11 @@
*/
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/fonts/shape_rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/shape_rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
similarity index 87%
rename from engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
rename to engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
index 0f176ace4b3..f54ec07be51 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_SHAPERENDEREDTEXT_H
-#define ULTIMA8_GRAPHICS_FONTS_SHAPERENDEREDTEXT_H
+#ifndef ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
+#define ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/fonts/tt_font.cpp
rename to engines/ultima/ultima8/gfx/fonts/tt_font.cpp
index f2d33003a4a..51f193ce655 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/misc/common_types.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/gfx/fonts/tt_font.h"
+#include "ultima/ultima8/gfx/fonts/ttf_rendered_text.h"
+#include "ultima/ultima8/gfx/texture.h"
//include iomanip
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.h b/engines/ultima/ultima8/gfx/fonts/tt_font.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/fonts/tt_font.h
rename to engines/ultima/ultima8/gfx/fonts/tt_font.h
index fca321d8a26..4114c0d721d 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_TTFONT_H
-#define ULTIMA8_GRAPHICS_FONTS_TTFONT_H
+#ifndef ULTIMA8_GFX_FONTS_TTFONT_H
+#define ULTIMA8_GFX_FONTS_TTFONT_H
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
#include "graphics/font.h"
#include "graphics/pixelformat.h"
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
similarity index 92%
rename from engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
rename to engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
index 055813bf3ab..3319cb8141a 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/misc/common_types.h"
-#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/gfx/fonts/ttf_rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/tt_font.h"
+#include "ultima/ultima8/gfx/render_surface.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
similarity index 88%
rename from engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
rename to engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
index 9e785d74cb9..3e65329b101 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/ttf_rendered_text.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FONTS_SHAPERENDEREDTEXT_H
-#define ULTIMA8_GRAPHICS_FONTS_SHAPERENDEREDTEXT_H
+#ifndef ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
+#define ULTIMA8_GFX_FONTS_SHAPERENDEREDTEXT_H
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
#include "graphics/managed_surface.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/frame_id.cpp b/engines/ultima/ultima8/gfx/frame_id.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/frame_id.cpp
rename to engines/ultima/ultima8/gfx/frame_id.cpp
index 6a6fcc7b7fb..bee02e9f3bb 100644
--- a/engines/ultima/ultima8/graphics/frame_id.cpp
+++ b/engines/ultima/ultima8/gfx/frame_id.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/ultima8/graphics/frame_id.h"
+#include "ultima/ultima8/gfx/frame_id.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/frame_id.h b/engines/ultima/ultima8/gfx/frame_id.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/frame_id.h
rename to engines/ultima/ultima8/gfx/frame_id.h
index 4c7465f59cd..09d296d6006 100644
--- a/engines/ultima/ultima8/graphics/frame_id.h
+++ b/engines/ultima/ultima8/gfx/frame_id.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_FRAMEID_H
-#define ULTIMA8_GRAPHICS_FRAMEID_H
+#ifndef ULTIMA8_GFX_FRAMEID_H
+#define ULTIMA8_GFX_FRAMEID_H
#include "common/stream.h"
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp b/engines/ultima/ultima8/gfx/gump_shape_archive.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/gump_shape_archive.cpp
rename to engines/ultima/ultima8/gfx/gump_shape_archive.cpp
index bb01ad40fa7..ffb70d6a7b6 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/gump_shape_archive.cpp
@@ -21,7 +21,7 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
#include "ultima/ultima8/misc/rect.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.h b/engines/ultima/ultima8/gfx/gump_shape_archive.h
similarity index 91%
rename from engines/ultima/ultima8/graphics/gump_shape_archive.h
rename to engines/ultima/ultima8/gfx/gump_shape_archive.h
index 30811716986..3912c65d84e 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.h
+++ b/engines/ultima/ultima8/gfx/gump_shape_archive.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_GUMPSHAPEARCHIVE_H
-#define ULTIMA8_GRAPHICS_GUMPSHAPEARCHIVE_H
+#ifndef ULTIMA8_GFX_GUMPSHAPEARCHIVE_H
+#define ULTIMA8_GFX_GUMPSHAPEARCHIVE_H
-#include "ultima/ultima8/graphics/shape_archive.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/inverter_process.cpp b/engines/ultima/ultima8/gfx/inverter_process.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/inverter_process.cpp
rename to engines/ultima/ultima8/gfx/inverter_process.cpp
index 340b55ea9e9..faf1219b523 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.cpp
+++ b/engines/ultima/ultima8/gfx/inverter_process.cpp
@@ -20,7 +20,7 @@
*/
-#include "ultima/ultima8/graphics/inverter_process.h"
+#include "ultima/ultima8/gfx/inverter_process.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/gfx/inverter_process.h
similarity index 95%
rename from engines/ultima/ultima8/graphics/inverter_process.h
rename to engines/ultima/ultima8/gfx/inverter_process.h
index f49663b9801..76730cd2f66 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/gfx/inverter_process.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_INVERTERPROCESS_H
-#define ULTIMA8_GRAPHICS_INVERTERPROCESS_H
+#ifndef ULTIMA8_GFX_INVERTERPROCESS_H
+#define ULTIMA8_GFX_INVERTERPROCESS_H
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.cpp b/engines/ultima/ultima8/gfx/main_shape_archive.cpp
similarity index 93%
rename from engines/ultima/ultima8/graphics/main_shape_archive.cpp
rename to engines/ultima/ultima8/gfx/main_shape_archive.cpp
index 1e67f5a94f6..e499d1d46f8 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/main_shape_archive.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/type_flags.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/type_flags.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/gfx/main_shape_archive.h
similarity index 93%
rename from engines/ultima/ultima8/graphics/main_shape_archive.h
rename to engines/ultima/ultima8/gfx/main_shape_archive.h
index 7ace741d31b..395ee2030e0 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/gfx/main_shape_archive.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_MAINSHAPEARCHIVE_H
-#define ULTIMA8_GRAPHICS_MAINSHAPEARCHIVE_H
+#ifndef ULTIMA8_GFX_MAINSHAPEARCHIVE_H
+#define ULTIMA8_GFX_MAINSHAPEARCHIVE_H
-#include "ultima/ultima8/graphics/shape_archive.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/mouse_shape_archive.h b/engines/ultima/ultima8/gfx/mouse_shape_archive.h
similarity index 92%
rename from engines/ultima/ultima8/graphics/mouse_shape_archive.h
rename to engines/ultima/ultima8/gfx/mouse_shape_archive.h
index bb7f2a8eafc..2a982fb47a0 100644
--- a/engines/ultima/ultima8/graphics/mouse_shape_archive.h
+++ b/engines/ultima/ultima8/gfx/mouse_shape_archive.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_MOUSESHAPEARCHIVE_H
-#define ULTIMA8_GRAPHICS_MOUSESHAPEARCHIVE_H
+#ifndef ULTIMA8_GFX_MOUSESHAPEARCHIVE_H
+#define ULTIMA8_GFX_MOUSESHAPEARCHIVE_H
-#include "ultima/ultima8/graphics/shape_archive.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/movie_player.h b/engines/ultima/ultima8/gfx/movie_player.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/movie_player.h
rename to engines/ultima/ultima8/gfx/movie_player.h
index 5420df82fd0..f19351d595d 100644
--- a/engines/ultima/ultima8/graphics/movie_player.h
+++ b/engines/ultima/ultima8/gfx/movie_player.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_MOVIEPLAYER_H
-#define ULTIMA8_GRAPHICS_MOVIEPLAYER_H
+#ifndef ULTIMA8_GFX_MOVIEPLAYER_H
+#define ULTIMA8_GFX_MOVIEPLAYER_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/pal_transforms.h b/engines/ultima/ultima8/gfx/pal_transforms.h
similarity index 95%
rename from engines/ultima/ultima8/graphics/pal_transforms.h
rename to engines/ultima/ultima8/gfx/pal_transforms.h
index 73af3f6ea75..0a2186c44f3 100644
--- a/engines/ultima/ultima8/graphics/pal_transforms.h
+++ b/engines/ultima/ultima8/gfx/pal_transforms.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_PAL_TRANSFORMS_H
-#define ULTIMA8_GRAPHICS_PAL_TRANSFORMS_H
+#ifndef ULTIMA8_GFX_PAL_TRANSFORMS_H
+#define ULTIMA8_GFX_PAL_TRANSFORMS_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/palette.cpp b/engines/ultima/ultima8/gfx/palette.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/palette.cpp
rename to engines/ultima/ultima8/gfx/palette.cpp
index 1e858f3c5fc..ddd9bf6f16d 100644
--- a/engines/ultima/ultima8/graphics/palette.cpp
+++ b/engines/ultima/ultima8/gfx/palette.cpp
@@ -20,7 +20,7 @@
*/
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/palette.h"
+#include "ultima/ultima8/gfx/palette.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/palette.h b/engines/ultima/ultima8/gfx/palette.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/palette.h
rename to engines/ultima/ultima8/gfx/palette.h
index 5085f5781ba..fea64f3f928 100644
--- a/engines/ultima/ultima8/graphics/palette.h
+++ b/engines/ultima/ultima8/gfx/palette.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_PALETTE_H
-#define ULTIMA8_GRAPHICS_PALETTE_H
+#ifndef ULTIMA8_GFX_PALETTE_H
+#define ULTIMA8_GFX_PALETTE_H
#include "graphics/palette.h"
-#include "ultima/ultima8/graphics/pal_transforms.h"
+#include "ultima/ultima8/gfx/pal_transforms.h"
namespace Common {
class ReadStream;
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/gfx/palette_fader_process.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/palette_fader_process.cpp
rename to engines/ultima/ultima8/gfx/palette_fader_process.cpp
index c9977db1661..ad171d2ecec 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/gfx/palette_fader_process.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "ultima/ultima8/graphics/palette_fader_process.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/gfx/palette_fader_process.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/palette_fader_process.h
rename to engines/ultima/ultima8/gfx/palette_fader_process.h
index da2bdef8163..d7ed95cbbda 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/gfx/palette_fader_process.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_PALETTEFADERPROCESS_H
-#define ULTIMA8_GRAPHICS_PALETTEFADERPROCESS_H
+#ifndef ULTIMA8_GFX_PALETTEFADERPROCESS_H
+#define ULTIMA8_GFX_PALETTEFADERPROCESS_H
#include "ultima/ultima8/kernel/process.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
diff --git a/engines/ultima/ultima8/graphics/palette_manager.cpp b/engines/ultima/ultima8/gfx/palette_manager.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/palette_manager.cpp
rename to engines/ultima/ultima8/gfx/palette_manager.cpp
index ea024b339da..269b698a676 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.cpp
+++ b/engines/ultima/ultima8/gfx/palette_manager.cpp
@@ -21,9 +21,9 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/palette_manager.h b/engines/ultima/ultima8/gfx/palette_manager.h
similarity index 96%
rename from engines/ultima/ultima8/graphics/palette_manager.h
rename to engines/ultima/ultima8/gfx/palette_manager.h
index 48827d70bbd..c749f1d1a05 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.h
+++ b/engines/ultima/ultima8/gfx/palette_manager.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_PALETTEMANAGER_H
-#define ULTIMA8_GRAPHICS_PALETTEMANAGER_H
+#ifndef ULTIMA8_GFX_PALETTEMANAGER_H
+#define ULTIMA8_GFX_PALETTEMANAGER_H
#include "ultima/shared/std/containers.h"
#include "graphics/pixelformat.h"
-#include "ultima/ultima8/graphics/pal_transforms.h"
+#include "ultima/ultima8/gfx/pal_transforms.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/raw_shape_frame.cpp b/engines/ultima/ultima8/gfx/raw_shape_frame.cpp
similarity index 99%
rename from engines/ultima/ultima8/graphics/raw_shape_frame.cpp
rename to engines/ultima/ultima8/gfx/raw_shape_frame.cpp
index f78890878b9..9b722b030f0 100644
--- a/engines/ultima/ultima8/graphics/raw_shape_frame.cpp
+++ b/engines/ultima/ultima8/gfx/raw_shape_frame.cpp
@@ -21,7 +21,7 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/raw_shape_frame.h"
+#include "ultima/ultima8/gfx/raw_shape_frame.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/misc/stream_util.h"
diff --git a/engines/ultima/ultima8/graphics/raw_shape_frame.h b/engines/ultima/ultima8/gfx/raw_shape_frame.h
similarity index 96%
rename from engines/ultima/ultima8/graphics/raw_shape_frame.h
rename to engines/ultima/ultima8/gfx/raw_shape_frame.h
index 78367e18374..13dd90b3d6c 100644
--- a/engines/ultima/ultima8/graphics/raw_shape_frame.h
+++ b/engines/ultima/ultima8/gfx/raw_shape_frame.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_RAW_SHAPEFRAME_H
-#define ULTIMA8_GRAPHICS_RAW_SHAPEFRAME_H
+#ifndef ULTIMA8_GFX_RAW_SHAPEFRAME_H
+#define ULTIMA8_GFX_RAW_SHAPEFRAME_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/render_surface.cpp b/engines/ultima/ultima8/gfx/render_surface.cpp
similarity index 99%
rename from engines/ultima/ultima8/graphics/render_surface.cpp
rename to engines/ultima/ultima8/gfx/render_surface.cpp
index 338582afa3e..98cc06ca953 100644
--- a/engines/ultima/ultima8/graphics/render_surface.cpp
+++ b/engines/ultima/ultima8/gfx/render_surface.cpp
@@ -19,11 +19,11 @@
*
*/
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "graphics/blit.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/render_surface.h b/engines/ultima/ultima8/gfx/render_surface.h
similarity index 98%
rename from engines/ultima/ultima8/graphics/render_surface.h
rename to engines/ultima/ultima8/gfx/render_surface.h
index b0f97ab8847..3844bdfcd03 100644
--- a/engines/ultima/ultima8/graphics/render_surface.h
+++ b/engines/ultima/ultima8/gfx/render_surface.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_RENDERSURFACE_H
-#define ULTIMA8_GRAPHICS_RENDERSURFACE_H
+#ifndef ULTIMA8_GFX_RENDERSURFACE_H
+#define ULTIMA8_GFX_RENDERSURFACE_H
#include "graphics/managed_surface.h"
#include "ultima/ultima8/misc/rect.h"
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/gfx/shape.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/shape.cpp
rename to engines/ultima/ultima8/gfx/shape.cpp
index 8b672494195..ae6f5e40c56 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/gfx/shape.cpp
@@ -21,9 +21,9 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/raw_shape_frame.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/raw_shape_frame.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/convert/crusader/convert_shape_crusader.h"
#include "ultima/ultima8/misc/stream_util.h"
diff --git a/engines/ultima/ultima8/graphics/shape.h b/engines/ultima/ultima8/gfx/shape.h
similarity index 97%
rename from engines/ultima/ultima8/graphics/shape.h
rename to engines/ultima/ultima8/gfx/shape.h
index 8c91d899d56..5cf97956996 100644
--- a/engines/ultima/ultima8/graphics/shape.h
+++ b/engines/ultima/ultima8/gfx/shape.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_SHAPE_H
-#define ULTIMA8_GRAPHICS_SHAPE_H
+#ifndef ULTIMA8_GFX_SHAPE_H
+#define ULTIMA8_GFX_SHAPE_H
#include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima8/graphics/shape_archive.cpp b/engines/ultima/ultima8/gfx/shape_archive.cpp
similarity index 95%
rename from engines/ultima/ultima8/graphics/shape_archive.cpp
rename to engines/ultima/ultima8/gfx/shape_archive.cpp
index 0fadb8d0054..c8a52fb5f77 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/shape_archive.cpp
@@ -21,8 +21,8 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
#include "ultima/ultima8/convert/convert_shape.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/gfx/shape_archive.h
similarity index 95%
rename from engines/ultima/ultima8/graphics/shape_archive.h
rename to engines/ultima/ultima8/gfx/shape_archive.h
index d75d69d5bd6..77eca18e7c6 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/gfx/shape_archive.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_SHAPEARCHIVE_H
-#define ULTIMA8_GRAPHICS_SHAPEARCHIVE_H
+#ifndef ULTIMA8_GFX_SHAPEARCHIVE_H
+#define ULTIMA8_GFX_SHAPEARCHIVE_H
#include "ultima/ultima8/filesys/archive.h"
diff --git a/engines/ultima/ultima8/graphics/shape_frame.cpp b/engines/ultima/ultima8/gfx/shape_frame.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/shape_frame.cpp
rename to engines/ultima/ultima8/gfx/shape_frame.cpp
index cf5628de046..752f06d05f3 100644
--- a/engines/ultima/ultima8/graphics/shape_frame.cpp
+++ b/engines/ultima/ultima8/gfx/shape_frame.cpp
@@ -21,8 +21,8 @@
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/raw_shape_frame.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/raw_shape_frame.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/shape_frame.h b/engines/ultima/ultima8/gfx/shape_frame.h
similarity index 96%
rename from engines/ultima/ultima8/graphics/shape_frame.h
rename to engines/ultima/ultima8/gfx/shape_frame.h
index 2bc4bbb5c56..98e189e7977 100644
--- a/engines/ultima/ultima8/graphics/shape_frame.h
+++ b/engines/ultima/ultima8/gfx/shape_frame.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_SHAPEFRAME_H
-#define ULTIMA8_GRAPHICS_SHAPEFRAME_H
+#ifndef ULTIMA8_GFX_SHAPEFRAME_H
+#define ULTIMA8_GFX_SHAPEFRAME_H
#include "graphics/surface.h"
diff --git a/engines/ultima/ultima8/graphics/shape_info.cpp b/engines/ultima/ultima8/gfx/shape_info.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/shape_info.cpp
rename to engines/ultima/ultima8/gfx/shape_info.cpp
index e4e9073cb67..bfbf583aa56 100644
--- a/engines/ultima/ultima8/graphics/shape_info.cpp
+++ b/engines/ultima/ultima8/gfx/shape_info.cpp
@@ -21,7 +21,7 @@
#include "ultima/ultima8/misc/common_types.h"
-#include "ultima/ultima8/graphics/shape_info.h"
+#include "ultima/ultima8/gfx/shape_info.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/shape_info.h b/engines/ultima/ultima8/gfx/shape_info.h
similarity index 98%
rename from engines/ultima/ultima8/graphics/shape_info.h
rename to engines/ultima/ultima8/gfx/shape_info.h
index 3aeba60bf01..bb7338f0d7b 100644
--- a/engines/ultima/ultima8/graphics/shape_info.h
+++ b/engines/ultima/ultima8/gfx/shape_info.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_SHAPEINFO_H
-#define ULTIMA8_GRAPHICS_SHAPEINFO_H
+#ifndef ULTIMA8_GFX_SHAPEINFO_H
+#define ULTIMA8_GFX_SHAPEINFO_H
#include "ultima/ultima8/world/weapon_info.h"
#include "ultima/ultima8/world/armour_info.h"
diff --git a/engines/ultima/ultima8/graphics/skf_player.cpp b/engines/ultima/ultima8/gfx/skf_player.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/skf_player.cpp
rename to engines/ultima/ultima8/gfx/skf_player.cpp
index ac7f521fb8e..42e8fe68968 100644
--- a/engines/ultima/ultima8/graphics/skf_player.cpp
+++ b/engines/ultima/ultima8/gfx/skf_player.cpp
@@ -22,18 +22,18 @@
#include "ultima/ultima.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/skf_player.h"
+#include "ultima/ultima8/gfx/skf_player.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
#include "ultima/ultima8/filesys/raw_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/raw_audio_sample.h"
-#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/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
#include "common/config-manager.h"
#include "common/system.h"
diff --git a/engines/ultima/ultima8/graphics/skf_player.h b/engines/ultima/ultima8/gfx/skf_player.h
similarity index 91%
rename from engines/ultima/ultima8/graphics/skf_player.h
rename to engines/ultima/ultima8/gfx/skf_player.h
index f4fd6a551e3..eb3f5c4c369 100644
--- a/engines/ultima/ultima8/graphics/skf_player.h
+++ b/engines/ultima/ultima8/gfx/skf_player.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_SKFPLAYER_H
-#define ULTIMA8_GRAPHICS_SKFPLAYER_H
+#ifndef ULTIMA8_GFX_SKFPLAYER_H
+#define ULTIMA8_GFX_SKFPLAYER_H
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/graphics/movie_player.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/movie_player.h"
+#include "ultima/ultima8/gfx/render_surface.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/texture.h b/engines/ultima/ultima8/gfx/texture.h
similarity index 96%
rename from engines/ultima/ultima8/graphics/texture.h
rename to engines/ultima/ultima8/gfx/texture.h
index e88d717eda6..c8bbae4af0e 100644
--- a/engines/ultima/ultima8/graphics/texture.h
+++ b/engines/ultima/ultima8/gfx/texture.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_TEXTURE_H
-#define ULTIMA8_GRAPHICS_TEXTURE_H
+#ifndef ULTIMA8_GFX_TEXTURE_H
+#define ULTIMA8_GFX_TEXTURE_H
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/gfx/type_flags.cpp
similarity index 98%
rename from engines/ultima/ultima8/graphics/type_flags.cpp
rename to engines/ultima/ultima8/gfx/type_flags.cpp
index e9dea92593b..ad68d09fe9f 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/gfx/type_flags.cpp
@@ -21,12 +21,12 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/type_flags.h"
+#include "ultima/ultima8/gfx/type_flags.h"
#include "ultima/ultima8/conf/config_file_manager.h"
#include "ultima/ultima8/ultima8.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/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
#include "ultima/ultima8/games/treasure_loader.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/type_flags.h b/engines/ultima/ultima8/gfx/type_flags.h
similarity index 91%
rename from engines/ultima/ultima8/graphics/type_flags.h
rename to engines/ultima/ultima8/gfx/type_flags.h
index 5ab03b7b113..a24ac8c50bd 100644
--- a/engines/ultima/ultima8/graphics/type_flags.h
+++ b/engines/ultima/ultima8/gfx/type_flags.h
@@ -19,11 +19,11 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_TYPEFLAGS_H
-#define ULTIMA8_GRAPHICS_TYPEFLAGS_H
+#ifndef ULTIMA8_GFX_TYPEFLAGS_H
+#define ULTIMA8_GFX_TYPEFLAGS_H
#include "ultima/shared/std/containers.h"
-#include "ultima/ultima8/graphics/shape_info.h"
+#include "ultima/ultima8/gfx/shape_info.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
similarity index 96%
rename from engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
rename to engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
index fc873c12e51..e04a4b3ce56 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
+++ b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
@@ -21,12 +21,12 @@
#include "ultima/ultima8/misc/debugger.h"
-#include "ultima/ultima8/graphics/wpn_ovlay_dat.h"
+#include "ultima/ultima8/gfx/wpn_ovlay_dat.h"
#include "ultima/ultima8/world/actors/weapon_overlay.h"
#include "ultima/ultima8/filesys/raw_archive.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
#include "ultima/ultima8/world/actors/anim_action.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
similarity index 94%
rename from engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
rename to engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
index b2765ecb6f6..5a146edc54b 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.h
+++ b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_WPNOVLAYDAT_H
-#define ULTIMA8_GRAPHICS_WPNOVLAYDAT_H
+#ifndef ULTIMA8_GFX_WPNOVLAYDAT_H
+#define ULTIMA8_GFX_WPNOVLAYDAT_H
#include "ultima/ultima8/misc/direction.h"
diff --git a/engines/ultima/ultima8/graphics/xform_blend.cpp b/engines/ultima/ultima8/gfx/xform_blend.cpp
similarity index 97%
rename from engines/ultima/ultima8/graphics/xform_blend.cpp
rename to engines/ultima/ultima8/gfx/xform_blend.cpp
index b0ce0de54dd..7449fa3965f 100644
--- a/engines/ultima/ultima8/graphics/xform_blend.cpp
+++ b/engines/ultima/ultima8/gfx/xform_blend.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/ultima8/graphics/xform_blend.h"
+#include "ultima/ultima8/gfx/xform_blend.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/graphics/xform_blend.h b/engines/ultima/ultima8/gfx/xform_blend.h
similarity index 93%
rename from engines/ultima/ultima8/graphics/xform_blend.h
rename to engines/ultima/ultima8/gfx/xform_blend.h
index 955a16bcf18..391c323fc5d 100644
--- a/engines/ultima/ultima8/graphics/xform_blend.h
+++ b/engines/ultima/ultima8/gfx/xform_blend.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef ULTIMA8_GRAPHICS_XFORMBLEND_H
-#define ULTIMA8_GRAPHICS_XFORMBLEND_H
+#ifndef ULTIMA8_GFX_XFORMBLEND_H
+#define ULTIMA8_GFX_XFORMBLEND_H
#include "common/scummsys.h"
diff --git a/engines/ultima/ultima8/gumps/book_gump.cpp b/engines/ultima/ultima8/gumps/book_gump.cpp
index 88fd5f04701..1840f48e1df 100644
--- a/engines/ultima/ultima8/gumps/book_gump.cpp
+++ b/engines/ultima/ultima8/gumps/book_gump.cpp
@@ -23,7 +23,7 @@
#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/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.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 4e4a6ddb5a5..cce6d0d410f 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/computer_gump.cpp
@@ -25,13 +25,13 @@
#include "ultima/ultima8/gumps/computer_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/audio/audio_process.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/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
#include "ultima/ultima8/usecode/uc_machine.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/computer_gump.h b/engines/ultima/ultima8/gumps/computer_gump.h
index 90d8fc53975..3129a172b4d 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.h
+++ b/engines/ultima/ultima8/gumps/computer_gump.h
@@ -23,7 +23,7 @@
#define ULTIMA8_GUMPS_COMPUTERGUMP_H
#include "ultima/ultima8/gumps/modal_gump.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index 616ab8d32b6..8b162d0083e 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -22,14 +22,14 @@
#include "ultima/ultima.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/render_surface.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.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 61980da2a06..15ed566f5d9 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -26,11 +26,11 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "ultima/ultima8/audio/music_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_credits_gump.cpp b/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
index 5af5845db34..c04aa86ee66 100644
--- a/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_credits_gump.cpp
@@ -26,13 +26,13 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/fonts/shape_font.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/shape_font.h"
#include "ultima/ultima8/audio/music_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_demo_gump.cpp b/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
index e0d4cc7166c..d9a147f45f0 100644
--- a/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_demo_gump.cpp
@@ -26,8 +26,8 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/audio/music_process.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
index 7ae18d1bf59..c8d08b1eb78 100644
--- a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
@@ -22,10 +22,10 @@
#include "ultima/ultima8/gumps/cru_energy_gump.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/world/get_object.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/cru_health_gump.cpp b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
index f35690ae1d1..d8f51634b6d 100644
--- a/engines/ultima/ultima8/gumps/cru_health_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
@@ -22,10 +22,10 @@
#include "ultima/ultima8/gumps/cru_health_gump.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.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 6f3d719669e..bb43269604c 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -22,8 +22,8 @@
#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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
diff --git a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
index 73ad115a604..3851e16117e 100644
--- a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
@@ -21,9 +21,9 @@
#include "ultima/ultima8/gumps/cru_menu_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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
@@ -32,7 +32,7 @@
#include "ultima/ultima8/games/cru_game.h"
#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/metaengine.h"
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
index 249b655babe..bbc9d6de2ef 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
@@ -24,9 +24,9 @@
#include "ultima/ultima8/gumps/translucent_gump.h"
#include "ultima/ultima8/kernel/kernel.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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
diff --git a/engines/ultima/ultima8/gumps/cru_status_gump.cpp b/engines/ultima/ultima8/gumps/cru_status_gump.cpp
index f0f12aca02e..a2fa4b6be31 100644
--- a/engines/ultima/ultima8/gumps/cru_status_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_status_gump.cpp
@@ -27,9 +27,9 @@
#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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.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 8d1ad35c01e..181cb67acaf 100644
--- a/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
@@ -22,8 +22,8 @@
#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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.cpp b/engines/ultima/ultima8/gumps/desktop_gump.cpp
index 8de705a5951..421022ff531 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.cpp
+++ b/engines/ultima/ultima8/gumps/desktop_gump.cpp
@@ -20,8 +20,8 @@
*/
#include "ultima/ultima8/gumps/desktop_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/target_gump.h"
diff --git a/engines/ultima/ultima8/gumps/difficulty_gump.cpp b/engines/ultima/ultima8/gumps/difficulty_gump.cpp
index 349b73aa2c6..f9cb0317adc 100644
--- a/engines/ultima/ultima8/gumps/difficulty_gump.cpp
+++ b/engines/ultima/ultima8/gumps/difficulty_gump.cpp
@@ -20,16 +20,16 @@
*/
#include "ultima/ultima8/gumps/difficulty_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/world.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp b/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
index d3763ee9dc0..692ccdd9443 100644
--- a/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
+++ b/engines/ultima/ultima8/gumps/fast_area_vis_gump.cpp
@@ -24,8 +24,8 @@
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index 9bc88aa57ca..7175fad2913 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -20,10 +20,10 @@
*/
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape_archive.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index ce05c405c6f..e3e53461419 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -24,7 +24,7 @@
#include "ultima/ultima8/kernel/object.h"
#include "ultima/ultima8/misc/rect.h"
-#include "ultima/ultima8/graphics/frame_id.h"
+#include "ultima/ultima8/gfx/frame_id.h"
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/classtype.h"
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.cpp b/engines/ultima/ultima8/gumps/inverter_gump.cpp
index 2902416d26f..d03c50ba0dc 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.cpp
+++ b/engines/ultima/ultima8/gumps/inverter_gump.cpp
@@ -21,7 +21,7 @@
#include "ultima/ultima8/gumps/inverter_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/keypad_gump.cpp b/engines/ultima/ultima8/gumps/keypad_gump.cpp
index 2f51d64a71e..b9f6dd760d8 100644
--- a/engines/ultima/ultima8/gumps/keypad_gump.cpp
+++ b/engines/ultima/ultima8/gumps/keypad_gump.cpp
@@ -24,7 +24,7 @@
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/gumps/keypad_gump.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index 68c52785681..14abb601617 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -24,9 +24,9 @@
#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/gumps/cru_menu_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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
@@ -34,7 +34,7 @@
#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/palette_manager.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/gumps/widgets/edit_widget.h"
#include "ultima/ultima8/gumps/u8_save_gump.h"
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index 9144113546e..af5fd9b3805 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -23,10 +23,10 @@
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/gumps/gump_notify_process.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.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 b399d92cd55..22879c085d8 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -28,7 +28,7 @@
#include "ultima/shared/std/string.h"
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/classtype.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/texture.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
index a69810d49c9..9fa907d06ae 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
@@ -22,12 +22,12 @@
#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/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 76f9b2f4f0b..d6c638b7e06 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -24,10 +24,10 @@
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/kernel/mouse.h"
diff --git a/engines/ultima/ultima8/gumps/movie_gump.cpp b/engines/ultima/ultima8/gumps/movie_gump.cpp
index 419daae75d9..6d3d68786c1 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.cpp
+++ b/engines/ultima/ultima8/gumps/movie_gump.cpp
@@ -23,15 +23,15 @@
#include "ultima/ultima8/gumps/movie_gump.h"
-#include "ultima/ultima8/graphics/avi_player.h"
-#include "ultima/ultima8/graphics/skf_player.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/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/graphics/texture.h"
-#include "ultima/ultima8/graphics/fade_to_modal_process.h"
+#include "ultima/ultima8/gfx/avi_player.h"
+#include "ultima/ultima8/gfx/skf_player.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
+#include "ultima/ultima8/gfx/texture.h"
+#include "ultima/ultima8/gfx/fade_to_modal_process.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/games/game.h"
diff --git a/engines/ultima/ultima8/gumps/paged_gump.cpp b/engines/ultima/ultima8/gumps/paged_gump.cpp
index c89ce78b687..688a0813250 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paged_gump.cpp
@@ -23,7 +23,7 @@
#include "ultima/ultima8/gumps/paged_gump.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
#include "ultima/ultima8/kernel/mouse.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 b4f6af3d8fe..e2b26c6ce07 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -20,15 +20,15 @@
*/
#include "ultima/ultima8/gumps/paperdoll_gump.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/world/actors/actor.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#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/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.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 4923dbcd131..34dc2d876f2 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.cpp
+++ b/engines/ultima/ultima8/gumps/quit_gump.cpp
@@ -22,9 +22,9 @@
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/gumps/quit_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/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/gumps/readable_gump.cpp b/engines/ultima/ultima8/gumps/readable_gump.cpp
index 0789edba315..a22488fae60 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/readable_gump.cpp
@@ -22,7 +22,7 @@
#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/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.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/scroll_gump.cpp b/engines/ultima/ultima8/gumps/scroll_gump.cpp
index 0b6a56af6b2..bea4e4216be 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/scroll_gump.cpp
@@ -23,7 +23,7 @@
#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/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.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 05cf3cd8cb4..959434d0f42 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -23,27 +23,27 @@
#include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/shape_info.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/shape_info.h"
-#include "ultima/ultima8/graphics/fonts/rendered_text.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "ultima/ultima8/games/game_data.h"
-#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/graphics/mouse_shape_archive.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/fonts/font_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/mouse_shape_archive.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
#include "ultima/ultima8/usecode/usecode.h"
#include "ultima/ultima8/metaengine.h"
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index b5964502cab..f62c143b3a8 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -21,11 +21,11 @@
#include "ultima/ultima8/gumps/slider_gump.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
#include "ultima/ultima8/gumps/widgets/sliding_widget.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/gfx/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
#include "ultima/ultima8/usecode/uc_process.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/gumps/translucent_gump.cpp b/engines/ultima/ultima8/gumps/translucent_gump.cpp
index 84efbec5144..0a659bb19fa 100644
--- a/engines/ultima/ultima8/gumps/translucent_gump.cpp
+++ b/engines/ultima/ultima8/gumps/translucent_gump.cpp
@@ -20,7 +20,7 @@
*/
#include "ultima/ultima8/gumps/translucent_gump.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 5f410c5515a..f7a81321e38 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -25,8 +25,8 @@
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.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_gump.cpp b/engines/ultima/ultima8/gumps/weasel_gump.cpp
index 3e21729310d..7976a9ad655 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_gump.cpp
@@ -22,10 +22,10 @@
#include "ultima/ultima8/gumps/weasel_gump.h"
#include "ultima/ultima8/gumps/weasel_dat.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/gump_shape_archive.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/gumps/widgets/button_widget.h"
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
index d25b044efdd..568f498e756 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
@@ -22,8 +22,8 @@
#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_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
+#include "ultima/ultima8/gfx/shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index 6a1a24dfa59..582da083e54 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -24,7 +24,7 @@
#include "ultima/shared/std/string.h"
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/graphics/frame_id.h"
+#include "ultima/ultima8/gfx/frame_id.h"
#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index c04d7b97d6f..b802e30dfd7 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/gumps/widgets/edit_widget.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/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
#include "common/system.h"
#include "common/events.h"
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.h b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
index 0a1e569aed8..d48b4413e54 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
@@ -28,7 +28,7 @@
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index 2dbf945ff9f..91bbada1bbc 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -20,9 +20,9 @@
*/
#include "ultima/ultima8/gumps/widgets/text_widget.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/gfx/fonts/rendered_text.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.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/gumps/widgets/text_widget.h b/engines/ultima/ultima8/gumps/widgets/text_widget.h
index f4b479d54a5..57594f6101f 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.h
@@ -27,7 +27,7 @@
//
#include "ultima/ultima8/gumps/gump.h"
-#include "ultima/ultima8/graphics/fonts/font.h"
+#include "ultima/ultima8/gfx/fonts/font.h"
#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 08fbccc0ae9..96720a5e5b3 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -24,16 +24,16 @@
#include "ultima/ultima.h"
#include "ultima/ultima8/kernel/mouse.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/world/actors/avatar_mover_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/palette.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/palette.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index c3fc1e09833..7c052a7914c 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -28,10 +28,10 @@
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/inverter_process.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/inverter_process.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/gumps/fast_area_vis_gump.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/gumps/minimap_gump.h"
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index ce36db7f07a..b5f1d226b10 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -33,8 +33,8 @@
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/games/start_u8_process.h"
#include "ultima/ultima8/games/start_crusader_process.h"
-#include "ultima/ultima8/graphics/fonts/font_manager.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/fonts/font_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/get_object.h"
@@ -58,7 +58,7 @@
#include "ultima/ultima8/usecode/remorse_intrinsics.h"
#include "ultima/ultima8/usecode/regret_intrinsics.h"
-#include "ultima/ultima8/graphics/cycle_process.h"
+#include "ultima/ultima8/gfx/cycle_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
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index f8756bbf000..3062b85b117 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -31,7 +31,7 @@
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/games/game_info.h"
-#include "ultima/ultima8/graphics/render_surface.h"
+#include "ultima/ultima8/gfx/render_surface.h"
#include "ultima/detection.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/usecode/u8_intrinsics.h b/engines/ultima/ultima8/usecode/u8_intrinsics.h
index 487687b4705..f0c6ac0ec71 100644
--- a/engines/ultima/ultima8/usecode/u8_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/u8_intrinsics.h
@@ -35,7 +35,7 @@
#include "ultima/ultima8/world/egg.h"
#include "ultima/ultima8/world/monster_egg.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/graphics/palette_fader_process.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
#include "ultima/ultima8/world/sprite_process.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/gumps/scroll_gump.h"
@@ -45,7 +45,7 @@
#include "ultima/ultima8/world/actors/grant_peace_process.h"
#include "ultima/ultima8/world/fireball_process.h"
#include "ultima/ultima8/world/actors/heal_process.h"
-#include "ultima/ultima8/graphics/inverter_process.h"
+#include "ultima/ultima8/gfx/inverter_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/games/game.h"
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 936cee2086f..2a8d4170c74 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -30,9 +30,9 @@
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/world/fire_type.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/shape.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.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"
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 85b8333c0da..f7169701f6b 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -35,7 +35,7 @@
#include "ultima/ultima8/world/actors/combat_process.h"
#include "ultima/ultima8/world/actors/auto_firer_process.h"
#include "ultima/ultima8/world/sprite_process.h"
-#include "ultima/ultima8/graphics/palette_fader_process.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
#include "ultima/ultima8/world/create_item_process.h"
#include "ultima/ultima8/world/destroy_item_process.h"
#include "ultima/ultima8/kernel/delay_process.h"
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index 63d8a45316f..eff0749c686 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -25,8 +25,8 @@
#include "ultima/ultima8/world/actors/actor.h"
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
#include "ultima/ultima8/world/actors/anim_action.h"
#include "ultima/ultima8/misc/direction_util.h"
#include "ultima/ultima8/usecode/uc_list.h"
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
index 47ad2e0110b..0656f162dd8 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.cpp
@@ -29,7 +29,7 @@
#include "ultima/ultima8/kernel/delay_process.h"
#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/gfx/palette_manager.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/get_object.h"
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
index 7b886554ad2..b5a3e9e81ba 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.cpp
@@ -23,7 +23,7 @@
#include "ultima/ultima8/world/world.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/gumps/target_gump.h"
-#include "ultima/ultima8/graphics/palette_fader_process.h"
+#include "ultima/ultima8/gfx/palette_fader_process.h"
#include "ultima/ultima8/usecode/uc_list.h"
#include "ultima/ultima8/world/loop_script.h"
#include "ultima/ultima8/kernel/kernel.h"
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index 84cbd7d2049..28fcce91720 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -27,14 +27,14 @@
#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/graphics/shape_info.h"
+#include "ultima/ultima8/gfx/shape_info.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/games/game_data.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
-#include "ultima/ultima8/graphics/wpn_ovlay_dat.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
+#include "ultima/ultima8/gfx/wpn_ovlay_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
#include "ultima/ultima8/gumps/cru_pickup_area_gump.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/world.h"
diff --git a/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp b/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
index 811e8d08e91..db65f2b65a5 100644
--- a/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
@@ -28,8 +28,8 @@
#include "ultima/ultima8/world/actors/pathfinder.h"
#include "ultima/ultima8/world/actors/anim_action.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/anim_dat.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/anim_dat.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/usecode/uc_list.h"
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index 570de821981..5a25d83bf56 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -33,7 +33,7 @@
#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/gfx/main_shape_archive.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/misc/box.h"
#include "ultima/ultima8/misc/direction_util.h"
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 87f1b29fafa..4302d99e0b3 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -29,10 +29,10 @@
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/kernel/delay_process.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/graphics/main_shape_archive.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/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/gump_shape_archive.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/coord_utils.h"
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index 652322d1777..6940f89ccd0 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -23,7 +23,7 @@
#define ULTIMA8_WORLD_ITEM_H
#include "ultima/ultima8/kernel/object.h"
-#include "ultima/ultima8/graphics/shape_info.h"
+#include "ultima/ultima8/gfx/shape_info.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/box.h"
diff --git a/engines/ultima/ultima8/world/item_factory.cpp b/engines/ultima/ultima8/world/item_factory.cpp
index e033bcb7978..80e8d4a332d 100644
--- a/engines/ultima/ultima8/world/item_factory.cpp
+++ b/engines/ultima/ultima8/world/item_factory.cpp
@@ -23,7 +23,7 @@
#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/gfx/main_shape_archive.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/world/glob_egg.h"
#include "ultima/ultima8/world/monster_egg.h"
diff --git a/engines/ultima/ultima8/world/item_sorter.cpp b/engines/ultima/ultima8/world/item_sorter.cpp
index 449a6c1a4f1..0d9681345cd 100644
--- a/engines/ultima/ultima8/world/item_sorter.cpp
+++ b/engines/ultima/ultima8/world/item_sorter.cpp
@@ -23,11 +23,11 @@
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/world/item_sorter.h"
#include "ultima/ultima8/world/item.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/texture.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/texture.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index c5e021b5c40..d5b5b7e9c57 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -28,7 +28,7 @@
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/ultima8.h"
#include "ultima/ultima8/games/game_data.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/minimap.cpp b/engines/ultima/ultima8/world/minimap.cpp
index 5c1d1673793..5a5c3fd57d3 100644
--- a/engines/ultima/ultima8/world/minimap.cpp
+++ b/engines/ultima/ultima8/world/minimap.cpp
@@ -25,11 +25,11 @@
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/graphics/render_surface.h"
-#include "ultima/ultima8/graphics/shape.h"
-#include "ultima/ultima8/graphics/shape_frame.h"
-#include "ultima/ultima8/graphics/palette.h"
-#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/gfx/render_surface.h"
+#include "ultima/ultima8/gfx/shape.h"
+#include "ultima/ultima8/gfx/shape_frame.h"
+#include "ultima/ultima8/gfx/palette.h"
+#include "ultima/ultima8/gfx/palette_manager.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index 1625a40f6ba..e1085be12f0 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -40,7 +40,7 @@
#include "ultima/ultima8/world/target_reticle_process.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/snap_process.h"
-#include "ultima/ultima8/graphics/main_shape_archive.h"
+#include "ultima/ultima8/gfx/main_shape_archive.h"
namespace Ultima {
namespace Ultima8 {
More information about the Scummvm-git-logs
mailing list