[Scummvm-git-logs] scummvm master -> d942d49a76e7276e5dac405ed542ec6764acbb86

dreammaster paulfgilbert at gmail.com
Fri Apr 17 04:49:46 UTC 2020 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f2e8f22fc1 ULTIMA4: Standardization of header ifndef
d942d49a76 ULTIMA4: Turn off keybindings for controllers that don't need it


Commit: f2e8f22fc172112be04a9cf763a4b31b0f269525
    https://github.com/scummvm/scummvm/commit/f2e8f22fc172112be04a9cf763a4b31b0f269525
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-16T20:09:17-07:00

Commit Message:
ULTIMA4: Standardization of header ifndef

Changed paths:
    engines/ultima/ultima4/controllers/combat_controller.h
    engines/ultima/ultima4/controllers/intro_controller.h
    engines/ultima/ultima4/conversation/conversation.h
    engines/ultima/ultima4/conversation/dialogueloader.h
    engines/ultima/ultima4/conversation/dialogueloader_hw.h
    engines/ultima/ultima4/conversation/dialogueloader_lb.h
    engines/ultima/ultima4/conversation/dialogueloader_tlk.h
    engines/ultima/ultima4/core/config.h
    engines/ultima/ultima4/core/coords.h
    engines/ultima/ultima4/core/error.h
    engines/ultima/ultima4/core/observable.h
    engines/ultima/ultima4/core/observer.h
    engines/ultima/ultima4/core/settings.h
    engines/ultima/ultima4/core/types.h
    engines/ultima/ultima4/core/utils.h
    engines/ultima/ultima4/events/event.h
    engines/ultima/ultima4/filesys/filesystem.h
    engines/ultima/ultima4/filesys/rle.h
    engines/ultima/ultima4/filesys/savegame.h
    engines/ultima/ultima4/game/armor.h
    engines/ultima/ultima4/game/aura.h
    engines/ultima/ultima4/game/codex.h
    engines/ultima/ultima4/game/context.h
    engines/ultima/ultima4/game/creature.h
    engines/ultima/ultima4/game/death.h
    engines/ultima/ultima4/game/game.h
    engines/ultima/ultima4/game/item.h
    engines/ultima/ultima4/game/menuitem.h
    engines/ultima/ultima4/game/moongate.h
    engines/ultima/ultima4/game/names.h
    engines/ultima/ultima4/game/object.h
    engines/ultima/ultima4/game/person.h
    engines/ultima/ultima4/game/player.h
    engines/ultima/ultima4/game/portal.h
    engines/ultima/ultima4/game/script.h
    engines/ultima/ultima4/game/spell.h
    engines/ultima/ultima4/game/stats.h
    engines/ultima/ultima4/game/textview.h
    engines/ultima/ultima4/game/view.h
    engines/ultima/ultima4/game/weapon.h
    engines/ultima/ultima4/gfx/image.h
    engines/ultima/ultima4/gfx/imageloader.h
    engines/ultima/ultima4/gfx/imageloader_fmtowns.h
    engines/ultima/ultima4/gfx/imageloader_png.h
    engines/ultima/ultima4/gfx/imageloader_u4.h
    engines/ultima/ultima4/gfx/imagemgr.h
    engines/ultima/ultima4/gfx/imageview.h
    engines/ultima/ultima4/gfx/scale.h
    engines/ultima/ultima4/gfx/screen.h
    engines/ultima/ultima4/gfx/textcolor.h
    engines/ultima/ultima4/map/annotation.h
    engines/ultima/ultima4/map/area.h
    engines/ultima/ultima4/map/city.h
    engines/ultima/ultima4/map/direction.h
    engines/ultima/ultima4/map/dungeon.h
    engines/ultima/ultima4/map/dungeonview.h
    engines/ultima/ultima4/map/location.h
    engines/ultima/ultima4/map/map.h
    engines/ultima/ultima4/map/maploader.h
    engines/ultima/ultima4/map/mapmgr.h
    engines/ultima/ultima4/map/movement.h
    engines/ultima/ultima4/map/shrine.h
    engines/ultima/ultima4/map/tile.h
    engines/ultima/ultima4/map/tileanim.h
    engines/ultima/ultima4/map/tilemap.h
    engines/ultima/ultima4/map/tileset.h
    engines/ultima/ultima4/map/tileview.h
    engines/ultima/ultima4/sound/music.h
    engines/ultima/ultima4/sound/sound.h
    engines/ultima/ultima4/sound/sound_p.h


diff --git a/engines/ultima/ultima4/controllers/combat_controller.h b/engines/ultima/ultima4/controllers/combat_controller.h
index 31d9780794..13b8d51720 100644
--- a/engines/ultima/ultima4/controllers/combat_controller.h
+++ b/engines/ultima/ultima4/controllers/combat_controller.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_COMBAT_H
-#define ULTIMA4_COMBAT_H
+#ifndef ULTIMA4_CONTROLLERS_COMBAT_CONTROLLER_H
+#define ULTIMA4_CONTROLLERS_COMBAT_CONTROLLER_H
 
 #include "ultima/ultima4/map/direction.h"
 #include "ultima/ultima4/map/map.h"
diff --git a/engines/ultima/ultima4/controllers/intro_controller.h b/engines/ultima/ultima4/controllers/intro_controller.h
index c9eb33f344..9aad402ab0 100644
--- a/engines/ultima/ultima4/controllers/intro_controller.h
+++ b/engines/ultima/ultima4/controllers/intro_controller.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_INTRO_H
-#define ULTIMA4_INTRO_H
+#ifndef ULTIMA4_CONTROLLERS_INTRO_CONTROLLER_H
+#define ULTIMA4_CONTROLLERS_INTRO_CONTROLLER_H
 
 #include "ultima/ultima4/controllers/controller.h"
 #include "ultima/ultima4/core/observer.h"
