From: Digital X. <dig...@us...> - 2007-04-21 23:03:12
|
Update of /cvsroot/openrpg/openrpg1/orpg/chat In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4212/orpg/chat Modified Files: Tag: BRANCH-1-7-1 chatwnd.py Log Message: Fixed so that in node refrencing you only need the primary parent node listed first instead of the FULL path or just node name eg For the following Tree; Root ----CharSheet --------Stuff ------------MoreStuff ----------------Goal All of these will work !@Goal@! !@CharSheet::Goal@! !@CharSheet::Stuff::MoreStuff::Goal@! Index: chatwnd.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/chatwnd.py,v retrieving revision 1.161.2.4 retrieving revision 1.161.2.5 diff -C2 -d -r1.161.2.4 -r1.161.2.5 *** chatwnd.py 19 Apr 2007 02:47:55 -0000 1.161.2.4 --- chatwnd.py 21 Apr 2007 23:03:07 -0000 1.161.2.5 *************** *** 2415,2425 **** dom = node.getChildren() - print found if not found: for nodeName in node_path_list: ! (found, node) = self.resolve_loop(dom, nodeName, True) if not found: break dom = node.getChildren() if found: --- 2415,2427 ---- dom = node.getChildren() if not found: + dom = gametree.master_dom.getChildren() + loop = False for nodeName in node_path_list: ! (found, node) = self.resolve_loop(dom, nodeName, loop) if not found: break dom = node.getChildren() + loop = True if found: |