From b4b4a80e2dcb561ff62a1d6d52b36975d88de01e Mon Sep 17 00:00:00 2001
From: "False.Genesis" <False.Genesis@fda9a0ab-4e26-0410-ba80-894f06a4b443>
Date: Fri, 5 Jan 2007 18:50:12 +0000
Subject: [PATCH]

---
 src/Client/PseuWoW.cpp           | 30 ++++++++++++++++++++----------
 src/Client/PseuWoW.h             | 12 ++++++------
 src/Client/Realm/RealmSocket.cpp |  5 +++++
 src/Client/World/WorldPacket.h   |  1 -
 src/Client/World/WorldSocket.cpp |  6 ++++++
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp
index 31012c3..dc7813a 100644
--- a/src/Client/PseuWoW.cpp
+++ b/src/Client/PseuWoW.cpp
@@ -32,6 +32,20 @@ void PseuInstanceRunnable::run(void)
     delete _i;
 }
 
+PseuInstance::PseuInstance()
+{
+    _ver="PseuWoW Alpha Build 12 dev 2" DEBUG_APPENDIX;
+    _ver_short="A12-dev1" DEBUG_APPENDIX;
+    _wsession=NULL;
+    _rsession=NULL;
+
+
+}
+
+PseuInstance::~PseuInstance()
+{
+}
+
 bool PseuInstance::Init(void) {
 
     if(_confdir.empty())
@@ -144,6 +158,12 @@ void PseuInstance::Update()
 
 }
 
+void PseuInstance::SaveAllCache(void)
+{
+    GetWSession()->plrNameCache.SaveToFile();
+    //...
+}
+
 
 
     /*
@@ -240,16 +260,6 @@ void _SaveAllCache(void){
 */
 
 
-PseuInstance::PseuInstance()
-{
-    _ver="PseuWoW Alpha Build 12 dev 2" DEBUG_APPENDIX;
-    _ver_short="A12-dev1" DEBUG_APPENDIX;
-    _wsession=NULL;
-    _rsession=NULL;
-
-
-}
-
 PseuInstanceConf::PseuInstanceConf()
 {
 }
diff --git a/src/Client/PseuWoW.h b/src/Client/PseuWoW.h
index 9417adb..250c491 100644
--- a/src/Client/PseuWoW.h
+++ b/src/Client/PseuWoW.h
@@ -49,14 +49,14 @@ class PseuInstance
 	~PseuInstance();	
 	
 
-	WorldSession *GetWSession(void);
-	RealmSocket *GetRSession(void);
-	PseuInstanceConf *GetConf(void);
-	DefScriptPackage *GetScripts(void);
-	void SetConfDir(std::string);
+    WorldSession *GetWSession(void) { return _wsession; }
+    RealmSocket *GetRSession(void) { return _rsession; }
+    PseuInstanceConf *GetConf(void) { return _conf; }
+    DefScriptPackage *GetScripts(void) { return _scp; }
+    void SetConfDir(std::string);
     void SetScpDir(std::string);
 	void SetSessionKey(BigNumber);
-	BigNumber GetSessionKey(void);
+    BigNumber GetSessionKey(void) { return _sessionkey; }
 
 	
 	
diff --git a/src/Client/Realm/RealmSocket.cpp b/src/Client/Realm/RealmSocket.cpp
index d299440..2b09a8d 100644
--- a/src/Client/Realm/RealmSocket.cpp
+++ b/src/Client/Realm/RealmSocket.cpp
@@ -463,4 +463,9 @@ void RealmSocket::_HandleLogonProof(void)
         //...
     }
 }
+
+void RealmSocket::OnConnect()
+{
+    printf("DEBUG: RealmSocket connected!\n");
+}
     
diff --git a/src/Client/World/WorldPacket.h b/src/Client/World/WorldPacket.h
index e52cea1..51610e3 100644
--- a/src/Client/World/WorldPacket.h
+++ b/src/Client/World/WorldPacket.h
@@ -14,7 +14,6 @@ public:
     inline void SetOpcode(uint16 opcode) { _opcode=opcode; }
     inline uint16 GetOpcode(void) { return _opcode; }
     uint64 GetPackedGuid(void);
-    ~WorldPacket();
 
 private:
     uint16 _opcode;
diff --git a/src/Client/World/WorldSocket.cpp b/src/Client/World/WorldSocket.cpp
index 705e46f..b0b2230 100644
--- a/src/Client/World/WorldSocket.cpp
+++ b/src/Client/World/WorldSocket.cpp
@@ -3,6 +3,12 @@
 #include "WorldSession.h"
 #include "WorldSocket.h"
 
+WorldSocket::WorldSocket(SocketHandler &h, WorldSession *s) : TcpSocket(h)
+{
+    _session = s;
+}
+    
+
 void WorldSocket::OnConnect()
 {
     printf("Connected to world server.\r\n");