aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/xeen/character.cpp6
-rw-r--r--engines/xeen/dialogs_message.cpp (renamed from engines/xeen/dialogs_error.cpp)12
-rw-r--r--engines/xeen/dialogs_message.h (renamed from engines/xeen/dialogs_error.h)18
-rw-r--r--engines/xeen/interface.cpp2
-rw-r--r--engines/xeen/interface_scene.cpp2
-rw-r--r--engines/xeen/locations.h2
-rw-r--r--engines/xeen/module.mk2
-rw-r--r--engines/xeen/party.cpp6
-rw-r--r--engines/xeen/party.h6
9 files changed, 28 insertions, 28 deletions
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index fb9d7e9cd5..456e12477f 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -22,7 +22,7 @@
#include "xeen/character.h"
#include "xeen/dialogs_query.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/resources.h"
#include "xeen/xeen.h"
@@ -215,10 +215,10 @@ void InventoryItems::equipError(int itemIndex1, ItemCategory category1, int item
Common::String itemName1 = _character->_items[category1].getName(itemIndex1);
Common::String itemName2 = _character->_items[category2].getName(itemIndex2);
- ErrorDialog::show(vm, Common::String::format(Res.REMOVE_X_TO_EQUIP_Y,
+ MessageDialog::show(vm, Common::String::format(Res.REMOVE_X_TO_EQUIP_Y,
itemName1.c_str(), itemName2.c_str()));
} else {
- ErrorDialog::show(vm, Common::String::format(Res.EQUIPPED_ALL_YOU_CAN,
+ MessageDialog::show(vm, Common::String::format(Res.EQUIPPED_ALL_YOU_CAN,
(itemIndex1 == -1) ? Res.RING : Res.MEDAL));
}
}
diff --git a/engines/xeen/dialogs_error.cpp b/engines/xeen/dialogs_message.cpp
index 954d973cd2..039680249f 100644
--- a/engines/xeen/dialogs_error.cpp
+++ b/engines/xeen/dialogs_message.cpp
@@ -21,19 +21,19 @@
*/
#include "common/scummsys.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/events.h"
#include "xeen/xeen.h"
namespace Xeen {
-void ErrorDialog::show(XeenEngine *vm, const Common::String &msg, ErrorWaitType waitType) {
- ErrorDialog *dlg = new ErrorDialog(vm);
+void MessageDialog::show(XeenEngine *vm, const Common::String &msg, MessageWaitType waitType) {
+ MessageDialog *dlg = new MessageDialog(vm);
dlg->execute(msg, waitType);
delete dlg;
}
-void ErrorDialog::execute(const Common::String &msg, ErrorWaitType waitType) {
+void MessageDialog::execute(const Common::String &msg, MessageWaitType waitType) {
EventsManager &events = *_vm->_events;
Windows &windows = *_vm->_windows;
Window &w = windows[6];
@@ -81,9 +81,9 @@ void ErrorDialog::execute(const Common::String &msg, ErrorWaitType waitType) {
/*------------------------------------------------------------------------*/
-void ErrorScroll::show(XeenEngine *vm, const Common::String &msg, ErrorWaitType waitType) {
+void ErrorScroll::show(XeenEngine *vm, const Common::String &msg, MessageWaitType waitType) {
Common::String s = Common::String::format("\x3""c\v010\t000%s", msg.c_str());
- ErrorDialog::show(vm, s, waitType);
+ MessageDialog::show(vm, s, waitType);
}
/*------------------------------------------------------------------------*/
diff --git a/engines/xeen/dialogs_error.h b/engines/xeen/dialogs_message.h
index 577b7d70d4..e092b30670 100644
--- a/engines/xeen/dialogs_error.h
+++ b/engines/xeen/dialogs_message.h
@@ -20,31 +20,31 @@
*
*/
-#ifndef XEEN_DIALOGS_ERROR_H
-#define XEEN_DIALOGS_ERROR_H
+#ifndef XEEN_dialogs_message_H
+#define XEEN_dialogs_message_H
#include "xeen/dialogs.h"
#include "xeen/character.h"
namespace Xeen {
-enum ErrorWaitType { WT_FREEZE_WAIT = 0, WT_NONFREEZED_WAIT = 1,
+enum MessageWaitType { WT_FREEZE_WAIT = 0, WT_NONFREEZED_WAIT = 1,
WT_LOC_WAIT = 2, WT_ANIMATED_WAIT = 3 };
-class ErrorDialog : public ButtonContainer {
+class MessageDialog : public ButtonContainer {
private:
- ErrorDialog(XeenEngine *vm) : ButtonContainer(vm) {}
+ MessageDialog(XeenEngine *vm) : ButtonContainer(vm) {}
- void execute(const Common::String &msg, ErrorWaitType waitType);
+ void execute(const Common::String &msg, MessageWaitType waitType);
public:
static void show(XeenEngine *vm, const Common::String &msg,
- ErrorWaitType waitType = WT_FREEZE_WAIT);
+ MessageWaitType waitType = WT_FREEZE_WAIT);
};
class ErrorScroll {
public:
static void show(XeenEngine *vm, const Common::String &msg,
- ErrorWaitType waitType = WT_FREEZE_WAIT);
+ MessageWaitType waitType = WT_FREEZE_WAIT);
};
class CantCast: public ButtonContainer {
@@ -58,4 +58,4 @@ public:
} // End of namespace Xeen
-#endif /* XEEN_DIALOGS_ERROR_H */
+#endif /* XEEN_dialogs_message_H */
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index c31097ea5c..456a7879b4 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -23,7 +23,7 @@
#include "xeen/interface.h"
#include "xeen/dialogs_char_info.h"
#include "xeen/dialogs_control_panel.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/dialogs_fight_options.h"
#include "xeen/dialogs_info.h"
#include "xeen/dialogs_items.h"
diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp
index 42015017b2..d937dce846 100644
--- a/engines/xeen/interface_scene.cpp
+++ b/engines/xeen/interface_scene.cpp
@@ -21,7 +21,7 @@
*/
#include "xeen/interface_scene.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/resources.h"
#include "xeen/xeen.h"
diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h
index 2df4b9240d..60860859e8 100644
--- a/engines/xeen/locations.h
+++ b/engines/xeen/locations.h
@@ -26,7 +26,7 @@
#include "common/scummsys.h"
#include "common/str-array.h"
#include "xeen/dialogs.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/party.h"
namespace Xeen {
diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index 2e11e1936e..36a6bd9faa 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -16,13 +16,13 @@ MODULE_OBJS := \
dialogs_char_info.o \
dialogs_control_panel.o \
dialogs_dismiss.o \
- dialogs_error.o \
dialogs_exchange.o \
dialogs_fight_options.o \
dialogs_info.o \
dialogs_input.o \
dialogs_items.o \
dialogs_map.o \
+ dialogs_message.o \
dialogs_party.o \
dialogs_query.o \
dialogs_quests.o \
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index 8f6e6d3d8e..15e7a21b01 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -23,7 +23,7 @@
#include "common/scummsys.h"
#include "common/algorithm.h"
#include "xeen/party.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
#include "xeen/dialogs_input.h"
#include "xeen/files.h"
#include "xeen/resources.h"
@@ -480,7 +480,7 @@ void Party::handleLight() {
(map.mazeData()._mazeFlags2 & FLAG_IS_DARK) == 0 ? OBSCURITY_NONE : OBSCURITY_BLACK;
}
-int Party::subtract(ConsumableType consumableId, uint amount, PartyBank whereId, ErrorWaitType wait) {
+int Party::subtract(ConsumableType consumableId, uint amount, PartyBank whereId, MessageWaitType wait) {
switch (consumableId) {
case CONS_GOLD:
// Gold
@@ -537,7 +537,7 @@ int Party::subtract(ConsumableType consumableId, uint amount, PartyBank whereId,
return true;
}
-void Party::notEnough(ConsumableType consumableId, PartyBank whereId, bool mode, ErrorWaitType wait) {
+void Party::notEnough(ConsumableType consumableId, PartyBank whereId, bool mode, MessageWaitType wait) {
assert(consumableId < 4 && whereId < 2);
Common::String msg = Common::String::format(
mode ? Res.NO_X_IN_THE_Y : Res.NOT_ENOUGH_X_IN_THE_Y,
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index 9262417a26..ce2a999619 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -29,7 +29,7 @@
#include "common/serializer.h"
#include "xeen/character.h"
#include "xeen/combat.h"
-#include "xeen/dialogs_error.h"
+#include "xeen/dialogs_message.h"
namespace Xeen {
@@ -198,9 +198,9 @@ public:
void handleLight();
- int subtract(ConsumableType consumableId, uint amount, PartyBank whereId, ErrorWaitType wait = WT_FREEZE_WAIT);
+ int subtract(ConsumableType consumableId, uint amount, PartyBank whereId, MessageWaitType wait = WT_FREEZE_WAIT);
- void notEnough(ConsumableType consumableId, PartyBank whereId, bool mode, ErrorWaitType wait);
+ void notEnough(ConsumableType consumableId, PartyBank whereId, bool mode, MessageWaitType wait);
void checkPartyDead();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 20:06:45 +0000