diff --git a/engines/ultima/ultima4/conversation/conversation.h b/engines/ultima/ultima4/conversation/conversation.h
index 88a4111c8c..84682700a7 100644
--- a/engines/ultima/ultima4/conversation/conversation.h
+++ b/engines/ultima/ultima4/conversation/conversation.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CONVERSATION_H
-#define ULTIMA4_CONVERSATION_H
+#ifndef ULTIMA4_CONVERSATION_CONVERSATION_H
+#define ULTIMA4_CONVERSATION_CONVERSATION_H
 
 #include "ultima/ultima4/core/utils.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/conversation/dialogueloader.h b/engines/ultima/ultima4/conversation/dialogueloader.h
index 87e44b4a40..7dd4727a6d 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DIALOGUELOADER_H
-#define ULTIMA4_DIALOGUELOADER_H
+#ifndef ULTIMA4_CONVERSATION_DIALOGUELOADER_H
+#define ULTIMA4_CONVERSATION_DIALOGUELOADER_H
 
 #include "common/hashmap.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_hw.h b/engines/ultima/ultima4/conversation/dialogueloader_hw.h
index a01d1262bb..57822bc8b7 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_hw.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_hw.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DIALOGUELOADER_HW_H
-#define ULTIMA4_DIALOGUELOADER_HW_H
+#ifndef ULTIMA4_CONVERSATION_DIALOGUELOADER_HW_H
+#define ULTIMA4_CONVERSATION_DIALOGUELOADER_HW_H
 
 #include "ultima/ultima4/conversation/dialogueloader.h"
 
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_lb.h b/engines/ultima/ultima4/conversation/dialogueloader_lb.h
index 719a78df00..7daa9ded87 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_lb.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_lb.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DIALOGUELOADER_LB_H
-#define ULTIMA4_DIALOGUELOADER_LB_H
+#ifndef ULTIMA4_CONVERSATION_DIALOGUELOADER_LB_H
+#define ULTIMA4_CONVERSATION_DIALOGUELOADER_LB_H
 
 #include "ultima/ultima4/conversation/dialogueloader.h"
 
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_tlk.h b/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
index 9e2e157e7b..d0b75cf928 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DIALOGUELOADER_TLK_H
-#define ULTIMA4_DIALOGUELOADER_TLK_H
+#ifndef ULTIMA4_CONVERSATION_DIALOGUELOADER_TLK_H
+#define ULTIMA4_CONVERSATION_DIALOGUELOADER_TLK_H
 
 #include "ultima/ultima4/conversation/dialogueloader.h"
 
diff --git a/engines/ultima/ultima4/core/config.h b/engines/ultima/ultima4/core/config.h
index 6c7d16fa13..1ab90a79e5 100644
--- a/engines/ultima/ultima4/core/config.h
+++ b/engines/ultima/ultima4/core/config.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CONFIG_H
-#define ULTIMA4_CONFIG_H
+#ifndef ULTIMA4_CORE_CONFIG_H
+#define ULTIMA4_CORE_CONFIG_H
 
 #include "ultima/shared/conf/xml_tree.h"
 #include "ultima/shared/conf/xml_node.h"
diff --git a/engines/ultima/ultima4/core/coords.h b/engines/ultima/ultima4/core/coords.h
index bb0fb5f844..2b09d9b805 100644
--- a/engines/ultima/ultima4/core/coords.h
+++ b/engines/ultima/ultima4/core/coords.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_COORDS_H
-#define ULTIMA4_COORDS_H
+#ifndef ULTIMA4_CORE_COORDS_H
+#define ULTIMA4_CORE_COORDS_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/core/error.h b/engines/ultima/ultima4/core/error.h
index 3c57c41811..063a6ee2b1 100644
--- a/engines/ultima/ultima4/core/error.h
+++ b/engines/ultima/ultima4/core/error.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_ERROR_H
-#define ULTIMA4_ERROR_H
+#ifndef ULTIMA4_CORE_ERROR_H
+#define ULTIMA4_CORE_ERROR_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/core/observable.h b/engines/ultima/ultima4/core/observable.h
index c0c30759df..7f28422b7b 100644
--- a/engines/ultima/ultima4/core/observable.h
+++ b/engines/ultima/ultima4/core/observable.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_OBSERVABLE_H
-#define ULTIMA4_OBSERVABLE_H
+#ifndef ULTIMA4_CORE_OBSERVABLE_H
+#define ULTIMA4_CORE_OBSERVABLE_H
 
 #include "ultima/ultima4/core/observer.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/core/observer.h b/engines/ultima/ultima4/core/observer.h
index 6923fe2414..3fac0f014e 100644
--- a/engines/ultima/ultima4/core/observer.h
+++ b/engines/ultima/ultima4/core/observer.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_OBSERVER_H
-#define ULTIMA4_OBSERVER_H
+#ifndef ULTIMA4_CORE_OBSERVER_H
+#define ULTIMA4_CORE_OBSERVER_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/core/settings.h b/engines/ultima/ultima4/core/settings.h
index ac6401e9c9..a594b98678 100644
--- a/engines/ultima/ultima4/core/settings.h
+++ b/engines/ultima/ultima4/core/settings.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SETTINGS_H
-#define ULTIMA4_SETTINGS_H
+#ifndef ULTIMA4_CORE_SETTINGS_H
+#define ULTIMA4_CORE_SETTINGS_H
 
 #include "ultima/ultima4/core/observable.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/core/types.h b/engines/ultima/ultima4/core/types.h
index 45965fd9c2..579b576e3c 100644
--- a/engines/ultima/ultima4/core/types.h
+++ b/engines/ultima/ultima4/core/types.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TYPEDEFS_H
-#define ULTIMA4_TYPEDEFS_H
+#ifndef ULTIMA4_CORE_TYPEDEFS_H
+#define ULTIMA4_CORE_TYPEDEFS_H
 
 #include "ultima/ultima4/map/direction.h"
 
diff --git a/engines/ultima/ultima4/core/utils.h b/engines/ultima/ultima4/core/utils.h
index 551d828e5c..5b549c9b83 100644
--- a/engines/ultima/ultima4/core/utils.h
+++ b/engines/ultima/ultima4/core/utils.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_UTILS_H
-#define ULTIMA4_UTILS_H
+#ifndef ULTIMA4_CORE_UTILS_H
+#define ULTIMA4_CORE_UTILS_H
 
 #include "ultima/ultima4/filesys/filesystem.h"
 #include "ultima/ultima4/ultima4.h"
