diff orpg/networking/gsclient.py @ 66:c54768cffbd4 ornery-dev

Traipse Dev 'OpenRPG' {090818-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: *Unstable* This is the first wave of Code Refinement updates. Includes new material from Core Beta; new debugger material (partially implemented), beginnings of switch to etree, TerminalWriter, and a little more. open_rpg has been renamed to component; functioning now as component.get(), component.add(), component.delete(). This version has known bugs, specifically with the gametree and nodes. I think the XML files where not removed during testing of Core and switching back.
author sirebral
date Tue, 18 Aug 2009 06:33:37 -0500
parents f3d8101211c4
children 449a8900f9ac
line wrap: on
line diff
--- a/orpg/networking/gsclient.py	Mon Aug 17 06:56:31 2009 -0500
+++ b/orpg/networking/gsclient.py	Tue Aug 18 06:33:37 2009 -0500
@@ -28,13 +28,13 @@
 
 __version__ = "$Id: gsclient.py,v 1.53 2007/10/25 21:49:34 digitalxero Exp $"
 
-import orpg.dirpath
+from orpg.dirpath import dir_struct
 from orpg.orpg_windows import *
-from orpg.orpg_xml import *
+#from orpg.orpg_xml import *
 import meta_server_lib
 import orpg.tools.orpg_settings
 import orpg.tools.rgbhex
-from orpg.orpgCore import open_rpg
+from orpg.orpgCore import component
 import traceback
 
 gs_host = 1
@@ -99,13 +99,13 @@
     def __init__(self,parent):
         wx.Panel.__init__(self, parent, -1)
         self.parent = parent
-        self.log = open_rpg.get_component('log')
+        self.log = component.get('log')
         self.log.log("Enter game_server_panel", ORPG_DEBUG)
-        self.password_manager = open_rpg.get_component('password_manager') # passtool --SD 8/03
-        self.frame = open_rpg.get_component('frame')
-        self.session = open_rpg.get_component('session')
-        self.settings = open_rpg.get_component('settings')
-        self.xml = open_rpg.get_component('xml')
+        self.password_manager = component.get('password_manager') # passtool --SD 8/03
+        self.frame = component.get('frame')
+        self.session = component.get('session')
+        self.settings = component.get('settings')
+        self.xml = component.get('xml')
         self.serverNameSet = 0
         self.last_motd = ""
         self.buttons = {}
@@ -570,7 +570,7 @@
 
     def do_connect(self, address):
         self.log.log("Enter game_server_panel->do_connect(self, address)", ORPG_DEBUG)
-        chat = open_rpg.get_component('chat')
+        chat = component.get('chat')
         chat.InfoPost("Locating server at " + address + "...")
         if self.session.connect(address):
             self.frame.start_timer()