libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 02:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA6: Move widget classes from core/ to new gui/widgets/

Browse Source
This commit is contained in:
Paul Gilbert 2020-01-05 10:14:14 -08:00 committed by Paul Gilbert
parent 591ba86b79
commit cdef0e4773
94 changed files with 162 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/ultima/module.mk
View File

@ -22,14 +22,8 @@ MODULE_OBJS += \
ultima6/conf/xml_node.o \
ultima6/conf/xml_tree.o \
ultima6/core/anim_manager.o \
ultima6/core/background.o \
ultima6/core/book.o \
ultima6/core/command_bar.o \
ultima6/core/command_bar_mew_ui.o \
ultima6/core/console.o \
ultima6/core/converse.o \
ultima6/core/converse_gump.o \
ultima6/core/converse_gump_wou.o \
ultima6/core/converse_interpret.o \
ultima6/core/converse_speech.o \
ultima6/core/cursor.o \
@ -38,15 +32,11 @@ MODULE_OBJS += \
ultima6/core/effect_manager.o \
ultima6/core/egg_manager.o \
ultima6/core/events.o \
ultima6/core/fps_counter.o \
ultima6/core/game.o \
ultima6/core/game_clock.o \
ultima6/core/look.o \
ultima6/core/magic.o \
ultima6/core/map.o \
ultima6/core/map_window.o \
ultima6/core/msg_scroll.o \
ultima6/core/msg_scroll_new_ui.o \
ultima6/core/nuvie_defs.o \
ultima6/core/obj.o \
ultima6/core/obj_manager.o \
@ -84,8 +74,18 @@ MODULE_OBJS += \
ultima6/gui/gui_text.o \
ultima6/gui/gui_text_input.o \
ultima6/gui/gui_text_toggle_button.o \
ultima6/gui/gui_widget.o \
ultima6/gui/gui_yes_no_dialog.o \
ultima6/gui/widgets/gui_widget.o \
ultima6/gui/widgets/background.o \
ultima6/gui/widgets/command_bar.o \
ultima6/gui/widgets/command_bar_new_ui.o \
ultima6/gui/widgets/console.o \
ultima6/gui/widgets/msg_scroll.o \
ultima6/gui/widgets/msg_scroll_new_ui.o \
ultima6/gui/widgets/converse_gump.o \
ultima6/gui/widgets/converse_gump_wou.o \
ultima6/gui/widgets/fps_counter.o \
ultima6/gui/widgets/map_window.o \
ultima6/keybinding/keys.o \
ultima6/keybinding/key_actions.o \
ultima6/menus/audio_dialog.o \

2
engines/ultima/ultima6/actors/actor.cpp
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/misc/u6_llist.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/views/view_manager.h"

2
engines/ultima/ultima6/actors/actor_manager.cpp
View File

