Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19860/system
Modified Files:
macro_opendoor.py
Log Message:
Cleanups
New Utility Function
Trashcans!
Index: macro_opendoor.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/macro_opendoor.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macro_opendoor.py 14 Jul 2004 07:41:03 -0000 1.3
--- macro_opendoor.py 17 Jul 2004 07:24:00 -0000 1.4
***************
*** 1,5 ****
import wolfpack
! from wolfpack.consts import *
dirs = {
--- 1,5 ----
import wolfpack
! from wolfpack.consts import EVENT_USE
dirs = {
***************
*** 18,50 ****
def openDoor( socket, packet ):
! if packet.size != 5 and packet.getshort(3) != 0x5800:
! return 0
!
! if not socket.player:
! return False
! char = socket.player
! dir = char.direction
! doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0)
! if not doors:
return False
-
- opendoor = 0
- reach = 0
- for door in doors:
- if char.pos.z == door.pos.z:
- reach = 1
- elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5):
- reach = 1
- elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5):
- reach = 1
- if reach == 1:
- for event in door.events:
- if event == 'door':
- opendoor = 1
- break
- if opendoor == 1:
- wolfpack.callevent( event, EVENT_USE, (char, door) )
- break
- return
--- 18,49 ----
def openDoor( socket, packet ):
! if packet.size == 5 and packet.getshort(3) == int( 0x5800 ):
! if not socket.player:
! return False
! char = socket.player
! dir = char.direction
! doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0)
! if not doors:
! return False
! opendoor = 0
! reach = 0
! for door in doors:
! if char.pos.z == door.pos.z:
! reach = 1
! elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5):
! reach = 1
! elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5):
! reach = 1
! if reach == 1:
! for event in door.events:
! if event == 'door':
! opendoor = 1
! break
! if opendoor == 1:
! wolfpack.callevent( event, EVENT_USE, (char, door) )
! break
! return True
! else:
return False
|
