[Openrpg-dev] openrpg1/orpg/mapper grid_handler.py, 1.19, 1.20 map_handler.py, 1.13, 1.14 miniatures_handler.py, 1.37, 1.38

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9374/orpg/mapper

Modified Files:
	grid_handler.py map_handler.py miniatures_handler.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: miniatures_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures_handler.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** miniatures_handler.py	9 Mar 2007 14:11:55 -0000	1.37
--- miniatures_handler.py	3 Apr 2007 00:14:35 -0000	1.38
***************
*** 126,129 ****
--- 126,134 ----
  
      def on_browse(self, evt):
+         session = self.canvas.frame.session
+         if (session.my_role() != session.ROLE_GM) and (session.my_role() != session.ROLE_PLAYER) and (session.use_roles()):
+             self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
+             return
+ 
          dlg = wx.FileDialog(None, "Select a Miniture to load", wildcard="Image files (*.bmp, *.gif, *.jpg, *.png)|*.bmp;*.gif;*.jpg;*.png", style=wx.OPEN)
  
***************
*** 295,299 ****
      def on_left_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM) and (session.my_role() <> session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 300,304 ----
      def on_left_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM) and (session.my_role() != session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
***************
*** 365,369 ****
      def on_right_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM) and (session.my_role()<>session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 370,374 ----
      def on_right_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM) and (session.my_role()!=session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
***************
*** 413,417 ****
  
      def on_min_menu_item(self,evt):
- 
          id = evt.GetId()
          if id == MIN_REMOVE:
--- 418,421 ----
***************
*** 665,669 ****
      def on_min_list(self,evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 669,673 ----
      def on_min_list(self,evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return

Index: grid_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid_handler.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** grid_handler.py	9 Mar 2007 14:11:55 -0000	1.19
--- grid_handler.py	3 Apr 2007 00:14:35 -0000	1.20
***************
*** 89,93 ****
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 89,93 ----
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return

Index: map_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map_handler.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** map_handler.py	12 Feb 2007 02:29:08 -0000	1.13
--- map_handler.py	3 Apr 2007 00:14:35 -0000	1.14
***************
*** 71,75 ****
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 71,75 ----
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return