diff --git a/engines/ultima/ultima4/events/event.h b/engines/ultima/ultima4/events/event.h
index ee85319f1b..2aab6508ea 100644
--- a/engines/ultima/ultima4/events/event.h
+++ b/engines/ultima/ultima4/events/event.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_EVENT_H
-#define ULTIMA4_EVENT_H
+#ifndef ULTIMA4_EVENTS_EVENT_H
+#define ULTIMA4_EVENTS_EVENT_H
 
 #include "ultima/ultima4/events/event.h"
 #include "ultima/ultima4/events/timed_event_mgr.h"
diff --git a/engines/ultima/ultima4/filesys/filesystem.h b/engines/ultima/ultima4/filesys/filesystem.h
index bd9eeec8ac..5648d43b28 100644
--- a/engines/ultima/ultima4/filesys/filesystem.h
+++ b/engines/ultima/ultima4/filesys/filesystem.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_FILESYSTEM_H
-#define ULTIMA4_FILESYSTEM_H
+#ifndef ULTIMA4_FILESYS_FILESYSTEM_H
+#define ULTIMA4_FILESYS_FILESYSTEM_H
 
 #include "common/list.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/filesys/rle.h b/engines/ultima/ultima4/filesys/rle.h
index 5735e73214..17240e27aa 100644
--- a/engines/ultima/ultima4/filesys/rle.h
+++ b/engines/ultima/ultima4/filesys/rle.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_RLE_H
-#define ULTIMA4_RLE_H
+#ifndef ULTIMA4_FILESYS_RLE_H
+#define ULTIMA4_FILESYS_RLE_H
 
 #include "common/stream.h"
 
diff --git a/engines/ultima/ultima4/filesys/savegame.h b/engines/ultima/ultima4/filesys/savegame.h
index 8d10899717..a6d755502c 100644
--- a/engines/ultima/ultima4/filesys/savegame.h
+++ b/engines/ultima/ultima4/filesys/savegame.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SAVEGAME_H
-#define ULTIMA4_SAVEGAME_H
+#ifndef ULTIMA4_FILESYS_SAVEGAME_H
+#define ULTIMA4_FILESYS_SAVEGAME_H
 
 #include "common/stream.h"
 #include "common/serializer.h"
diff --git a/engines/ultima/ultima4/game/armor.h b/engines/ultima/ultima4/game/armor.h
index 33cadafcb8..89a1b09007 100644
--- a/engines/ultima/ultima4/game/armor.h
+++ b/engines/ultima/ultima4/game/armor.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_ARMOR_H
-#define ULTIMA4_ARMOR_H
+#ifndef ULTIMA4_GAME_ARMOR_H
+#define ULTIMA4_GAME_ARMOR_H
 
 #include "ultima/ultima4/filesys/savegame.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/game/aura.h b/engines/ultima/ultima4/game/aura.h
index 971747ac64..14617b8423 100644
--- a/engines/ultima/ultima4/game/aura.h
+++ b/engines/ultima/ultima4/game/aura.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_AURA_H
-#define ULTIMA4_AURA_H
+#ifndef ULTIMA4_GAME_AURA_H
+#define ULTIMA4_GAME_AURA_H
 
 #include "ultima/ultima4/core/observable.h"
 
diff --git a/engines/ultima/ultima4/game/codex.h b/engines/ultima/ultima4/game/codex.h
index 9e28eca506..519558d997 100644
--- a/engines/ultima/ultima4/game/codex.h
+++ b/engines/ultima/ultima4/game/codex.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CODEX_H
-#define ULTIMA4_CODEX_H
+#ifndef ULTIMA4_GAME_CODEX_H
+#define ULTIMA4_GAME_CODEX_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/context.h b/engines/ultima/ultima4/game/context.h
index 5e35e0d471..380e46f0bf 100644
--- a/engines/ultima/ultima4/game/context.h
+++ b/engines/ultima/ultima4/game/context.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CONTEXT_H
-#define ULTIMA4_CONTEXT_H
+#ifndef ULTIMA4_GAME_CONTEXT_H
+#define ULTIMA4_GAME_CONTEXT_H
 
 #include "ultima/ultima4/map/location.h"
 #include "ultima/ultima4/game/aura.h"
diff --git a/engines/ultima/ultima4/game/creature.h b/engines/ultima/ultima4/game/creature.h
index 24f040003c..ab29007537 100644
--- a/engines/ultima/ultima4/game/creature.h
+++ b/engines/ultima/ultima4/game/creature.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CREATURE_H
-#define ULTIMA4_CREATURE_H
+#ifndef ULTIMA4_GAME_CREATURE_H
+#define ULTIMA4_GAME_CREATURE_H
 
 #include "ultima/ultima4/game/object.h"
 #include "ultima/ultima4/map/movement.h"
diff --git a/engines/ultima/ultima4/game/death.h b/engines/ultima/ultima4/game/death.h
index cd433400dc..0aca84a39b 100644
--- a/engines/ultima/ultima4/game/death.h
+++ b/engines/ultima/ultima4/game/death.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DEATH_H
-#define ULTIMA4_DEATH_H
+#ifndef ULTIMA4_GAME_DEATH_H
+#define ULTIMA4_GAME_DEATH_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/game.h b/engines/ultima/ultima4/game/game.h
index 980a8ca42e..ec81563faf 100644
--- a/engines/ultima/ultima4/game/game.h
+++ b/engines/ultima/ultima4/game/game.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_GAME_H
-#define ULTIMA4_GAME_H
+#ifndef ULTIMA4_GAME_GAME_H
+#define ULTIMA4_GAME_GAME_H
 
 #include "ultima/ultima4/events/event.h"
 #include "ultima/ultima4/controllers/game_controller.h"
diff --git a/engines/ultima/ultima4/game/item.h b/engines/ultima/ultima4/game/item.h
index d5841a8d89..d998861351 100644
--- a/engines/ultima/ultima4/game/item.h
+++ b/engines/ultima/ultima4/game/item.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_ITEM_H
-#define ULTIMA4_ITEM_H
+#ifndef ULTIMA4_GAME_ITEM_H
+#define ULTIMA4_GAME_ITEM_H
 
 #include "ultima/ultima4/core/types.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/game/menuitem.h b/engines/ultima/ultima4/game/menuitem.h
