Changeset 115

Timestamp:

10/14/07 18:11:42 (2 years ago)

Author:

elghinn

Message:

 

Location:

adventure

Files:

• adventuremuc.py (modified) (2 diffs)
• player.py (modified) (2 diffs)
• world.py (modified) (2 diffs)

adventure/adventuremuc.py

@@ -10 +10 @@
         self.Namespace = NS_COMPONENT_ACCEPT
         self.DBG = 'component'
+        self.jid = JID(jid)
         Component.__init__(self, server=server, port=port, debug=[])
         self.worlds = {}
@@ -30 +31 @@
         print ' ' + world.name
 
-    def send(self, worldnode, worldresource, stanza):
-        stanza.setFrom(JID(node=worldnode, domain=self.jid.domain, resource=worldresource))
-        Component.send(self, stanza)
+    def snd(self, worldnode, worldresource, stanza):
+        stanza.setFrom(JID(node=worldnode, domain=self.jid.getDomain(), resource=worldresource))
+        self.send(stanza)
 
     def handle_iq(self, _, iq):

adventure/player.py

@@ -16 +16 @@
 
         for line in place.description.split('\n'):
-            send_message(None, line.strip())
+            self.send_message(None, line.strip())
 
         self.send_message(None, ' ')
@@ -31 +31 @@
         if thing != self:
             if from_:
-                send_message(None, '%s enters %s coming from %s' % (thing.name, place, from_))
+                self.send_message(None, '%s enters %s coming from %s' % (thing.name, place, from_))
             else:
-                send_message(None, '%s spawns' % thing.name)
+                self.send_message(None, '%s spawns' % thing.name)
 
     def on_leave(self, thing, to):
         if thing != self:
             if to:
-                send_message(None, '%s leaves %s going to %s' % (thing.name, place, to))
+                self.send_message(None, '%s leaves %s going to %s' % (thing.name, place, to))
             else:
-                send_message(None, '%s disintegrates' % thing.name)
+                self.send_message(None, '%s disintegrates' % thing.name)
 

adventure/world.py

@@ -36 +36 @@
         # Avoid sending to things without JID
         if stanza.getTo() != None:
-            self.muc.send(self.node, resource, stanza)
+            self.muc.snd(self.node, resource, stanza)
 
     def place(self, placename):
@@ -93 +93 @@
         thing.send_message(None, 'Entering %s' % newplace, subject)
         thing.send_message(None, ' ')
-        thing.see(place(newplace))
+        thing.see(self.place(newplace))
 
         for t in self.each_thing_by_place(thing.place):