Mercurial Mercurial > aquaria-psp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge latest changes from branch lua-changes. patched
authorachurch
Sat, 25 Dec 2010 10:26:41 +0900
branchpatched
changeset 629 2db6c9b77996
parent 626 6e9db9de6584 (current diff)
parent 628 e7a8acfce3d6 (diff)
child 630 70159ba7543b
child 635 0f5790dd14ff
Merge latest changes from branch lua-changes.
--- a/game_scripts/scripts/maps/node_secret02.lua	Sun Dec 19 09:38:40 2010 +0900
+++ b/game_scripts/scripts/maps/node_secret02.lua	Sat Dec 25 10:26:41 2010 +0900
@@ -40,7 +40,7 @@
 
 function update(me, dt)
 	if not v.done and isFlag(FLAG_SECRET02, 0) then 
-		if node_isEntityIn(v.me, v.n) then
+		if node_isEntityIn(me, v.n) then
 			v.done = true
 			
 			changeForm(FORM_NORMAL)
aquaria-psp