index 1a7da7e9d5..24227188d8 100644
--- a/engines/ultima/ultima4/game/menuitem.h
+++ b/engines/ultima/ultima4/game/menuitem.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MENUITEM_H
-#define ULTIMA4_MENUITEM_H
+#ifndef ULTIMA4_GAME_MENUITEM_H
+#define ULTIMA4_GAME_MENUITEM_H
 
 #include "common/str.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/game/moongate.h b/engines/ultima/ultima4/game/moongate.h
index 7947f8951e..2cb4f1dc5d 100644
--- a/engines/ultima/ultima4/game/moongate.h
+++ b/engines/ultima/ultima4/game/moongate.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MOONGATE_H
-#define ULTIMA4_MOONGATE_H
+#ifndef ULTIMA4_GAME_MOONGATE_H
+#define ULTIMA4_GAME_MOONGATE_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/names.h b/engines/ultima/ultima4/game/names.h
index fcf7bff77e..8bd4756b5a 100644
--- a/engines/ultima/ultima4/game/names.h
+++ b/engines/ultima/ultima4/game/names.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_NAMES_H
-#define ULTIMA4_NAMES_H
+#ifndef ULTIMA4_GAME_NAMES_H
+#define ULTIMA4_GAME_NAMES_H
 
 #include "ultima/ultima4/filesys/savegame.h"
 #include "ultima/ultima4/map/direction.h"
diff --git a/engines/ultima/ultima4/game/object.h b/engines/ultima/ultima4/game/object.h
index 627a4314bb..27357c5360 100644
--- a/engines/ultima/ultima4/game/object.h
+++ b/engines/ultima/ultima4/game/object.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#ifndef ULTIMA4_OBJECT_H
-#define ULTIMA4_OBJECT_H
+#ifndef ULTIMA4_GAME_OBJECT_H
+#define ULTIMA4_GAME_OBJECT_H
 
 #include "ultima/ultima4/core/coords.h"
 #include "ultima/ultima4/map/tile.h"
diff --git a/engines/ultima/ultima4/game/person.h b/engines/ultima/ultima4/game/person.h
index 7d0228470b..3a3cb55479 100644
--- a/engines/ultima/ultima4/game/person.h
+++ b/engines/ultima/ultima4/game/person.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_PERSON_H
-#define ULTIMA4_PERSON_H
+#ifndef ULTIMA4_GAME_PERSON_H
+#define ULTIMA4_GAME_PERSON_H
 
 #include "ultima/ultima4/game/creature.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/game/player.h b/engines/ultima/ultima4/game/player.h
index 303f02050f..6a3912d316 100644
--- a/engines/ultima/ultima4/game/player.h
+++ b/engines/ultima/ultima4/game/player.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_PLAYER_H
-#define ULTIMA4_PLAYER_H
+#ifndef ULTIMA4_GAME_PLAYER_H
+#define ULTIMA4_GAME_PLAYER_H
 
 #include "ultima/ultima4/game/creature.h"
 #include "ultima/ultima4/map/direction.h"
diff --git a/engines/ultima/ultima4/game/portal.h b/engines/ultima/ultima4/game/portal.h
index 6e96a3ef2c..72d131a883 100644
--- a/engines/ultima/ultima4/game/portal.h
+++ b/engines/ultima/ultima4/game/portal.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_PORTAL_H
-#define ULTIMA4_PORTAL_H
+#ifndef ULTIMA4_GAME_PORTAL_H
+#define ULTIMA4_GAME_PORTAL_H
 
 #include "ultima/ultima4/game/context.h"
 #include "ultima/ultima4/map/map.h"
diff --git a/engines/ultima/ultima4/game/script.h b/engines/ultima/ultima4/game/script.h
index 40cf0db022..1937964658 100644
--- a/engines/ultima/ultima4/game/script.h
+++ b/engines/ultima/ultima4/game/script.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SCRIPT_H
-#define ULTIMA4_SCRIPT_H
+#ifndef ULTIMA4_GAME_SCRIPT_H
+#define ULTIMA4_GAME_SCRIPT_H
 
 #include "ultima/ultima4/core/types.h"
 #include "ultima/shared/conf/xml_node.h"
diff --git a/engines/ultima/ultima4/game/spell.h b/engines/ultima/ultima4/game/spell.h
index 396c54a2a8..6cc75e10b3 100644
--- a/engines/ultima/ultima4/game/spell.h
+++ b/engines/ultima/ultima4/game/spell.h
@@ -20,8 +20,8 @@
 *
 */
 
-#ifndef ULTIMA4_SPELL_H
-#define ULTIMA4_SPELL_H
+#ifndef ULTIMA4_GAME_SPELL_H
+#define ULTIMA4_GAME_SPELL_H
 
 #include "ultima/ultima4/game/context.h"
 #include "ultima/ultima4/map/location.h"
diff --git a/engines/ultima/ultima4/game/stats.h b/engines/ultima/ultima4/game/stats.h
index 8dbabe3a4d..c8f45757ae 100644
--- a/engines/ultima/ultima4/game/stats.h
+++ b/engines/ultima/ultima4/game/stats.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_STATS_H
-#define ULTIMA4_STATS_H
+#ifndef ULTIMA4_GAME_STATS_H
+#define ULTIMA4_GAME_STATS_H
 
 #include "ultima/ultima4/core/observable.h"
 #include "ultima/ultima4/core/observer.h"
diff --git a/engines/ultima/ultima4/game/textview.h b/engines/ultima/ultima4/game/textview.h
index d7857dc161..f9feb17fce 100644
--- a/engines/ultima/ultima4/game/textview.h
+++ b/engines/ultima/ultima4/game/textview.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TEXTVIEW_H
-#define ULTIMA4_TEXTVIEW_H
+#ifndef ULTIMA4_GAME_TEXTVIEW_H
+#define ULTIMA4_GAME_TEXTVIEW_H
 
 #include "ultima/ultima4/game/view.h"
 #include "ultima/ultima4/gfx/image.h"
diff --git a/engines/ultima/ultima4/game/view.h b/engines/ultima/ultima4/game/view.h
index fc7ff60628..18947699b7 100644
--- a/engines/ultima/ultima4/game/view.h
+++ b/engines/ultima/ultima4/game/view.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_VIEW_H
-#define ULTIMA4_VIEW_H
+#ifndef ULTIMA4_GAME_VIEW_H
+#define ULTIMA4_GAME_VIEW_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/weapon.h b/engines/ultima/ultima4/game/weapon.h
index 056f53b60e..fbb09a77da 100644
--- a/engines/ultima/ultima4/game/weapon.h
+++ b/engines/ultima/ultima4/game/weapon.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_WEAPON_H
-#define ULTIMA4_WEAPON_H
+#ifndef ULTIMA4_GAME_WEAPON_H
+#define ULTIMA4_GAME_WEAPON_H
 
 #include "ultima/ultima4/filesys/savegame.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/gfx/image.h b/engines/ultima/ultima4/gfx/image.h
index 5c371ce71b..9b57d620e7 100644
--- a/engines/ultima/ultima4/gfx/image.h
+++ b/engines/ultima/ultima4/gfx/image.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGE_H
-#define ULTIMA4_IMAGE_H
+#ifndef ULTIMA4_GFX_IMAGE_H
+#define ULTIMA4_GFX_IMAGE_H
 
 #include "ultima/ultima4/core/types.h"
 #include "ultima/ultima4/filesys/u4file.h"
diff --git a/engines/ultima/ultima4/gfx/imageloader.h b/engines/ultima/ultima4/gfx/imageloader.h
index 7ead5c23b2..382f2629be 100644
--- a/engines/ultima/ultima4/gfx/imageloader.h
+++ b/engines/ultima/ultima4/gfx/imageloader.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGELOADER_H
-#define ULTIMA4_IMAGELOADER_H
+#ifndef ULTIMA4_GFX_IMAGELOADER_H
+#define ULTIMA4_GFX_IMAGELOADER_H
 
 #include "ultima/shared/std/containers.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/gfx/imageloader_fmtowns.h b/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
index 0b76a762da..d30339eadc 100644
--- a/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
+++ b/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGELOADER_FMTOWNS_H_
-#define ULTIMA4_IMAGELOADER_FMTOWNS_H_
+#ifndef ULTIMA4_GFX_IMAGELOADER_FMTOWNS_H_
+#define ULTIMA4_GFX_IMAGELOADER_FMTOWNS_H_
 
 #include "ultima/ultima4/gfx/imageloader.h"
 
diff --git a/engines/ultima/ultima4/gfx/imageloader_png.h b/engines/ultima/ultima4/gfx/imageloader_png.h
index 725397ef68..c9fe827dbc 100644
--- a/engines/ultima/ultima4/gfx/imageloader_png.h
+++ b/engines/ultima/ultima4/gfx/imageloader_png.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGELOADER_PNG_H
-#define ULTIMA4_IMAGELOADER_PNG_H
+#ifndef ULTIMA4_GFX_IMAGELOADER_PNG_H
+#define ULTIMA4_GFX_IMAGELOADER_PNG_H
 
 #include "ultima/ultima4/gfx/imageloader.h"
 
diff --git a/engines/ultima/ultima4/gfx/imageloader_u4.h b/engines/ultima/ultima4/gfx/imageloader_u4.h
index 6ba0c1d7f8..f53a709e75 100644
--- a/engines/ultima/ultima4/gfx/imageloader_u4.h
+++ b/engines/ultima/ultima4/gfx/imageloader_u4.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGELOADER_U4_H
-#define ULTIMA4_IMAGELOADER_U4_H
+#ifndef ULTIMA4_GFX_IMAGELOADER_U4_H
+#define ULTIMA4_GFX_IMAGELOADER_U4_H
 
 #include "ultima/ultima4/gfx/imageloader.h"
 
diff --git a/engines/ultima/ultima4/gfx/imagemgr.h b/engines/ultima/ultima4/gfx/imagemgr.h
index e203ccf691..fde538077a 100644
--- a/engines/ultima/ultima4/gfx/imagemgr.h
+++ b/engines/ultima/ultima4/gfx/imagemgr.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGEMGR_H
-#define ULTIMA4_IMAGEMGR_H
+#ifndef ULTIMA4_GFX_IMAGEMGR_H
+#define ULTIMA4_GFX_IMAGEMGR_H
 
 #include "ultima/ultima4/gfx/image.h"
 #include "ultima/ultima4/core/observer.h"
diff --git a/engines/ultima/ultima4/gfx/imageview.h b/engines/ultima/ultima4/gfx/imageview.h
index 53689a8763..9ee8faff06 100644
--- a/engines/ultima/ultima4/gfx/imageview.h
+++ b/engines/ultima/ultima4/gfx/imageview.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_IMAGEVIEW_H
-#define ULTIMA4_IMAGEVIEW_H
+#ifndef ULTIMA4_GFX_IMAGEVIEW_H
+#define ULTIMA4_GFX_IMAGEVIEW_H
 
 #include "ultima/ultima4/game/view.h"
 
diff --git a/engines/ultima/ultima4/gfx/scale.h b/engines/ultima/ultima4/gfx/scale.h
index 4b37225637..a1f7d77a36 100644
--- a/engines/ultima/ultima4/gfx/scale.h
+++ b/engines/ultima/ultima4/gfx/scale.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SCALE_H
-#define ULTIMA4_SCALE_H
+#ifndef ULTIMA4_GFX_SCALE_H
+#define ULTIMA4_GFX_SCALE_H
 
 #include "ultima/ultima4/core/settings.h"
 #include "common/str.h"
diff --git a/engines/ultima/ultima4/gfx/screen.h b/engines/ultima/ultima4/gfx/screen.h
index aa8b78e547..67cc999728 100644
--- a/engines/ultima/ultima4/gfx/screen.h
+++ b/engines/ultima/ultima4/gfx/screen.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SCREEN_H
-#define ULTIMA4_SCREEN_H
+#ifndef ULTIMA4_GFX_SCREEN_H
+#define ULTIMA4_GFX_SCREEN_H
 
 #include "graphics/screen.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/gfx/textcolor.h b/engines/ultima/ultima4/gfx/textcolor.h
