From: <lyn...@us...> - 2009-06-19 17:08:13
|
Revision: 6526 http://gemrb.svn.sourceforge.net/gemrb/?rev=6526&view=rev Author: lynxlupodian Date: 2009-06-19 17:07:56 +0000 (Fri, 19 Jun 2009) Log Message: ----------- subsituted the duplicate CANTPICK strings with missing bg2 "can't save" strings and made the callers use LOCKPICK_FAILED Modified Paths: -------------- gemrb/trunk/gemrb/includes/strrefs.h gemrb/trunk/gemrb/override/bg1/strings.2da gemrb/trunk/gemrb/override/bg2/strings.2da gemrb/trunk/gemrb/override/how/strings.2da gemrb/trunk/gemrb/override/iwd/strings.2da gemrb/trunk/gemrb/override/iwd2/strings.2da gemrb/trunk/gemrb/override/pst/strings.2da gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp Modified: gemrb/trunk/gemrb/includes/strrefs.h =================================================================== --- gemrb/trunk/gemrb/includes/strrefs.h 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/includes/strrefs.h 2009-06-19 17:07:56 UTC (rev 6526) @@ -114,8 +114,8 @@ #define STR_TRACKINGFAILED 80 #define STR_DOOR_NOPICK 81 #define STR_CONT_NOPICK 82 -#define STR_DOOR_CANTPICK 83 -#define STR_CONT_CANTPICK 84 +#define STR_CANTSAVECOMBAT 83 +#define STR_CANTSAVENOCTRL 84 #define STR_LOCKPICK_DONE 85 #define STR_LOCKPICK_FAILED 86 #define STR_STATIC_DISS 87 Modified: gemrb/trunk/gemrb/override/bg1/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/bg1/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/bg1/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED -1 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT -1 +CANTSAVENOCTRL -1 LOCKPICK_DONE 16517 LOCKPICK_FAILED 16518 STATIC_DISSIPATE -1 Modified: gemrb/trunk/gemrb/override/bg2/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/bg2/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/bg2/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED 19534 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT 3041 +CANTSAVENOCTRL 54401 LOCKPICK_DONE 16517 LOCKPICK_FAILED 16518 STATIC_DISSIPATE -1 Modified: gemrb/trunk/gemrb/override/how/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/how/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/how/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED 19534 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT -1 +CANTSAVENOCTRL -1 LOCKPICK_DONE 16517 LOCKPICK_FAILED 16518 STATIC_DISSIPATE 26518 Modified: gemrb/trunk/gemrb/override/iwd/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/iwd/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED 19534 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT -1 +CANTSAVENOCTRL -1 LOCKPICK_DONE 16517 LOCKPICK_FAILED 16518 STATIC_DISSIPATE -1 Modified: gemrb/trunk/gemrb/override/iwd2/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd2/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/iwd2/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED 19534 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT -1 +CANTSAVENOCTRL -1 LOCKPICK_DONE 16517 LOCKPICK_FAILED 16518 STATIC_DISSIPATE 26518 Modified: gemrb/trunk/gemrb/override/pst/strings.2da =================================================================== --- gemrb/trunk/gemrb/override/pst/strings.2da 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/override/pst/strings.2da 2009-06-19 17:07:56 UTC (rev 6526) @@ -84,8 +84,8 @@ TRACKINGFAILED -1 DOOR_NOPICK 23169 CONT_NOPICK 23169 -DOOR_CANTPICK 23169 -CONT_CANTPICK 23169 +CANTSAVECOMBAT -1 +CANTSAVENOCTRL -1 LOCKPICK_DONE 19281 LOCKPICK_FAILED 19282 STATIC_DISSIPATE -1 Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-06-19 16:56:25 UTC (rev 6525) +++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-06-19 17:07:56 UTC (rev 6526) @@ -1637,7 +1637,7 @@ if (LockDifficulty == 100) { core->DisplayConstantStringName(STR_DOOR_NOPICK, 0xbcefbc, actor); } else { - core->DisplayConstantStringName(STR_DOOR_CANTPICK, 0xbcefbc, actor); + core->DisplayConstantStringName(STR_LOCKPICK_FAILED, 0xbcefbc, actor); LastPickLockFailed = actor->GetID(); } return; @@ -2077,7 +2077,7 @@ if (LockDifficulty == 100) { core->DisplayConstantStringName(STR_CONT_NOPICK, 0xbcefbc, actor); } else { - core->DisplayConstantStringName(STR_CONT_CANTPICK, 0xbcefbc, actor); + core->DisplayConstantStringName(STR_LOCKPICK_FAILED, 0xbcefbc, actor); LastPickLockFailed = actor->GetID(); } return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |