Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (3cf88c966a758fcd1386a538098249dbd10a2184)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (3cf88c966a758fcd1386a538098249dbd10a2184)
  • Date: Wed, 23 Jan 2008 07:01:26 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 6 ++++++
var/lib/sorcery/modules/libdepengine | 2 +-
var/lib/sorcery/modules/libtriggers | 3 +--
3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 3cf88c966a758fcd1386a538098249dbd10a2184
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fixed bug #13466 - dispel_self was dispelling the triggerer
(cherry picked from commit cb774214196c69a2dd1e7fca56168a62c692aecf)

commit a2d08a2129acce19b6136616f26890adcb19e136
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

removed a redundant check in remove_triggers if the transaction *file*
was a file; if it wasn't, the code would lock the trigger list
forever
(cherry picked from commit 920405e2e36ae8d70885373c6bb02c79aebb06e4)

commit 6c1b692ead7e5f1fe15738a623c11ad98a2bdbe3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrigger: fix fallback parameter in trigger(), which was luckily not
used
(cherry picked from commit 4942fe7d95dca9abde3eb41a157be7f7a8ff2891)

diff --git a/ChangeLog b/ChangeLog
index 202adf7..a3b9d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrigger: fix fallback parameter in trigger(), which was luckily
not used
+ removed a redundant check in remove_triggers if the transaction
*file*
+ was a file; if it wasn't, the code would lock the trigger list
forever
+ fixed bug #13466 - dispel_self was dispelling the triggerer
+
2008-01-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstate: moved the subshell from the callers into
query_spell_status and
sped it up for a tiny bit due to expensive locking
diff --git a/var/lib/sorcery/modules/libdepengine
b/var/lib/sorcery/modules/libdepengine
index c7a7571..91486a9 100755
--- a/var/lib/sorcery/modules/libdepengine
+++ b/var/lib/sorcery/modules/libdepengine
@@ -266,7 +266,7 @@ function execute_triggers() {
# run any other trigger besides the two above
# but not if we're summoning
local action=cast
- do_trigger "$spell:on_cast:$trg_target:$trg_action"
+ do_trigger "$trg_target:$spell:on_cast:$trg_action"
fi

# a brown trigger is a loop, drop it
diff --git a/var/lib/sorcery/modules/libtriggers
b/var/lib/sorcery/modules/libtriggers
index 9920dc1..a42c099 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -35,7 +35,6 @@ function remove_triggers ()

[ -f $TRIGGER_LIST ] || return 0
lock_start_transaction "$TRIGGER_LIST" tTRIGGER_LIST
- [ -f $tTRIGGER_LIST ] || return 0
grep -v "^$SPELL:" $TRIGGER_LIST > $tTRIGGER_LIST
lock_commit_transaction $TRIGGER_LIST
return $?
@@ -58,7 +57,7 @@ function trigger ()

local spell TRIGGER action
action=$1
- spell=`esc_str ${SPELL:-$4}`
+ spell=`esc_str ${SPELL:-$2}`

[ -f $TRIGGER_LIST ] || return 0
iterate do_trigger $'\n' "`grep "^[^:]*:$spell:on_$action" $TRIGGER_LIST`"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (3cf88c966a758fcd1386a538098249dbd10a2184), Jaka Kranjc, 01/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page