index ad1bf880f3..ca56de8a92 100644
--- a/engines/ultima/ultima4/gfx/textcolor.h
+++ b/engines/ultima/ultima4/gfx/textcolor.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TEXTCOLOR_H
-#define ULTIMA4_TEXTCOLOR_H
+#ifndef ULTIMA4_GFX_TEXTCOLOR_H
+#define ULTIMA4_GFX_TEXTCOLOR_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/map/annotation.h b/engines/ultima/ultima4/map/annotation.h
index 9d342b7d7c..6c5d96007d 100644
--- a/engines/ultima/ultima4/map/annotation.h
+++ b/engines/ultima/ultima4/map/annotation.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_ANNOTATION_H
-#define ULTIMA4_ANNOTATION_H
+#ifndef ULTIMA4_MAP_ANNOTATION_H
+#define ULTIMA4_MAP_ANNOTATION_H
 
 #include "ultima/ultima4/core/coords.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/map/area.h b/engines/ultima/ultima4/map/area.h
index 8703abcf08..6a552754b2 100644
--- a/engines/ultima/ultima4/map/area.h
+++ b/engines/ultima/ultima4/map/area.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_AREA_H
-#define ULTIMA4_AREA_H
+#ifndef ULTIMA4_MAP_AREA_H
+#define ULTIMA4_MAP_AREA_H
 
 #include "ultima/ultima4/map/map.h"
 
diff --git a/engines/ultima/ultima4/map/city.h b/engines/ultima/ultima4/map/city.h
index 4eb8754216..a3d12a5d4d 100644
--- a/engines/ultima/ultima4/map/city.h
+++ b/engines/ultima/ultima4/map/city.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_CITY_H
-#define ULTIMA4_CITY_H
+#ifndef ULTIMA4_MAP_CITY_H
+#define ULTIMA4_MAP_CITY_H
 
 #include "ultima/ultima4/map/map.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/map/direction.h b/engines/ultima/ultima4/map/direction.h
index 9737b80c7b..5b46915a92 100644
--- a/engines/ultima/ultima4/map/direction.h
+++ b/engines/ultima/ultima4/map/direction.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DIRECTION_H
-#define ULTIMA4_DIRECTION_H
+#ifndef ULTIMA4_MAP_DIRECTION_H
+#define ULTIMA4_MAP_DIRECTION_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/map/dungeon.h b/engines/ultima/ultima4/map/dungeon.h
index 4597008b1f..4fbce7ee66 100644
--- a/engines/ultima/ultima4/map/dungeon.h
+++ b/engines/ultima/ultima4/map/dungeon.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DUNGEON_H
-#define ULTIMA4_DUNGEON_H
+#ifndef ULTIMA4_MAP_DUNGEON_H
+#define ULTIMA4_MAP_DUNGEON_H
 
 #include "ultima/ultima4/controllers/combat_controller.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/map/dungeonview.h b/engines/ultima/ultima4/map/dungeonview.h
index e6b1cc0628..439605272a 100644
--- a/engines/ultima/ultima4/map/dungeonview.h
+++ b/engines/ultima/ultima4/map/dungeonview.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_DUNGEONVIEW_H
-#define ULTIMA4_DUNGEONVIEW_H
+#ifndef ULTIMA4_MAP_DUNGEONVIEW_H
+#define ULTIMA4_MAP_DUNGEONVIEW_H
 
 #include "ultima/ultima4/game/context.h"
 #include "ultima/ultima4/map/dungeon.h"
diff --git a/engines/ultima/ultima4/map/location.h b/engines/ultima/ultima4/map/location.h
index 54a15ff702..1e6cc5310e 100644
--- a/engines/ultima/ultima4/map/location.h
+++ b/engines/ultima/ultima4/map/location.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_LOCATION_H
-#define ULTIMA4_LOCATION_H
+#ifndef ULTIMA4_MAP_LOCATION_H
+#define ULTIMA4_MAP_LOCATION_H
 
 #include "ultima/ultima4/map/map.h"
 #include "ultima/ultima4/map/movement.h"
diff --git a/engines/ultima/ultima4/map/map.h b/engines/ultima/ultima4/map/map.h
index 729466e4df..10c2454985 100644
--- a/engines/ultima/ultima4/map/map.h
+++ b/engines/ultima/ultima4/map/map.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MAP_H
-#define ULTIMA4_MAP_H
+#ifndef ULTIMA4_MAP_MAP_H
+#define ULTIMA4_MAP_MAP_H
 
 #include "ultima/ultima4/core/coords.h"
 #include "ultima/ultima4/map/direction.h"
diff --git a/engines/ultima/ultima4/map/maploader.h b/engines/ultima/ultima4/map/maploader.h
index 1377cbb98e..7ddc8f2f9e 100644
--- a/engines/ultima/ultima4/map/maploader.h
+++ b/engines/ultima/ultima4/map/maploader.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MAPLOADER_H
-#define ULTIMA4_MAPLOADER_H
+#ifndef ULTIMA4_MAP_MAPLOADER_H
+#define ULTIMA4_MAP_MAPLOADER_H
 
 #include "ultima/ultima4/map/map.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/map/mapmgr.h b/engines/ultima/ultima4/map/mapmgr.h
index 106b07c890..c6c6430afd 100644
--- a/engines/ultima/ultima4/map/mapmgr.h
+++ b/engines/ultima/ultima4/map/mapmgr.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MAPMGR_H
-#define ULTIMA4_MAPMGR_H
+#ifndef ULTIMA4_MAP_MAPMGR_H
+#define ULTIMA4_MAP_MAPMGR_H
 
 #include "ultima/ultima4/map/map.h"
 #include "ultima/shared/std/misc.h"
diff --git a/engines/ultima/ultima4/map/movement.h b/engines/ultima/ultima4/map/movement.h
index 1c277a0a53..20da646d31 100644
--- a/engines/ultima/ultima4/map/movement.h
+++ b/engines/ultima/ultima4/map/movement.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MOVEMENT_H
-#define ULTIMA4_MOVEMENT_H
+#ifndef ULTIMA4_MAP_MOVEMENT_H
+#define ULTIMA4_MAP_MOVEMENT_H
 
 #include "ultima/ultima4/map/direction.h"
 #include "ultima/ultima4/map/map.h"