@ -41,7 +41,7 @@
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/u6_objects.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/views/view_manager.h"
namespace Ultima {

2
engines/ultima/ultima6/actors/u6_actor.cpp
View File

@ -30,7 +30,7 @@
#include "ultima/ultima6/usecode/u6_usecode.h"
#include "ultima/ultima6/pathfinder/sched_path_finder.h"
#include "ultima/ultima6/pathfinder/u6_astar_path.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/actors/u6_actor.h"
#include "ultima/ultima6/core/party.h"

2
engines/ultima/ultima6/core/anim_manager.cpp
View File

@ -29,7 +29,7 @@
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/screen/screen.h"
#include "ultima/ultima6/script/script.h"

2
engines/ultima/ultima6/core/anim_manager.h
View File

@ -27,7 +27,7 @@
//#include <cassert>
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/timed_event.h"
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/misc/map_entity.h"

6
engines/ultima/ultima6/core/converse.cpp
View File

@ -31,13 +31,13 @@
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/converse_interpret.h"
#include "ultima/ultima6/core/converse_speech.h"
#include "ultima/ultima6/core/converse_gump.h"
#include "ultima/ultima6/gui/widgets/converse_gump.h"
#include "ultima/ultima6/core/converse.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/background.h"
namespace Ultima {
namespace Ultima6 {

2
engines/ultima/ultima6/core/converse.h
View File

@ -29,7 +29,7 @@
#include "ultima/shared/std/containers.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/files/u6_lib_n.h"
#include "ultima/ultima6/views/view.h"

2
engines/ultima/ultima6/core/converse_interpret.cpp
View File

@ -31,7 +31,7 @@
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/effect.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/converse_interpret.h"

4
engines/ultima/ultima6/core/effect.cpp
View File

@ -29,12 +29,12 @@
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/anim_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/tile_manager.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/effect_manager.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/core/u6_objects.h"

8
engines/ultima/ultima6/core/events.cpp
View File

@ -25,8 +25,8 @@
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/converse.h"
@ -39,7 +39,7 @@
#include "ultima/ultima6/views/inventory_view.h"
#include "ultima/ultima6/views/party_view.h"
#include "ultima/ultima6/views/actor_view.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/u6_objects.h"
#include "ultima/ultima6/core/effect.h"
@ -51,7 +51,7 @@
#include "ultima/ultima6/views/inventory_widget.h"
#include "ultima/ultima6/keybinding/keys.h"
#include "ultima/ultima6/views/spell_view.h"
#include "ultima/ultima6/core/fps_counter.h"
#include "ultima/ultima6/gui/widgets/fps_counter.h"
#include "ultima/ultima6/script/script.h"
#include "common/system.h"

18
engines/ultima/ultima6/core/game.cpp
View File

@ -24,7 +24,7 @@
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/screen/dither.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/actors/actor.h"
@ -38,22 +38,22 @@
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/converse.h"
#include "ultima/ultima6/core/converse_gump.h"
#include "ultima/ultima6/core/converse_gump_wou.h"
#include "ultima/ultima6/gui/widgets/converse_gump.h"
#include "ultima/ultima6/gui/widgets/converse_gump_wou.h"
#include "ultima/ultima6/fonts/font_manager.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/effect_manager.h"
#include "ultima/ultima6/core/magic.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/core/msg_scroll_new_ui.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll_new_ui.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/core/command_bar_new_ui.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar_new_ui.h"
#include "ultima/ultima6/views/party_view.h"
#include "ultima/ultima6/views/actor_view.h"
#include "ultima/ultima6/usecode/usecode.h"

4
engines/ultima/ultima6/core/magic.cpp
View File

@ -27,7 +27,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
@ -35,7 +35,7 @@
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/gui/gui_yes_no_dialog.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/core/obj_manager.h"

2
engines/ultima/ultima6/core/map.cpp
View File

@ -30,7 +30,7 @@
#include "ultima/ultima6/core/tile_manager.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/misc/u6_misc.h"

4
engines/ultima/ultima6/core/obj_manager.cpp
View File

@ -32,9 +32,9 @@
#include "ultima/ultima6/misc/u6_llist.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
namespace Ultima {
namespace Ultima6 {

4
engines/ultima/ultima6/core/party.cpp
View File

@ -32,9 +32,9 @@
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/usecode/u6_usecode.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/pathfinder/party_path_finder.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/views/view.h"

4
engines/ultima/ultima6/core/player.cpp
View File

@ -27,9 +27,9 @@
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/save/obj_list.h"
#include "ultima/ultima6/core/u6_objects.h"

2
engines/ultima/ultima6/core/tile_manager.cpp
View File

@ -22,7 +22,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/nuvie_bmp_file.h"
#include "ultima/ultima6/files/u6_lib_n.h"

6
engines/ultima/ultima6/core/timed_event.cpp
View File

@ -23,7 +23,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/events.h"
@ -31,9 +31,9 @@
#include "ultima/ultima6/core/u6_objects.h"
#include "ultima/ultima6/actors/u6_work_types.h"
#include "ultima/ultima6/misc/u6_llist.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/views/party_view.h"
#include "ultima/ultima6/actors/actor_manager.h"

2
engines/ultima/ultima6/core/weather.cpp
View File

@ -36,7 +36,7 @@
#include "ultima/ultima6/save/obj_list.h"
#include "ultima/ultima6/core/timed_event.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/script/script.h"

2
engines/ultima/ultima6/files/nuvie_file_list.cpp
View File

@ -22,7 +22,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/shared/std/string.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/files/nuvie_file_list.h"
#include "common/fs.h"

2
engines/ultima/ultima6/gui/gui.h
View File

@ -27,7 +27,7 @@
#include "ultima/ultima6/gui/gui_status.h"
#include "ultima/ultima6/gui/gui_drag_manager.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_font.h"
#include "common/events.h"

2
engines/ultima/ultima6/gui/gui_area.h
View File

@ -25,7 +25,7 @@
#ifndef ULTIMA6_GUI_GUI_AREA_H
#define ULTIMA6_GUI_GUI_AREA_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/screen/screen.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_button.h
View File

@ -25,7 +25,7 @@
#ifndef ULTIMA6_GUI_GUI_BUTTON_H
#define ULTIMA6_GUI_GUI_BUTTON_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_font.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_console.cpp
View File

@ -26,7 +26,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_console.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_console.h
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_types.h"
#include "ultima/ultima6/gui/gui_font.h"
#include "ultima/ultima6/screen/screen.h"

2
engines/ultima/ultima6/gui/gui_dialog.h
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/screen/screen.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_drag_manager.cpp
View File

@ -29,7 +29,7 @@
#include "ultima/ultima6/core/game.h" // -+- Included so we can set WAIT_MODE while dragging.
#include "ultima/ultima6/core/events.h" // /
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
namespace Ultima {
namespace Ultima6 {

2
engines/ultima/ultima6/gui/gui_scroll_bar.h
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/screen/screen.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_scroller.cpp
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_scroll_bar.h"
#include "ultima/ultima6/gui/gui_scroller.h"

2
engines/ultima/ultima6/gui/gui_scroller.h
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/screen/screen.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_text.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_GUI_GUI_TEXT_H
#define ULTIMA6_GUI_GUI_TEXT_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
namespace Ultima {
namespace Ultima6 {

4
engines/ultima/ultima6/core/background.cpp → engines/ultima/ultima6/gui/widgets/background.cpp
View File

@ -28,8 +28,8 @@
#include "ultima/ultima6/files/u6_lib_n.h"
#include "ultima/ultima6/files/u6_bmp.h"
#include "ultima/ultima6/screen/dither.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/gui.h"
namespace Ultima {

2
engines/ultima/ultima6/core/background.h → engines/ultima/ultima6/gui/widgets/background.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_CORE_BACKGROUND_H
#define ULTIMA6_CORE_BACKGROUND_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
namespace Ultima {
namespace Ultima6 {

4
engines/ultima/ultima6/core/command_bar.cpp → engines/ultima/ultima6/gui/widgets/command_bar.cpp
View File

@ -35,14 +35,14 @@
#include "ultima/ultima6/fonts/font_manager.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/save/obj_list.h"
#include "ultima/ultima6/files/nuvie_io.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/ultima6.h"

2
engines/ultima/ultima6/core/command_bar.h → engines/ultima/ultima6/gui/widgets/command_bar.h
View File

@ -24,7 +24,7 @@
#define ULTIMA6_CORE_COMMAND_BAR_H
#include "ultima/shared/std/string.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/misc/call_back.h"
namespace Ultima {

4
engines/ultima/ultima6/core/command_bar_mew_ui.cpp → engines/ultima/ultima6/gui/widgets/command_bar_new_ui.cpp
View File

@ -32,13 +32,13 @@
#include "ultima/ultima6/fonts/font_manager.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/core/command_bar_new_ui.h"
#include "ultima/ultima6/gui/widgets/command_bar_new_ui.h"
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/save/obj_list.h"
#include "ultima/ultima6/files/nuvie_io.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/keybinding/keys.h"
#include "common/events.h"

4
engines/ultima/ultima6/core/command_bar_new_ui.h → engines/ultima/ultima6/gui/widgets/command_bar_new_ui.h
View File

@ -24,9 +24,9 @@
#define ULTIMA6_CORE_COMMAND_BAR_NEW_UI_H
#include "ultima/shared/std/string.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
namespace Ultima {
namespace Ultima6 {

2
engines/ultima/ultima6/core/console.cpp → engines/ultima/ultima6/gui/widgets/console.cpp
View File

@ -26,7 +26,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
namespace Ultima {
namespace Ultima6 {

0
engines/ultima/ultima6/core/console.h → engines/ultima/ultima6/gui/widgets/console.h
View File

4
engines/ultima/ultima6/core/converse_gump.cpp → engines/ultima/ultima6/gui/widgets/converse_gump.cpp
View File

@ -28,10 +28,10 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/converse_gump.h"
#include "ultima/ultima6/gui/widgets/converse_gump.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/keybinding/keys.h"

2
engines/ultima/ultima6/core/converse_gump.h → engines/ultima/ultima6/gui/widgets/converse_gump.h
View File

@ -24,7 +24,7 @@
#define ULTIMA6_CORE_CONVERSE_GUMP_H
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
//#include <stdarg.h>
//#include <list>

8
engines/ultima/ultima6/core/converse_gump_wou.cpp → engines/ultima/ultima6/gui/widgets/converse_gump_wou.cpp
View File

@ -29,14 +29,14 @@
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/misc/sdl_compat.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/converse_gump_wou.h"
#include "ultima/ultima6/gui/widgets/converse_gump_wou.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/keybinding/keys.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/files/nuvie_bmp_file.h"
#include "ultima/ultima6/views/view_manager.h"

2
engines/ultima/ultima6/core/converse_gump_wou.h → engines/ultima/ultima6/gui/widgets/converse_gump_wou.h
View File

@ -24,7 +24,7 @@
#define ULTIMA6_CORE_CONVERSE_GUMP_WOU_H
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/fonts/font.h"
//#include <list>

2
engines/ultima/ultima6/core/fps_counter.cpp → engines/ultima/ultima6/gui/widgets/fps_counter.cpp
View File

@ -32,7 +32,7 @@
#include "ultima/ultima6/screen/screen.h"
#include "ultima/ultima6/fonts/font_manager.h"
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/core/fps_counter.h"
#include "ultima/ultima6/gui/widgets/fps_counter.h"
namespace Ultima {
namespace Ultima6 {

2
engines/ultima/ultima6/core/fps_counter.h → engines/ultima/ultima6/gui/widgets/fps_counter.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_CORE_FPS_COUNTER_H
#define ULTIMA6_CORE_FPS_COUNTER_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/fonts/font.h"
namespace Ultima {

2
engines/ultima/ultima6/gui/gui_widget.cpp → engines/ultima/ultima6/gui/widgets/gui_widget.cpp
View File

@ -22,7 +22,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
namespace Ultima {
namespace Ultima6 {

0
engines/ultima/ultima6/gui/gui_widget.h → engines/ultima/ultima6/gui/widgets/gui_widget.h
View File

10
engines/ultima/ultima6/core/map_window.cpp → engines/ultima/ultima6/gui/widgets/map_window.cpp
View File

@ -29,10 +29,10 @@
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/core/msg_scroll_new_ui.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll_new_ui.h"
#include "ultima/ultima6/core/effect.h" /* for initial fade-in */
#include "ultima/ultima6/core/tile_manager.h"
#include "ultima/ultima6/sound/sound_manager.h"
@ -44,10 +44,10 @@
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/u6_objects.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/views/actor_view.h"
#include "ultima/ultima6/views/inventory_view.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/keybinding/keys.h"
namespace Ultima {

2
engines/ultima/ultima6/core/map_window.h → engines/ultima/ultima6/gui/widgets/map_window.h
View File

@ -28,7 +28,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/map.h"
namespace Ultima {

2
engines/ultima/ultima6/core/msg_scroll.cpp → engines/ultima/ultima6/gui/widgets/msg_scroll.cpp
View File

@ -28,7 +28,7 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/effect.h"

2
engines/ultima/ultima6/core/msg_scroll.h → engines/ultima/ultima6/gui/widgets/msg_scroll.h
View File

@ -24,7 +24,7 @@
#define ULTIMA6_CORE_MSG_SCROLL_H
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#define MSGSCROLL_U6_WIDTH 17
#define MSGSCROLL_U6_HEIGHT 10

4
engines/ultima/ultima6/core/msg_scroll_new_ui.cpp → engines/ultima/ultima6/gui/widgets/msg_scroll_new_ui.cpp
View File

@ -28,11 +28,11 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/fonts/conv_font.h"
#include "ultima/ultima6/core/msg_scroll_new_ui.h"
#include "ultima/ultima6/gui/widgets/msg_scroll_new_ui.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/core/timed_event.h"

2
engines/ultima/ultima6/core/msg_scroll_new_ui.h → engines/ultima/ultima6/gui/widgets/msg_scroll_new_ui.h
View File

@ -24,7 +24,7 @@
#define ULTIMA6_CORE_MSG_SCROLL_NEW_UI_H
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
//#include <stdarg.h>
//#include <list>

8
engines/ultima/ultima6/keybinding/key_actions.cpp
View File

@ -27,17 +27,17 @@
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/views/inventory_view.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/views/actor_view.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/effect.h"
#include "ultima/ultima6/core/egg_manager.h"
#include "ultima/ultima6/screen/screen.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/ultima6.h"

4
engines/ultima/ultima6/keybinding/keys.cpp
View File

@ -28,11 +28,11 @@
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/files/utils.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/files/nuvie_io.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/core/effect.h"
#include "common/hash-str.h"

2
engines/ultima/ultima6/main.cpp
View File

@ -30,7 +30,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "nuvie.h"
#include "main.h"

2
engines/ultima/ultima6/menus/cheats_dialog.cpp
View File

@ -35,7 +35,7 @@
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/core/converse.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/keybinding/keys.h"

4
engines/ultima/ultima6/menus/gameplay_dialog.cpp
View File

@ -35,9 +35,9 @@
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/core/converse.h"
#include "ultima/ultima6/core/converse_gump.h"
#include "ultima/ultima6/gui/widgets/converse_gump.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/keybinding/keys.h"
namespace Ultima {

4
engines/ultima/ultima6/menus/input_dialog.cpp
View File

@ -33,10 +33,10 @@
#include "ultima/ultima6/menus/input_dialog.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/views/party_view.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/command_bar_new_ui.h"
#include "ultima/ultima6/gui/widgets/command_bar_new_ui.h"
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/keybinding/keys.h"

2
engines/ultima/ultima6/menus/video_dialog.cpp
View File

@ -33,7 +33,7 @@
#include "ultima/ultima6/screen/dither.h"
#include "ultima/ultima6/screen/scale.h"
#include "ultima/ultima6/screen/screen.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/gui_dialog.h"
#include "ultima/ultima6/menus/video_dialog.h"
#include "ultima/ultima6/conf/configuration.h"

2
engines/ultima/ultima6/portraits/portrait.cpp
View File

@ -23,7 +23,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/screen/dither.h"

2
engines/ultima/ultima6/portraits/portrait_md.cpp
View File

@ -23,7 +23,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/core/game.h"

2
engines/ultima/ultima6/portraits/portrait_se.cpp
View File

@ -23,7 +23,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/core/game.h"

2
engines/ultima/ultima6/portraits/portrait_u6.cpp
View File

@ -23,7 +23,7 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/screen/dither.h"

8
engines/ultima/ultima6/save/save_game.cpp
View File

@ -26,7 +26,7 @@
#include "ultima/ultima6/files/nuvie_io_file.h"
#include "ultima/ultima6/files/u6_lzw.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/save/save_game.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/game.h"
@ -36,13 +36,13 @@
#include "ultima/ultima6/core/egg_manager.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/events.h"

4
engines/ultima/ultima6/screen/screen.cpp
View File

@ -26,8 +26,8 @@
#include "ultima/ultima6/screen/surface.h"
#include "ultima/ultima6/screen/scale.h"
#include "ultima/ultima6/screen/screen.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "common/system.h"
#include "engines/util.h"

4
engines/ultima/ultima6/script/script.cpp
View File

@ -31,7 +31,7 @@
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/effect.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/actors/actor_manager.h"
@ -42,7 +42,7 @@
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/core/cursor.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/script/script_actor.h"

2
engines/ultima/ultima6/script/script_cutscene.h
View File

@ -25,7 +25,7 @@
#include "ultima/ultima6/lua/lua.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/fonts/wou_font.h"
#include "ultima/ultima6/conf/configuration.h"

2
engines/ultima/ultima6/sound/sound_manager.cpp
View File

@ -28,7 +28,7 @@
#include "ultima/ultima6/sound/song_adplug.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/effect.h"
#include "ultima/ultima6/sound/adplug/emu_opl.h"
#include "ultima/ultima6/sound/adlib_sfx_manager.h"

6
engines/ultima/ultima6/ultima6.cpp
View File

@ -31,11 +31,11 @@
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/game.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/console.h"
#include "ultima/ultima6/gui/widgets/console.h"
#include "ultima/ultima6/sound/sound_manager.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/save/save_game.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "common/config-manager.h"
#include "common/translation.h"
#include "common/unzip.h"

8
engines/ultima/ultima6/usecode/u6_usecode.cpp
View File

@ -32,12 +32,12 @@
#include "ultima/ultima6/actors/u6_actor.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/book.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/timed_event.h"
#include "ultima/ultima6/core/egg_manager.h"
#include "ultima/ultima6/core/anim_manager.h"
@ -46,8 +46,8 @@
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/keybinding/keys.h"
#include "ultima/ultima6/core/background.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/background.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/usecode/u6_usecode.h"
#include "ultima/ultima6/usecode/u6_object_types.h"
#include "ultima/ultima6/actors/u6_work_types.h"

4
engines/ultima/ultima6/usecode/usecode.cpp
View File

@ -22,11 +22,11 @@
#include "ultima/ultima6/core/nuvie_defs.h"
#include "ultima/ultima6/misc/u6_llist.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/events.h"

4
engines/ultima/ultima6/views/container_widget.cpp
View File

@ -29,10 +29,10 @@
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/timed_event.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/script/script.h"

2
engines/ultima/ultima6/views/container_widget.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_CONTAINER_WIDGET_H
#define ULTIMA6_VIEWS_CONTAINER_WIDGET_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/views/inventory_message.h"

2
engines/ultima/ultima6/views/container_widget_gump.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_CONTAINER_WIDGET_GUMP_H
#define ULTIMA6_VIEWS_CONTAINER_WIDGET_GUMP_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/views/container_widget.h"

6
engines/ultima/ultima6/views/doll_widget.cpp
View File

@ -26,15 +26,15 @@
#include "ultima/ultima6/misc/u6_misc.h"
#include "ultima/ultima6/files/u6_lib_n.h"
#include "ultima/ultima6/files/u6_shape.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/actors/actor_manager.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/views/doll_widget.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/files/nuvie_bmp_file.h"

2
engines/ultima/ultima6/views/doll_widget.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_DOLL_WIDGET_H
#define ULTIMA6_VIEWS_DOLL_WIDGET_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/tile_manager.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/views/inventory_message.h"

2
engines/ultima/ultima6/views/draggable_view.cpp
View File

@ -26,7 +26,7 @@
#include "ultima/ultima6/gui/gui_button.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/views/draggable_view.h"
namespace Ultima {

2
engines/ultima/ultima6/views/inventory_view.cpp
View File

@ -31,7 +31,7 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/keybinding/keys.h"

6
engines/ultima/ultima6/views/inventory_widget.cpp
View File

@ -30,12 +30,12 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/core/game_clock.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/timed_event.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/views/inventory_font.h"
#include "ultima/ultima6/views/view_manager.h"

2
engines/ultima/ultima6/views/inventory_widget.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_INVENTORY_WIDGET_H
#define ULTIMA6_VIEWS_INVENTORY_WIDGET_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/obj_manager.h"
#include "ultima/ultima6/views/inventory_message.h"

2
engines/ultima/ultima6/views/map_editor_view.cpp
View File

@ -26,7 +26,7 @@
#include "ultima/ultima6/gui/gui_button.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/map.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/views/map_editor_view.h"
#include "ultima/ultima6/keybinding/keys.h"

2
engines/ultima/ultima6/views/md_sky_strip_widget.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_MD_SKY_STRIP_WIDGET_H
#define ULTIMA6_VIEWS_MD_SKY_STRIP_WIDGET_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/files/u6_shape.h"
namespace Ultima {

6
engines/ultima/ultima6/views/party_view.cpp
View File

@ -29,12 +29,12 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/core/weather.h"
#include "ultima/ultima6/script/script.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/conf/configuration.h"
#include "ultima/ultima6/core/command_bar.h"
#include "ultima/ultima6/gui/widgets/command_bar.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/views/sun_moon_strip_widget.h"
namespace Ultima {

2
engines/ultima/ultima6/views/portrait_view.cpp
View File

@ -34,7 +34,7 @@
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/views/doll_widget.h"
#include "ultima/ultima6/views/portrait_view.h"

2
engines/ultima/ultima6/views/scroll_widget_gump.cpp
View File

@ -28,7 +28,7 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/screen/game_palette.h"
#include "ultima/ultima6/gui/gui.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/portraits/portrait.h"
#include "ultima/ultima6/core/player.h"
#include "ultima/ultima6/fonts/conv_font.h"

4
engines/ultima/ultima6/views/scroll_widget_gump.h
View File

@ -24,8 +24,8 @@
#define ULTIMA6_VIEWS_SCROLL_WIDGET_GUMP_H
#include "ultima/ultima6/misc/call_back.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/fonts/font.h"
//#include <stdarg.h>

4
engines/ultima/ultima6/views/spell_view.cpp
View File

@ -36,8 +36,8 @@
#include "ultima/ultima6/fonts/font.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/usecode/usecode.h"
#include "ultima/ultima6/views/view_manager.h"
#include "ultima/ultima6/script/script.h"

2
engines/ultima/ultima6/views/spell_view_gump.cpp
View File

@ -29,7 +29,7 @@
#include "ultima/ultima6/core/magic.h"
#include "ultima/ultima6/views/spell_view_gump.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/files/nuvie_bmp_file.h"
namespace Ultima {

2
engines/ultima/ultima6/views/sun_moon_strip_widget.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_SUN_MOON_STRIP_WIDGET_H
#define ULTIMA6_VIEWS_SUN_MOON_STRIP_WIDGET_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/core/tile_manager.h"
namespace Ultima {

2
engines/ultima/ultima6/views/vew.cpp
View File

@ -28,7 +28,7 @@
#include "ultima/ultima6/views/view.h"
#include "ultima/ultima6/actors/actor.h"
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
#include "ultima/ultima6/gui/gui_button.h"
namespace Ultima {

2
engines/ultima/ultima6/views/view.h
View File

@ -23,7 +23,7 @@
#ifndef ULTIMA6_VIEWS_VIEW_H
#define ULTIMA6_VIEWS_VIEW_H
#include "ultima/ultima6/gui/gui_widget.h"
#include "ultima/ultima6/gui/widgets/gui_widget.h"
namespace Ultima {
namespace Ultima6 {

4
engines/ultima/ultima6/views/view_manager.cpp
View File

@ -43,9 +43,9 @@
#include "ultima/ultima6/views/spell_view.h"
#include "ultima/ultima6/views/spell_view_gump.h"
#include "ultima/ultima6/views/sun_moon_ribbon.h"
#include "ultima/ultima6/core/map_window.h"
#include "ultima/ultima6/gui/widgets/map_window.h"
#include "ultima/ultima6/views/map_editor_view.h"
#include "ultima/ultima6/core/msg_scroll.h"
#include "ultima/ultima6/gui/widgets/msg_scroll.h"
#include "ultima/ultima6/core/party.h"
#include "ultima/ultima6/core/events.h"
#include "ultima/ultima6/portraits/portrait.h"