Merge pull request #353 from EQEmu/eqstream_ptr

Change EQStream raw pointers to be std::shared_ptr

zone/client.cpp

@@ -404,6 +404,7 @@ Client::~Client() {
 	//let the stream factory know were done with this stream
 	eqs->Close();
 	eqs->ReleaseFromUse();
+	safe_delete(eqs);
 
 	UninitializeBuffSlots();
 }

zone/client.h

@@ -64,6 +64,7 @@ struct Item_Struct;
 #include <float.h>
 #include <set>
 #include <algorithm>
+#include <memory>
 
 
 #define CLIENT_TIMEOUT 90000
@@ -201,7 +202,7 @@ struct ClientReward
 
 class ClientFactory {
 public:
-	Client *MakeClient(EQStream* ieqs);
+	Client *MakeClient(std::shared_ptr<EQStream> ieqs);
 };
 
 class Client : public Mob

zone/net.cpp

@@ -332,7 +332,7 @@ int main(int argc, char** argv) {
 	Timer quest_timers(100);
 	UpdateWindowTitle();
 	bool worldwasconnected = worldserver.Connected();
-	EQStream* eqss;
+	std::shared_ptr<EQStream> eqss;
 	EQStreamInterface *eqsi;
 	uint8 IDLEZONEUPDATE = 200;
 	uint8 ZONEUPDATE = 10;