diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk index 0b02759b4fe..1bd9892bea6 100644 --- a/engines/ultima/module.mk +++ b/engines/ultima/module.mk @@ -164,6 +164,15 @@ MODULE_OBJS := \ ultima4/graphics/tilemap.o \ ultima4/graphics/tileset.o \ ultima4/graphics/tileview.o \ + ultima4/map/annotation.o \ + ultima4/map/camp.o \ + ultima4/map/city.o \ + ultima4/map/combat.o \ + ultima4/map/direction.o \ + ultima4/map/dungeon.o \ + ultima4/map/dungeonview.o \ + ultima4/map/movement.o \ + ultima4/map/shrine.o \ ultima4/map/location.o \ ultima4/map/map.o \ ultima4/map/maploader.o \ @@ -172,27 +181,19 @@ MODULE_OBJS := \ ultima4/sound/music_sdl.o \ ultima4/sound/sound.o \ ultima4/sound/sound_sdl.o \ - ultima4/annotation.o \ ultima4/armor.o \ ultima4/aura.o \ - ultima4/camp.o \ ultima4/cheat.o \ - ultima4/city.o \ ultima4/codex.o \ - ultima4/combat.o \ ultima4/context.o \ ultima4/creature.o \ ultima4/death.o \ - ultima4/direction.o \ - ultima4/dungeon.o \ - ultima4/dungeonview.o \ ultima4/game.o \ ultima4/intro.o \ ultima4/item.o \ ultima4/menu.o \ ultima4/menuitem.o \ ultima4/moongate.o \ - ultima4/movement.o \ ultima4/names.o \ ultima4/object.o \ ultima4/person.o \ @@ -204,7 +205,6 @@ MODULE_OBJS := \ ultima4/screen_sdl.o \ ultima4/script.o \ ultima4/settings.o \ - ultima4/shrine.o \ ultima4/spell.o \ ultima4/stats.o \ ultima4/textview.o \ diff --git a/engines/ultima/ultima4/context.h b/engines/ultima/ultima4/context.h index 4f76b54d6dc..cea0b28f631 100644 --- a/engines/ultima/ultima4/context.h +++ b/engines/ultima/ultima4/context.h @@ -28,7 +28,7 @@ #include "ultima/ultima4/names.h" #include "ultima/ultima4/person.h" #include "ultima/ultima4/script.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/savegame.h" #include "ultima/shared/std/containers.h" diff --git a/engines/ultima/ultima4/coords.h b/engines/ultima/ultima4/core/coords.h similarity index 100% rename from engines/ultima/ultima4/coords.h rename to engines/ultima/ultima4/core/coords.h diff --git a/engines/ultima/ultima4/types.h b/engines/ultima/ultima4/core/types.h similarity index 98% rename from engines/ultima/ultima4/types.h rename to engines/ultima/ultima4/core/types.h index daf021f462a..727e7df6cd7 100644 --- a/engines/ultima/ultima4/types.h +++ b/engines/ultima/ultima4/core/types.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_TYPEDEFS_H #define ULTIMA4_TYPEDEFS_H -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/creature.cpp b/engines/ultima/ultima4/creature.cpp index 25055c019df..021c67806e6 100644 --- a/engines/ultima/ultima4/creature.cpp +++ b/engines/ultima/ultima4/creature.cpp @@ -21,7 +21,7 @@ */ #include "ultima/ultima4/creature.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" diff --git a/engines/ultima/ultima4/creature.h b/engines/ultima/ultima4/creature.h index b3c513c6fa5..399ce939d74 100644 --- a/engines/ultima/ultima4/creature.h +++ b/engines/ultima/ultima4/creature.h @@ -24,9 +24,9 @@ #define ULTIMA4_CREATURE_H #include "ultima/ultima4/object.h" -#include "ultima/ultima4/movement.h" +#include "ultima/ultima4/map/movement.h" #include "ultima/ultima4/filesys/savegame.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/death.cpp b/engines/ultima/ultima4/death.cpp index dbb06b1c2d2..958207a952b 100644 --- a/engines/ultima/ultima4/death.cpp +++ b/engines/ultima/ultima4/death.cpp @@ -23,8 +23,8 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/death.h" #include "ultima/ultima4/map/map.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/city.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/city.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/game.h" diff --git a/engines/ultima/ultima4/events/event.h b/engines/ultima/ultima4/events/event.h index dac76513069..2a3f04fba3c 100644 --- a/engines/ultima/ultima4/events/event.h +++ b/engines/ultima/ultima4/events/event.h @@ -27,7 +27,7 @@ #include "common/list.h" #include "common/str.h" #include "ultima/ultima4/events/controller.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/shared/std/containers.h" namespace Ultima { diff --git a/engines/ultima/ultima4/filesys/savegame.cpp b/engines/ultima/ultima4/filesys/savegame.cpp index f377b4a4f5b..be2fab6f10f 100644 --- a/engines/ultima/ultima4/filesys/savegame.cpp +++ b/engines/ultima/ultima4/filesys/savegame.cpp @@ -23,7 +23,7 @@ #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/filesys/io.h" #include "ultima/ultima4/object.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/game.cpp b/engines/ultima/ultima4/game.cpp index bcd936e48b7..01b923264f7 100644 --- a/engines/ultima/ultima4/game.cpp +++ b/engines/ultima/ultima4/game.cpp @@ -23,19 +23,19 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/game.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/armor.h" -#include "ultima/ultima4/camp.h" +#include "ultima/ultima4/map/camp.h" #include "ultima/ultima4/cheat.h" -#include "ultima/ultima4/city.h" +#include "ultima/ultima4/map/city.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/dungeon.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/death.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/core/error.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/intro.h" @@ -46,7 +46,7 @@ #include "ultima/ultima4/menu.h" #include "ultima/ultima4/creature.h" #include "ultima/ultima4/moongate.h" -#include "ultima/ultima4/movement.h" +#include "ultima/ultima4/map/movement.h" #include "ultima/ultima4/sound/music.h" #include "ultima/ultima4/names.h" #include "ultima/ultima4/person.h" @@ -56,7 +56,7 @@ #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/screen.h" #include "ultima/ultima4/settings.h" -#include "ultima/ultima4/shrine.h" +#include "ultima/ultima4/map/shrine.h" #include "ultima/ultima4/sound/sound.h" #include "ultima/ultima4/spell.h" #include "ultima/ultima4/stats.h" @@ -65,7 +65,7 @@ #include "ultima/ultima4/core/utils.h" #include "ultima/ultima4/script.h" #include "ultima/ultima4/weapon.h" -#include "ultima/ultima4/dungeonview.h" +#include "ultima/ultima4/map/dungeonview.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/ultima/ultima4/game.h b/engines/ultima/ultima4/game.h index e633b1d1bc2..f23067a4d12 100644 --- a/engines/ultima/ultima4/game.h +++ b/engines/ultima/ultima4/game.h @@ -29,7 +29,7 @@ #include "ultima/ultima4/observer.h" #include "ultima/ultima4/sound/sound.h" #include "ultima/ultima4/graphics/tileview.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/graphics/image.h b/engines/ultima/ultima4/graphics/image.h index 0ea8207de6f..690798cf457 100644 --- a/engines/ultima/ultima4/graphics/image.h +++ b/engines/ultima/ultima4/graphics/image.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_IMAGE_H #define ULTIMA4_IMAGE_H -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/u4file.h" #include "ultima/ultima4/graphics/textcolor.h" #include "graphics/managed_surface.h" diff --git a/engines/ultima/ultima4/graphics/tile.h b/engines/ultima/ultima4/graphics/tile.h index b9b65aa086b..d429a7eb9b9 100644 --- a/engines/ultima/ultima4/graphics/tile.h +++ b/engines/ultima/ultima4/graphics/tile.h @@ -23,8 +23,8 @@ #ifndef ULTIMA4_TILE_H #define ULTIMA4_TILE_H -#include "ultima/ultima4/direction.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/map/direction.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/graphics/tileset.h" #include "ultima/shared/std/containers.h" diff --git a/engines/ultima/ultima4/graphics/tileanim.cpp b/engines/ultima/ultima4/graphics/tileanim.cpp index e3092afcbb6..e2a6671bbf9 100644 --- a/engines/ultima/ultima4/graphics/tileanim.cpp +++ b/engines/ultima/ultima4/graphics/tileanim.cpp @@ -21,7 +21,7 @@ */ #include "ultima/ultima4/core/config.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/graphics/image.h" #include "ultima/ultima4/screen.h" #include "ultima/ultima4/graphics/tileanim.h" diff --git a/engines/ultima/ultima4/graphics/tileanim.h b/engines/ultima/ultima4/graphics/tileanim.h index e8f95e1402d..0e749403c43 100644 --- a/engines/ultima/ultima4/graphics/tileanim.h +++ b/engines/ultima/ultima4/graphics/tileanim.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_TILEANIM_H #define ULTIMA4_TILEANIM_H -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/graphics/tilemap.h b/engines/ultima/ultima4/graphics/tilemap.h index aec8b85e7da..ef5a59a246a 100644 --- a/engines/ultima/ultima4/graphics/tilemap.h +++ b/engines/ultima/ultima4/graphics/tilemap.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_TILEMAP_H #define ULTIMA4_TILEMAP_H -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/shared/std/containers.h" namespace Ultima { diff --git a/engines/ultima/ultima4/graphics/tileset.h b/engines/ultima/ultima4/graphics/tileset.h index 9c6238e2435..b6f81287907 100644 --- a/engines/ultima/ultima4/graphics/tileset.h +++ b/engines/ultima/ultima4/graphics/tileset.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_TILESET_H #define ULTIMA4_TILESET_H -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "common/hash-str.h" namespace Ultima { diff --git a/engines/ultima/ultima4/intro.cpp b/engines/ultima/ultima4/intro.cpp index 00fd75a0105..eb7c6dc3321 100644 --- a/engines/ultima/ultima4/intro.cpp +++ b/engines/ultima/ultima4/intro.cpp @@ -34,7 +34,7 @@ #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/screen.h" #include "ultima/ultima4/settings.h" -#include "ultima/ultima4/shrine.h" +#include "ultima/ultima4/map/shrine.h" #include "ultima/ultima4/graphics/tileset.h" #include "ultima/ultima4/graphics/tilemap.h" #include "ultima/ultima4/filesys/u4file.h" diff --git a/engines/ultima/ultima4/item.cpp b/engines/ultima/ultima4/item.cpp index bc98d44db1e..64776000ef3 100644 --- a/engines/ultima/ultima4/item.cpp +++ b/engines/ultima/ultima4/item.cpp @@ -21,12 +21,12 @@ */ #include "ultima/ultima4/item.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/codex.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/game.h" #include "ultima/ultima4/map/location.h" #include "ultima/ultima4/map/map.h" diff --git a/engines/ultima/ultima4/item.h b/engines/ultima/ultima4/item.h index 9da9d747b58..44d676bd7c3 100644 --- a/engines/ultima/ultima4/item.h +++ b/engines/ultima/ultima4/item.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_ITEM_H #define ULTIMA4_ITEM_H -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "common/str.h" namespace Ultima { diff --git a/engines/ultima/ultima4/annotation.cpp b/engines/ultima/ultima4/map/annotation.cpp similarity index 98% rename from engines/ultima/ultima4/annotation.cpp rename to engines/ultima/ultima4/map/annotation.cpp index aabef68a4aa..4d6b15688e7 100644 --- a/engines/ultima/ultima4/annotation.cpp +++ b/engines/ultima/ultima4/map/annotation.cpp @@ -20,7 +20,7 @@ * */ -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" #include "ultima/ultima4/core/error.h" diff --git a/engines/ultima/ultima4/annotation.h b/engines/ultima/ultima4/map/annotation.h similarity index 97% rename from engines/ultima/ultima4/annotation.h rename to engines/ultima/ultima4/map/annotation.h index d6e75aede59..595a853ca48 100644 --- a/engines/ultima/ultima4/annotation.h +++ b/engines/ultima/ultima4/map/annotation.h @@ -23,8 +23,8 @@ #ifndef ULTIMA4_ANNOTATION_H #define ULTIMA4_ANNOTATION_H -#include "ultima/ultima4/coords.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/coords.h" +#include "ultima/ultima4/core/types.h" #include "common/list.h" namespace Ultima { diff --git a/engines/ultima/ultima4/camp.cpp b/engines/ultima/ultima4/map/camp.cpp similarity index 98% rename from engines/ultima/ultima4/camp.cpp rename to engines/ultima/ultima4/map/camp.cpp index 4cc2828ff5a..2ff55031ad5 100644 --- a/engines/ultima/ultima4/camp.cpp +++ b/engines/ultima/ultima4/map/camp.cpp @@ -21,10 +21,10 @@ */ #include "ultima/ultima4/ultima4.h" -#include "ultima/ultima4/camp.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/city.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/camp.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/city.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/events/event.h" diff --git a/engines/ultima/ultima4/camp.h b/engines/ultima/ultima4/map/camp.h similarity index 97% rename from engines/ultima/ultima4/camp.h rename to engines/ultima/ultima4/map/camp.h index 47ceabe6745..4fd1aaeca25 100644 --- a/engines/ultima/ultima4/camp.h +++ b/engines/ultima/ultima4/map/camp.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_CAMP_H #define ULTIMA4_CAMP_H -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/city.cpp b/engines/ultima/ultima4/map/city.cpp similarity index 98% rename from engines/ultima/ultima4/city.cpp rename to engines/ultima/ultima4/map/city.cpp index 9cbade954e7..698f290035a 100644 --- a/engines/ultima/ultima4/city.cpp +++ b/engines/ultima/ultima4/map/city.cpp @@ -20,7 +20,7 @@ * */ -#include "ultima/ultima4/city.h" +#include "ultima/ultima4/map/city.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/creature.h" diff --git a/engines/ultima/ultima4/city.h b/engines/ultima/ultima4/map/city.h similarity index 100% rename from engines/ultima/ultima4/city.h rename to engines/ultima/ultima4/map/city.h diff --git a/engines/ultima/ultima4/combat.cpp b/engines/ultima/ultima4/map/combat.cpp similarity index 99% rename from engines/ultima/ultima4/combat.cpp rename to engines/ultima/ultima4/map/combat.cpp index 3c71fdfbe9a..1e0c0255ca5 100644 --- a/engines/ultima/ultima4/combat.cpp +++ b/engines/ultima/ultima4/map/combat.cpp @@ -21,19 +21,19 @@ */ #include "ultima/ultima4/ultima4.h" -#include "ultima/ultima4/combat.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/combat.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/creature.h" #include "ultima/ultima4/death.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/game.h" #include "ultima/ultima4/item.h" #include "ultima/ultima4/map/location.h" #include "ultima/ultima4/map/mapmgr.h" -#include "ultima/ultima4/movement.h" +#include "ultima/ultima4/map/movement.h" #include "ultima/ultima4/names.h" #include "ultima/ultima4/object.h" #include "ultima/ultima4/player.h" diff --git a/engines/ultima/ultima4/combat.h b/engines/ultima/ultima4/map/combat.h similarity index 98% rename from engines/ultima/ultima4/combat.h rename to engines/ultima/ultima4/map/combat.h index 27b87482d10..9047e8b018c 100644 --- a/engines/ultima/ultima4/combat.h +++ b/engines/ultima/ultima4/map/combat.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_COMBAT_H #define ULTIMA4_COMBAT_H -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/map/map.h" #include "ultima/ultima4/events/controller.h" #include "ultima/ultima4/creature.h" @@ -32,7 +32,7 @@ #include "ultima/ultima4/observer.h" #include "ultima/ultima4/player.h" #include "ultima/ultima4/filesys/savegame.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/direction.cpp b/engines/ultima/ultima4/map/direction.cpp similarity index 98% rename from engines/ultima/ultima4/direction.cpp rename to engines/ultima/ultima4/map/direction.cpp index aa62d78e50f..da73036e829 100644 --- a/engines/ultima/ultima4/direction.cpp +++ b/engines/ultima/ultima4/map/direction.cpp @@ -20,7 +20,7 @@ * */ -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/core/debug.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/core/utils.h" diff --git a/engines/ultima/ultima4/direction.h b/engines/ultima/ultima4/map/direction.h similarity index 100% rename from engines/ultima/ultima4/direction.h rename to engines/ultima/ultima4/map/direction.h diff --git a/engines/ultima/ultima4/dungeon.cpp b/engines/ultima/ultima4/map/dungeon.cpp similarity index 99% rename from engines/ultima/ultima4/dungeon.cpp rename to engines/ultima/ultima4/map/dungeon.cpp index 6bae8e22196..195d7c6cdb6 100644 --- a/engines/ultima/ultima4/dungeon.cpp +++ b/engines/ultima/ultima4/map/dungeon.cpp @@ -20,8 +20,8 @@ * */ -#include "ultima/ultima4/dungeon.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/dungeon.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" #include "ultima/ultima4/game.h" diff --git a/engines/ultima/ultima4/dungeon.h b/engines/ultima/ultima4/map/dungeon.h similarity index 98% rename from engines/ultima/ultima4/dungeon.h rename to engines/ultima/ultima4/map/dungeon.h index 9b47ac0cbaa..a2fe4ed1a97 100644 --- a/engines/ultima/ultima4/dungeon.h +++ b/engines/ultima/ultima4/map/dungeon.h @@ -23,9 +23,9 @@ #ifndef ULTIMA4_DUNGEON_H #define ULTIMA4_DUNGEON_H -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/map/map.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/dungeonview.cpp b/engines/ultima/ultima4/map/dungeonview.cpp similarity index 99% rename from engines/ultima/ultima4/dungeonview.cpp rename to engines/ultima/ultima4/map/dungeonview.cpp index 89e1af2b045..38cb18224b9 100644 --- a/engines/ultima/ultima4/dungeonview.cpp +++ b/engines/ultima/ultima4/map/dungeonview.cpp @@ -22,7 +22,7 @@ #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeonview.h" +#include "ultima/ultima4/map/dungeonview.h" #include "ultima/ultima4/graphics/image.h" #include "ultima/ultima4/graphics/imagemgr.h" #include "ultima/ultima4/settings.h" diff --git a/engines/ultima/ultima4/dungeonview.h b/engines/ultima/ultima4/map/dungeonview.h similarity index 95% rename from engines/ultima/ultima4/dungeonview.h rename to engines/ultima/ultima4/map/dungeonview.h index c6c8860cb9d..f346a2cb15a 100644 --- a/engines/ultima/ultima4/dungeonview.h +++ b/engines/ultima/ultima4/map/dungeonview.h @@ -25,12 +25,12 @@ #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/graphics/tileset.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/graphics/tileview.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/map/location.h" namespace Ultima { diff --git a/engines/ultima/ultima4/map/location.cpp b/engines/ultima/ultima4/map/location.cpp index 157930e742a..e5e92f59d5f 100644 --- a/engines/ultima/ultima4/map/location.cpp +++ b/engines/ultima/ultima4/map/location.cpp @@ -21,9 +21,9 @@ */ #include "ultima/ultima4/map/location.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/creature.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/game.h" diff --git a/engines/ultima/ultima4/map/location.h b/engines/ultima/ultima4/map/location.h index 3deae75d742..cecb5283faa 100644 --- a/engines/ultima/ultima4/map/location.h +++ b/engines/ultima/ultima4/map/location.h @@ -24,9 +24,9 @@ #define ULTIMA4_LOCATION_H #include "ultima/ultima4/map/map.h" -#include "ultima/ultima4/movement.h" +#include "ultima/ultima4/map/movement.h" #include "ultima/ultima4/observable.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/map/map.cpp b/engines/ultima/ultima4/map/map.cpp index 9e78ca2b9a0..1159b7fc639 100644 --- a/engines/ultima/ultima4/map/map.cpp +++ b/engines/ultima/ultima4/map/map.cpp @@ -22,12 +22,12 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/map/map.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/map/location.h" -#include "ultima/ultima4/movement.h" +#include "ultima/ultima4/map/movement.h" #include "ultima/ultima4/object.h" #include "ultima/ultima4/person.h" #include "ultima/ultima4/player.h" @@ -35,7 +35,7 @@ #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/graphics/tileset.h" #include "ultima/ultima4/graphics/tilemap.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/core/utils.h" #include "ultima/ultima4/settings.h" diff --git a/engines/ultima/ultima4/map/map.h b/engines/ultima/ultima4/map/map.h index fc79494992c..1108059fc7b 100644 --- a/engines/ultima/ultima4/map/map.h +++ b/engines/ultima/ultima4/map/map.h @@ -23,12 +23,12 @@ #ifndef ULTIMA4_MAP_H #define ULTIMA4_MAP_H -#include "ultima/ultima4/coords.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/core/coords.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/sound/music.h" #include "ultima/ultima4/object.h" #include "ultima/ultima4/filesys/savegame.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/u4file.h" namespace Ultima { diff --git a/engines/ultima/ultima4/map/maploader.cpp b/engines/ultima/ultima4/map/maploader.cpp index 44f740ca593..d3cab15c2be 100644 --- a/engines/ultima/ultima4/map/maploader.cpp +++ b/engines/ultima/ultima4/map/maploader.cpp @@ -23,12 +23,12 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/map/maploader.h" -#include "ultima/ultima4/city.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/city.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/conversation/dialogueloader.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/core/error.h" #include "ultima/ultima4/filesys/filesystem.h" #include "ultima/ultima4/map/map.h" diff --git a/engines/ultima/ultima4/map/mapmgr.cpp b/engines/ultima/ultima4/map/mapmgr.cpp index 3dfb729350a..691fdd0c15b 100644 --- a/engines/ultima/ultima4/map/mapmgr.cpp +++ b/engines/ultima/ultima4/map/mapmgr.cpp @@ -21,11 +21,11 @@ */ #include "ultima/ultima4/ultima4.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/city.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/city.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/core/error.h" #include "ultima/ultima4/map/map.h" #include "ultima/ultima4/map/maploader.h" @@ -33,10 +33,10 @@ #include "ultima/ultima4/moongate.h" #include "ultima/ultima4/person.h" #include "ultima/ultima4/portal.h" -#include "ultima/ultima4/shrine.h" +#include "ultima/ultima4/map/shrine.h" #include "ultima/ultima4/graphics/tilemap.h" #include "ultima/ultima4/graphics/tileset.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/u4file.h" #include "ultima/ultima4/core/config.h" diff --git a/engines/ultima/ultima4/movement.cpp b/engines/ultima/ultima4/map/movement.cpp similarity index 98% rename from engines/ultima/ultima4/movement.cpp rename to engines/ultima/ultima4/map/movement.cpp index b7d99fa1015..0730a60bfa0 100644 --- a/engines/ultima/ultima4/movement.cpp +++ b/engines/ultima/ultima4/map/movement.cpp @@ -20,12 +20,12 @@ * */ -#include "ultima/ultima4/movement.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/movement.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/map/location.h" #include "ultima/ultima4/creature.h" diff --git a/engines/ultima/ultima4/movement.h b/engines/ultima/ultima4/map/movement.h similarity index 98% rename from engines/ultima/ultima4/movement.h rename to engines/ultima/ultima4/map/movement.h index 8e7081eddc5..23a90308e26 100644 --- a/engines/ultima/ultima4/movement.h +++ b/engines/ultima/ultima4/map/movement.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_MOVEMENT_H #define ULTIMA4_MOVEMENT_H -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/map/map.h" namespace Ultima { diff --git a/engines/ultima/ultima4/shrine.cpp b/engines/ultima/ultima4/map/shrine.cpp similarity index 98% rename from engines/ultima/ultima4/shrine.cpp rename to engines/ultima/ultima4/map/shrine.cpp index 72fa87d25a1..11d94d67c71 100644 --- a/engines/ultima/ultima4/shrine.cpp +++ b/engines/ultima/ultima4/map/shrine.cpp @@ -22,8 +22,8 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/core/config.h" -#include "ultima/ultima4/shrine.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/shrine.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/game.h" @@ -38,7 +38,7 @@ #include "ultima/ultima4/screen.h" #include "ultima/ultima4/settings.h" #include "ultima/ultima4/graphics/tileset.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/shrine.h b/engines/ultima/ultima4/map/shrine.h similarity index 100% rename from engines/ultima/ultima4/shrine.h rename to engines/ultima/ultima4/map/shrine.h diff --git a/engines/ultima/ultima4/menu.h b/engines/ultima/ultima4/menu.h index 78afbfde1ca..b564adc87d5 100644 --- a/engines/ultima/ultima4/menu.h +++ b/engines/ultima/ultima4/menu.h @@ -26,7 +26,7 @@ #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/menuitem.h" #include "ultima/ultima4/observable.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/shared/std/containers.h" namespace Ultima { diff --git a/engines/ultima/ultima4/moongate.cpp b/engines/ultima/ultima4/moongate.cpp index 48f07629c2a..bc3102c4a36 100644 --- a/engines/ultima/ultima4/moongate.cpp +++ b/engines/ultima/ultima4/moongate.cpp @@ -21,9 +21,9 @@ */ #include "ultima/ultima4/core/error.h" -#include "ultima/ultima4/coords.h" +#include "ultima/ultima4/core/coords.h" #include "ultima/ultima4/moongate.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/shared/std/containers.h" namespace Ultima { diff --git a/engines/ultima/ultima4/names.h b/engines/ultima/ultima4/names.h index 21c77157d8e..fcf7bff77eb 100644 --- a/engines/ultima/ultima4/names.h +++ b/engines/ultima/ultima4/names.h @@ -24,7 +24,7 @@ #define ULTIMA4_NAMES_H #include "ultima/ultima4/filesys/savegame.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/object.h b/engines/ultima/ultima4/object.h index 53834e80332..75df7a083c8 100644 --- a/engines/ultima/ultima4/object.h +++ b/engines/ultima/ultima4/object.h @@ -22,9 +22,9 @@ #ifndef ULTIMA4_OBJECT_H #define ULTIMA4_OBJECT_H -#include "ultima/ultima4/coords.h" +#include "ultima/ultima4/core/coords.h" #include "ultima/ultima4/graphics/tile.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/person.cpp b/engines/ultima/ultima4/person.cpp index a68cc65c2f8..e8b60e29a69 100644 --- a/engines/ultima/ultima4/person.cpp +++ b/engines/ultima/ultima4/person.cpp @@ -23,7 +23,7 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/person.h" -#include "ultima/ultima4/city.h" +#include "ultima/ultima4/map/city.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/core/debug.h" @@ -37,7 +37,7 @@ #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/settings.h" #include "ultima/ultima4/stats.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/u4file.h" #include "ultima/ultima4/core/utils.h" #include "ultima/ultima4/script.h" diff --git a/engines/ultima/ultima4/person.h b/engines/ultima/ultima4/person.h index 2eaef8a8909..626ef141df9 100644 --- a/engines/ultima/ultima4/person.h +++ b/engines/ultima/ultima4/person.h @@ -24,7 +24,7 @@ #define ULTIMA4_PERSON_H #include "ultima/ultima4/creature.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/player.cpp b/engines/ultima/ultima4/player.cpp index dec98bfd69f..4d297370bbf 100644 --- a/engines/ultima/ultima4/player.cpp +++ b/engines/ultima/ultima4/player.cpp @@ -21,9 +21,9 @@ */ #include "ultima/ultima4/player.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "ultima/ultima4/armor.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" #include "ultima/ultima4/game.h" @@ -32,7 +32,7 @@ #include "ultima/ultima4/names.h" #include "ultima/ultima4/graphics/tilemap.h" #include "ultima/ultima4/graphics/tileset.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/core/utils.h" #include "ultima/ultima4/weapon.h" diff --git a/engines/ultima/ultima4/player.h b/engines/ultima/ultima4/player.h index f0f89231af5..e3375d81c53 100644 --- a/engines/ultima/ultima4/player.h +++ b/engines/ultima/ultima4/player.h @@ -24,12 +24,12 @@ #define ULTIMA4_PLAYER_H #include "ultima/ultima4/creature.h" -#include "ultima/ultima4/direction.h" +#include "ultima/ultima4/map/direction.h" #include "ultima/ultima4/observable.h" #include "ultima/ultima4/filesys/savegame.h" #include "ultima/ultima4/script.h" #include "ultima/ultima4/graphics/tile.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" namespace Ultima { namespace Ultima4 { diff --git a/engines/ultima/ultima4/portal.cpp b/engines/ultima/ultima4/portal.cpp index 3311c0e6c9c..bfe5e0a116a 100644 --- a/engines/ultima/ultima4/portal.cpp +++ b/engines/ultima/ultima4/portal.cpp @@ -21,16 +21,16 @@ */ #include "ultima/ultima4/portal.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/city.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/city.h" #include "ultima/ultima4/context.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/game.h" #include "ultima/ultima4/map/location.h" #include "ultima/ultima4/map/mapmgr.h" #include "ultima/ultima4/names.h" #include "ultima/ultima4/screen.h" -#include "ultima/ultima4/shrine.h" +#include "ultima/ultima4/map/shrine.h" #include "ultima/ultima4/graphics/tile.h" namespace Ultima { diff --git a/engines/ultima/ultima4/screen.cpp b/engines/ultima/ultima4/screen.cpp index b6094496f83..5c07629da16 100644 --- a/engines/ultima/ultima4/screen.cpp +++ b/engines/ultima/ultima4/screen.cpp @@ -25,7 +25,7 @@ #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeonview.h" +#include "ultima/ultima4/map/dungeonview.h" #include "ultima/ultima4/core/error.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/intro.h" @@ -40,7 +40,7 @@ #include "ultima/ultima4/graphics/tileanim.h" #include "ultima/ultima4/graphics/tileset.h" #include "ultima/ultima4/graphics/tileview.h" -#include "ultima/ultima4/annotation.h" +#include "ultima/ultima4/map/annotation.h" #include "engines/util.h" namespace Ultima { diff --git a/engines/ultima/ultima4/screen.h b/engines/ultima/ultima4/screen.h index 53ad192b9b1..ee49fde19ef 100644 --- a/engines/ultima/ultima4/screen.h +++ b/engines/ultima/ultima4/screen.h @@ -23,8 +23,8 @@ #ifndef ULTIMA4_SCREEN_H #define ULTIMA4_SCREEN_H -#include "ultima/ultima4/direction.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/map/direction.h" +#include "ultima/ultima4/core/types.h" #include "ultima/ultima4/filesys/u4file.h" #include "graphics/screen.h" diff --git a/engines/ultima/ultima4/screen_sdl.cpp b/engines/ultima/ultima4/screen_sdl.cpp index 00d34ed907e..26e23e629b0 100644 --- a/engines/ultima/ultima4/screen_sdl.cpp +++ b/engines/ultima/ultima4/screen_sdl.cpp @@ -23,7 +23,7 @@ #include "ultima/ultima4/core/config.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/dungeonview.h" +#include "ultima/ultima4/map/dungeonview.h" #include "ultima/ultima4/core/error.h" #include "ultima/ultima4/intro.h" #include "ultima/ultima4/filesys/savegame.h" diff --git a/engines/ultima/ultima4/script.cpp b/engines/ultima/ultima4/script.cpp index 1e7297d1776..8e7206fb709 100644 --- a/engines/ultima/ultima4/script.cpp +++ b/engines/ultima/ultima4/script.cpp @@ -22,7 +22,7 @@ #include "ultima/ultima4/script.h" #include "ultima/ultima4/armor.h" -#include "ultima/ultima4/camp.h" +#include "ultima/ultima4/map/camp.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/conversation/conversation.h" #include "ultima/ultima4/core/debug.h" diff --git a/engines/ultima/ultima4/script.h b/engines/ultima/ultima4/script.h index 875747f2819..aa9c56cb9fe 100644 --- a/engines/ultima/ultima4/script.h +++ b/engines/ultima/ultima4/script.h @@ -23,7 +23,7 @@ #ifndef ULTIMA4_SCRIPT_H #define ULTIMA4_SCRIPT_H -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "ultima/shared/conf/xml_node.h" #include "common/file.h" diff --git a/engines/ultima/ultima4/settings.h b/engines/ultima/ultima4/settings.h index 782e13695fe..7dfba644812 100644 --- a/engines/ultima/ultima4/settings.h +++ b/engines/ultima/ultima4/settings.h @@ -24,7 +24,7 @@ #define ULTIMA4_SETTINGS_H #include "ultima/ultima4/observable.h" -#include "ultima/ultima4/types.h" +#include "ultima/ultima4/core/types.h" #include "common/hash-str.h" namespace Ultima { diff --git a/engines/ultima/ultima4/spell.cpp b/engines/ultima/ultima4/spell.cpp index 988401cd362..275e7ffcd8c 100644 --- a/engines/ultima/ultima4/spell.cpp +++ b/engines/ultima/ultima4/spell.cpp @@ -22,12 +22,12 @@ #include "ultima/ultima4/ultima4.h" #include "ultima/ultima4/spell.h" -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/combat.h" +#include "ultima/ultima4/map/annotation.h" +#include "ultima/ultima4/map/combat.h" #include "ultima/ultima4/context.h" #include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/direction.h" -#include "ultima/ultima4/dungeon.h" +#include "ultima/ultima4/map/direction.h" +#include "ultima/ultima4/map/dungeon.h" #include "ultima/ultima4/events/event.h" #include "ultima/ultima4/game.h" #include "ultima/ultima4/map/location.h" diff --git a/engines/ultima/ultima4/u4_pch.h b/engines/ultima/ultima4/u4_pch.h deleted file mode 100644 index 39433a3eb02..00000000000 --- a/engines/ultima/ultima4/u4_pch.h +++ /dev/null @@ -1,30 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "ultima/ultima4/annotation.h" -#include "ultima/ultima4/conversation/conversation.h" -#include "ultima/ultima4/core/config.h" -#include "ultima/ultima4/core/debug.h" -#include "ultima/ultima4/types.h" -#include "ultima/ultima4/ultima4.h" -#include "ultima/ultima4/filesys/u4file.h" -#include "ultima/ultima4/core/utils.h"