Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. v0.6.2-1388-gb4426eb
|
From: Jaka K. <lyn...@us...> - 2011-07-16 11:03:33
|
gemrb: Infinity Engine emulator
The branch master has been updated
via b4426eb27faa098ec06bd5319015b0e0558ea18f (commit)
via 80982ab204efb19ed5959b6f28749866bac0bd79 (commit)
Summary of changes:
gemrb/core/SaveGameIterator.cpp | 17 ++++++++++++++---
gemrb/includes/strrefs.h | 3 ++-
gemrb/override/bg1/strings.2da | 1 +
gemrb/override/bg2/strings.2da | 1 +
gemrb/override/how/strings.2da | 1 +
gemrb/override/iwd/strings.2da | 1 +
gemrb/override/iwd2/strings.2da | 1 +
gemrb/override/pst/strings.2da | 1 +
8 files changed, 22 insertions(+), 4 deletions(-)
from 93192b913dcc75d716759db1acd3c80095e52c2a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b4426eb27faa098ec06bd5319015b0e0558ea18f
commit b4426eb27faa098ec06bd5319015b0e0558ea18f
Author: Jaka Kranjc <lyn...@us...>
Date: Sat Jul 16 13:02:25 2011 +0200
CanSave: display the relevant error message when saving isn't allowed
diff --git a/gemrb/core/SaveGameIterator.cpp b/gemrb/core/SaveGameIterator.cpp
index f2406c6..380a030 100644
--- a/gemrb/core/SaveGameIterator.cpp
+++ b/gemrb/core/SaveGameIterator.cpp
@@ -459,32 +459,39 @@ static int CanSave()
//some of these restrictions might not be needed
Store * store = core->GetCurrentStore();
if (store) {
+ displaymsg->DisplayConstantString(STR_CANTSAVESTORE, 0xbcefbc);
return 1; //can't save while store is open
}
GameControl *gc = core->GetGameControl();
if (!gc) {
+ displaymsg->DisplayConstantString(STR_CANTSAVE, 0xbcefbc);
return -1; //no gamecontrol!!!
}
if (gc->GetDialogueFlags()&DF_IN_DIALOG) {
- return 2; //can't save while in dialog?
+ displaymsg->DisplayConstantString(STR_CANTSAVEDIALOG, 0xbcefbc);
+ return 2; //can't save while in dialog
}
//TODO: can't save while in combat
Game *game = core->GetGame();
if (!game) {
+ displaymsg->DisplayConstantString(STR_CANTSAVE, 0xbcefbc);
return -1;
}
if (game->CombatCounter) {
+ displaymsg->DisplayConstantString(STR_CANTSAVECOMBAT, 0xbcefbc);
return 3;
}
Map *map = game->GetCurrentArea();
if (!map) {
+ displaymsg->DisplayConstantString(STR_CANTSAVE, 0xbcefbc);
return -1;
}
if (map->AreaFlags&AF_SAVE) {
//cannot save in area
+ displaymsg->DisplayConstantString(STR_CANTSAVEMONS, 0xbcefbc);
return 4;
}
@@ -494,16 +501,20 @@ static int CanSave()
//TODO: can't save while (party) actors are in helpless states
if (actor->GetStat(IE_STATE_ID) & STATE_NOSAVE) {
//some actor is in nosave state
+ displaymsg->DisplayConstantString(STR_CANTSAVENOCTRL, 0xbcefbc);
return 5;
}
if (actor->GetCurrentArea()!=map) {
//scattered
+ displaymsg->DisplayConstantString(STR_CANTSAVE, 0xbcefbc);
return 6;
}
}
- //TODO: can't save while AOE spells are in effect
- //TODO: can't save while IF_NOINT is set on any actor
+ //TODO: can't save while AOE spells are in effect -> CANTSAVE
+ //TODO: can't save while IF_NOINT is set on any actor -> CANTSAVEDIALOG2 (dialog about to start)
+ //TODO: can't save during a rest, chapter information or movie -> CANTSAVEMOVIE
+ //TODO: can't save while enemies are visible? AnyPCSeesEnemy -> CANTSAVEMONS
return 0;
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=80982ab204efb19ed5959b6f28749866bac0bd79
commit 80982ab204efb19ed5959b6f28749866bac0bd79
Author: Jaka Kranjc <lyn...@us...>
Date: Sat Jul 16 13:01:28 2011 +0200
added strref for erroring out on saving while in stores
diff --git a/gemrb/includes/strrefs.h b/gemrb/includes/strrefs.h
index 369c60c..040d0d3 100644
--- a/gemrb/includes/strrefs.h
+++ b/gemrb/includes/strrefs.h
@@ -197,6 +197,7 @@
#define STR_FAMBLOCK 164
#define STR_FAMPROTAGONIST 165
#define STR_MAGIC_RESISTED 166
-#define STRREF_COUNT 167
+#define STR_CANTSAVESTORE 167
+#define STRREF_COUNT 168
#endif //! IE_STRINGS_H
diff --git a/gemrb/override/bg1/strings.2da b/gemrb/override/bg1/strings.2da
index ecdd6eb..c52abd5 100644
--- a/gemrb/override/bg1/strings.2da
+++ b/gemrb/override/bg1/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE -1
FAMBLOCK -1
FAMPROTAGONIST -1
MAGIC_RESISTED 19224
+CANTSAVESTORE 10841
diff --git a/gemrb/override/bg2/strings.2da b/gemrb/override/bg2/strings.2da
index 5a78d33..7cc22bb 100644
--- a/gemrb/override/bg2/strings.2da
+++ b/gemrb/override/bg2/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE 52260
FAMBLOCK 8537
FAMPROTAGONIST 8538
MAGIC_RESISTED 19224
+CANTSAVESTORE 10841
diff --git a/gemrb/override/how/strings.2da b/gemrb/override/how/strings.2da
index efcdd95..336b908 100644
--- a/gemrb/override/how/strings.2da
+++ b/gemrb/override/how/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE -1
FAMBLOCK 8537
FAMPROTAGONIST 8538
MAGIC_RESISTED 19224
+CANTSAVESTORE 10841
diff --git a/gemrb/override/iwd/strings.2da b/gemrb/override/iwd/strings.2da
index 66f1a83..3f9153a 100644
--- a/gemrb/override/iwd/strings.2da
+++ b/gemrb/override/iwd/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE -1
FAMBLOCK -1
FAMPROTAGONIST -1
MAGIC_RESISTED 19224
+CANTSAVESTORE 10841
diff --git a/gemrb/override/iwd2/strings.2da b/gemrb/override/iwd2/strings.2da
index 8492188..41887ed 100644
--- a/gemrb/override/iwd2/strings.2da
+++ b/gemrb/override/iwd2/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE -1
FAMBLOCK 8537
FAMPROTAGONIST 8538
MAGIC_RESISTED 19224
+CANTSAVESTORE 10841
diff --git a/gemrb/override/pst/strings.2da b/gemrb/override/pst/strings.2da
index 08e06d5..60897a2 100644
--- a/gemrb/override/pst/strings.2da
+++ b/gemrb/override/pst/strings.2da
@@ -168,3 +168,4 @@ WILDSURGE -1
FAMBLOCK -1
FAMPROTAGONIST -1
MAGIC_RESISTED -1
+CANTSAVESTORE -1
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|