diff --git a/engines/ultima/ultima4/map/shrine.h b/engines/ultima/ultima4/map/shrine.h
index 2378580207..f3b573a73f 100644
--- a/engines/ultima/ultima4/map/shrine.h
+++ b/engines/ultima/ultima4/map/shrine.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SHRINE_H
-#define ULTIMA4_SHRINE_H
+#ifndef ULTIMA4_MAP_SHRINE_H
+#define ULTIMA4_MAP_SHRINE_H
 
 #include "ultima/ultima4/map/map.h"
 #include "ultima/ultima4/filesys/savegame.h"
diff --git a/engines/ultima/ultima4/map/tile.h b/engines/ultima/ultima4/map/tile.h
index 680506eb05..b0da014d82 100644
--- a/engines/ultima/ultima4/map/tile.h
+++ b/engines/ultima/ultima4/map/tile.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TILE_H
-#define ULTIMA4_TILE_H
+#ifndef ULTIMA4_MAP_TILE_H
+#define ULTIMA4_MAP_TILE_H
 
 #include "ultima/ultima4/map/direction.h"
 #include "ultima/ultima4/core/types.h"
diff --git a/engines/ultima/ultima4/map/tileanim.h b/engines/ultima/ultima4/map/tileanim.h
index 995bd286ea..6afe7bc67c 100644
--- a/engines/ultima/ultima4/map/tileanim.h
+++ b/engines/ultima/ultima4/map/tileanim.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TILEANIM_H
-#define ULTIMA4_TILEANIM_H
+#ifndef ULTIMA4_MAP_TILEANIM_H
+#define ULTIMA4_MAP_TILEANIM_H
 
 #include "ultima/ultima4/map/direction.h"
 
diff --git a/engines/ultima/ultima4/map/tilemap.h b/engines/ultima/ultima4/map/tilemap.h
index ac7e62451b..c2caa986a6 100644
--- a/engines/ultima/ultima4/map/tilemap.h
+++ b/engines/ultima/ultima4/map/tilemap.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TILEMAP_H
-#define ULTIMA4_TILEMAP_H
+#ifndef ULTIMA4_MAP_TILEMAP_H
+#define ULTIMA4_MAP_TILEMAP_H
 
 #include "ultima/ultima4/core/types.h"
 #include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/ultima4/map/tileset.h b/engines/ultima/ultima4/map/tileset.h
index c7ab4cfa0b..27da4431a8 100644
--- a/engines/ultima/ultima4/map/tileset.h
+++ b/engines/ultima/ultima4/map/tileset.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TILESET_H
-#define ULTIMA4_TILESET_H
+#ifndef ULTIMA4_MAP_TILESET_H
+#define ULTIMA4_MAP_TILESET_H
 
 #include "ultima/ultima4/core/types.h"
 #include "common/hash-str.h"
diff --git a/engines/ultima/ultima4/map/tileview.h b/engines/ultima/ultima4/map/tileview.h
index c551985c7d..81a874abd3 100644
--- a/engines/ultima/ultima4/map/tileview.h
+++ b/engines/ultima/ultima4/map/tileview.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_TILEVIEW_H
-#define ULTIMA4_TILEVIEW_H
+#ifndef ULTIMA4_MAP_TILEVIEW_H
+#define ULTIMA4_MAP_TILEVIEW_H
 
 #include "ultima/ultima4/game/view.h"
 
diff --git a/engines/ultima/ultima4/sound/music.h b/engines/ultima/ultima4/sound/music.h
index cd4a2ade3c..b85f8d5cba 100644
--- a/engines/ultima/ultima4/sound/music.h
+++ b/engines/ultima/ultima4/sound/music.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_MUSIC_H
-#define ULTIMA4_MUSIC_H
+#ifndef ULTIMA4_SOUND_MUSIC_H
+#define ULTIMA4_SOUND_MUSIC_H
 
 #include "ultima/shared/std/containers.h"
 #include "audio/audiostream.h"
diff --git a/engines/ultima/ultima4/sound/sound.h b/engines/ultima/ultima4/sound/sound.h
index 9cc3eea82c..b9f86992fa 100644
--- a/engines/ultima/ultima4/sound/sound.h
+++ b/engines/ultima/ultima4/sound/sound.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SOUND_H
-#define ULTIMA4_SOUND_H
+#ifndef ULTIMA4_SOUND_SOUND_H
+#define ULTIMA4_SOUND_SOUND_H
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/sound/sound_p.h b/engines/ultima/ultima4/sound/sound_p.h
index d748cdb1b3..dd7bb1526a 100644
--- a/engines/ultima/ultima4/sound/sound_p.h
+++ b/engines/ultima/ultima4/sound/sound_p.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef ULTIMA4_SOUND_P_H
-#define ULTIMA4_SOUND_P_H
+#ifndef ULTIMA4_SOUND_SOUND_P_H
+#define ULTIMA4_SOUND_SOUND_P_H
 
 #include "ultima/ultima4/sound/sound.h"
 #include "ultima/shared/std/containers.h"


Commit: d942d49a76e7276e5dac405ed542ec6764acbb86
    https://github.com/scummvm/scummvm/commit/d942d49a76e7276e5dac405ed542ec6764acbb86
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-16T21:46:36-07:00

Commit Message:
ULTIMA4: Turn off keybindings for controllers that don't need it

Changed paths:
    engines/ultima/ultima4/controllers/controller.cpp
    engines/ultima/ultima4/controllers/controller.h
    engines/ultima/ultima4/controllers/game_controller.cpp
    engines/ultima/ultima4/controllers/game_controller.h
    engines/ultima/ultima4/controllers/read_dir_controller.cpp
    engines/ultima/ultima4/controllers/read_dir_controller.h
    engines/ultima/ultima4/events/event.cpp


diff --git a/engines/ultima/ultima4/controllers/controller.cpp b/engines/ultima/ultima4/controllers/controller.cpp
index 50f086848a..871ed53ba8 100644
--- a/engines/ultima/ultima4/controllers/controller.cpp
+++ b/engines/ultima/ultima4/controllers/controller.cpp
@@ -45,6 +45,11 @@ int Controller::getTimerInterval() {
 	return _timerInterval;
 }
 
