[Gemrb-commits] gemrb/gemrb/GUIScripts GUIDefines.py,1.34,1.35

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23991/GUIScripts

Modified Files:
	GUIDefines.py 
Log Message:
unified OP_* and BM_* bitfield manipulation operators (so there is no confusion)
fixed timer triggers to not return true when timer is not existent
fixed Interact action handling to not free dialog name before use (thus causing obscure bugs)
implemented Core::DisplayStringName/DisplayConstantStringName, removed AddTalk from GameControl
fixed strrefs.h
fixed a variable handling bug in gamescript


Index: GUIDefines.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/GUIDefines.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GUIDefines.py	28 Mar 2005 10:36:18 -0000	1.34
--- GUIDefines.py	8 Apr 2005 16:54:38 -0000	1.35
***************
*** 94,101 ****
  IE_FONT_SINGLE_LINE      = 0x40
  
- global OP_SET, OP_OR, OP_NAND
  OP_SET = 0
! OP_OR = 1
! OP_NAND = 2
  
  # Window position anchors/alignments
--- 94,102 ----
  IE_FONT_SINGLE_LINE      = 0x40
  
  OP_SET = 0
! OP_AND = 1
! OP_OR = 2
! OP_XOR = 3
! OP_NAND = 4
  
  # Window position anchors/alignments