+void Controller::setActive() {
+	// Controllers by default won't use the keybindings
+	MetaEngine::setKeybindingsActive(false);
+}
+
 void Controller::timerFired() {
 }
 
diff --git a/engines/ultima/ultima4/controllers/controller.h b/engines/ultima/ultima4/controllers/controller.h
index 012f367c89..642c19f1f3 100644
--- a/engines/ultima/ultima4/controllers/controller.h
+++ b/engines/ultima/ultima4/controllers/controller.h
@@ -59,6 +59,15 @@ public:
 	static void timerCallback(void *data);
 
 	/** control methods subclasses may want to override */
+
+	/**
+	 * Called when a controller is made active
+	 */
+	virtual void setActive();
+
+	/**
+	 * Key was pressed
+	 */
 	virtual bool keyPressed(int key) = 0;
 
 	/**
diff --git a/engines/ultima/ultima4/controllers/game_controller.cpp b/engines/ultima/ultima4/controllers/game_controller.cpp
index e6d8f57c29..123857618f 100644
--- a/engines/ultima/ultima4/controllers/game_controller.cpp
+++ b/engines/ultima/ultima4/controllers/game_controller.cpp
@@ -330,6 +330,11 @@ void GameController::update(Location *location, MoveEvent &event) {
 	}
 }
 
+void GameController::setActive() {
+	// The game controller has the keybindings enabled
+	MetaEngine::setKeybindingsActive(true);
+}
+
 void GameController::keybinder(KeybindingAction action) {
 	MetaEngine::executeAction(action);
 }
diff --git a/engines/ultima/ultima4/controllers/game_controller.h b/engines/ultima/ultima4/controllers/game_controller.h
index 6ba364b1ec..af3b2ddb99 100644
--- a/engines/ultima/ultima4/controllers/game_controller.h
+++ b/engines/ultima/ultima4/controllers/game_controller.h
@@ -49,6 +49,11 @@ public:
 
 	/* controller functions */
 
+	/**
+	 * Called when a controller is made active
+	 */
+	void setActive() override;
+
 	/**
 	 * Keybinder actions
 	 */
diff --git a/engines/ultima/ultima4/controllers/read_dir_controller.cpp b/engines/ultima/ultima4/controllers/read_dir_controller.cpp
index 11bf12f568..ca339bf4e1 100644
--- a/engines/ultima/ultima4/controllers/read_dir_controller.cpp
+++ b/engines/ultima/ultima4/controllers/read_dir_controller.cpp
@@ -22,6 +22,7 @@
 
 #include "ultima/ultima4/controllers/read_dir_controller.h"
 #include "ultima/ultima4/map/direction.h"
+#include "ultima/ultima4/meta_engine.h"
 
 namespace Ultima {
 namespace Ultima4 {
@@ -31,6 +32,11 @@ ReadDirController::ReadDirController() {
 	_value = DIR_NONE;
 }
 
+void ReadDirController::setActive() {
+	// Have the keybinder active for the direction keys
+	MetaEngine::setKeybindingsActive(true);
+}
+
 void ReadDirController::keybinder(KeybindingAction action) {
 	switch (action) {
 	case KEYBIND_UP:
diff --git a/engines/ultima/ultima4/controllers/read_dir_controller.h b/engines/ultima/ultima4/controllers/read_dir_controller.h
index 6f706ef59a..afaf0e4bd2 100644
--- a/engines/ultima/ultima4/controllers/read_dir_controller.h
+++ b/engines/ultima/ultima4/controllers/read_dir_controller.h
@@ -36,6 +36,11 @@ class ReadDirController : public WaitableController<Direction> {
 public:
 	ReadDirController();
 
+	/**
+	 * Called when a controller is made active
+	 */
+	void setActive() override;
+
 	/**
 	 * Key was pressed
 	 */
diff --git a/engines/ultima/ultima4/events/event.cpp b/engines/ultima/ultima4/events/event.cpp
index 1e80cc1979..aa1ede9414 100644
--- a/engines/ultima/ultima4/events/event.cpp
+++ b/engines/ultima/ultima4/events/event.cpp
@@ -38,9 +38,9 @@ using namespace Std;
 bool EventHandler::_controllerDone = false;
 bool EventHandler::_ended = false;
 
-EventHandler *EventHandler::_instance = NULL;
+EventHandler *EventHandler::_instance = nullptr;
 EventHandler *EventHandler::getInstance() {
-	if (_instance == NULL)
+	if (_instance == nullptr)
 		_instance = new EventHandler();
 	return _instance;
 }
@@ -85,6 +85,7 @@ TimedEventMgr *EventHandler::getTimer()  {
 }
 
 Controller *EventHandler::pushController(Controller *c) {
+	c->setActive();
 	_controllers.push_back(c);
 	getTimer()->add(&Controller::timerCallback, c->getTimerInterval(), c);
 	return c;
@@ -92,24 +93,28 @@ Controller *EventHandler::pushController(Controller *c) {
 
 Controller *EventHandler::popController() {
 	if (_controllers.empty())
-		return NULL;
+		return nullptr;
 
 	Controller *controller = _controllers.back();
 	getTimer()->remove(&Controller::timerCallback, controller);
 	_controllers.pop_back();
 
-	return getController();
+	controller = getController();
+	if (controller)
+		controller->setActive();
+
+	return controller;
 }
 
 Controller *EventHandler::getController() const {
 	if (_controllers.empty())
-		return NULL;
+		return nullptr;
 
 	return _controllers.back();
 }
 
 void EventHandler::setController(Controller *c) {
-	while (popController() != NULL) {}
+	while (popController() != nullptr) {}
 	pushController(c);
 }
 
@@ -126,7 +131,7 @@ const MouseArea *EventHandler::getMouseAreaSet() const {
 	if (_mouseAreaSets.size())
 		return _mouseAreaSets.front();
 	else
-		return NULL;
+		return nullptr;
 }
 
 } // End of namespace Ultima4

More information about the Scummvm-git-logs mailing list