Call OnResponseReady with an identifier for the request, add a WebRequest class

10 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/interface/AvatarButton.cpp b/src/gui/interface/AvatarButton.cpp
index e385c77..9176964 100644
--- a/src/gui/interface/AvatarButton.cpp
+++ b/src/gui/interface/AvatarButton.cpp
@@ -40,7 +40,7 @@ void AvatarButton::Tick(float dt)
 	}
 }
 
-void AvatarButton::OnResponseReady(void * imagePtr)
+void AvatarButton::OnResponseReady(void * imagePtr, int identifier)
 {
 	VideoBuffer * image = (VideoBuffer*)imagePtr;
 	if(image)
diff --git a/src/gui/interface/AvatarButton.h b/src/gui/interface/AvatarButton.h
index 26b4348..d13f747 100644
--- a/src/gui/interface/AvatarButton.h
+++ b/src/gui/interface/AvatarButton.h
@@ -38,7 +38,7 @@ public:
 	virtual void Draw(const Point& screenPos);
 	virtual void Tick(float dt);
 
-	virtual void OnResponseReady(void * imagePtr);
+	virtual void OnResponseReady(void * imagePtr, int identifier);
 	
 	virtual void DoAction();
 
diff --git a/src/gui/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp
index 7ea4198..7e67e48 100644
--- a/src/gui/interface/SaveButton.cpp
+++ b/src/gui/interface/SaveButton.cpp
@@ -128,7 +128,7 @@ SaveButton::~SaveButton()
 		delete file;
 }
 
-void SaveButton::OnResponseReady(void * imagePtr)
+void SaveButton::OnResponseReady(void * imagePtr, int identifier)
 {
 	VideoBuffer * image = (VideoBuffer*)imagePtr;
 	if(image)
diff --git a/src/gui/interface/SaveButton.h b/src/gui/interface/SaveButton.h
index 7bb77c4..4b9682a 100644
--- a/src/gui/interface/SaveButton.h
+++ b/src/gui/interface/SaveButton.h
@@ -58,7 +58,7 @@ public:
 	virtual void Draw(const Point& screenPos);
 	virtual void Tick(float dt);
 
-	virtual void OnResponseReady(void * imagePtr);
+	virtual void OnResponseReady(void * imagePtr, int identifier);
 
 	void SetSelected(bool selected_) { selected = selected_; }
 	bool GetSelected() { return selected; }
diff --git a/src/gui/profile/ProfileActivity.cpp b/src/gui/profile/ProfileActivity.cpp
index d690aa5..6c667a4 100644
--- a/src/gui/profile/ProfileActivity.cpp
+++ b/src/gui/profile/ProfileActivity.cpp
@@ -167,7 +167,7 @@ void ProfileActivity::setUserInfo(UserInfo newInfo)
 	//exit(0);
 }
 
-void ProfileActivity::OnResponseReady(void * userDataPtr)
+void ProfileActivity::OnResponseReady(void * userDataPtr, int identifier)
 {
 	if(loading)
 	{
diff --git a/src/gui/profile/ProfileActivity.h b/src/gui/profile/ProfileActivity.h
index ed10e65..53966e3 100644
--- a/src/gui/profile/ProfileActivity.h
+++ b/src/gui/profile/ProfileActivity.h
@@ -18,7 +18,7 @@ class ProfileActivity: public WindowActivity, public RequestListener {
 public:
 	ProfileActivity(std::string username);
 	virtual ~ProfileActivity();
-	virtual void OnResponseReady(void * userDataPtr);
+	virtual void OnResponseReady(void * userDataPtr, int identifier);
 	virtual void OnDraw();
 };
 
diff --git a/src/gui/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp
index 65e9dfb..a295987 100644
--- a/src/gui/save/LocalSaveActivity.cpp
+++ b/src/gui/save/LocalSaveActivity.cpp
@@ -133,7 +133,7 @@ void LocalSaveActivity::OnDraw()
 	}
 }
 
-void LocalSaveActivity::OnResponseReady(void * imagePtr)
+void LocalSaveActivity::OnResponseReady(void * imagePtr, int identifier)
 {
 	if(thumbnail)
 		delete thumbnail;
diff --git a/src/gui/save/LocalSaveActivity.h b/src/gui/save/LocalSaveActivity.h
index 4668dd3..47d3938 100644
--- a/src/gui/save/LocalSaveActivity.h
+++ b/src/gui/save/LocalSaveActivity.h
@@ -34,6 +34,6 @@ public:
 	void saveWrite(std::string finalFilename);
 	virtual void Save();
 	virtual void OnDraw();
-	virtual void OnResponseReady(void * imagePtr);
+	virtual void OnResponseReady(void * imagePtr, int identifier);
 	virtual ~LocalSaveActivity();
 };
diff --git a/src/gui/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp
index 7e83847..c129799 100644
--- a/src/gui/save/ServerSaveActivity.cpp
+++ b/src/gui/save/ServerSaveActivity.cpp
@@ -335,7 +335,7 @@ void ServerSaveActivity::OnDraw()
 	}
 }
 
-void ServerSaveActivity::OnResponseReady(void * imagePtr)
+void ServerSaveActivity::OnResponseReady(void * imagePtr, int identifier)
 {
 	if(thumbnail)
 		delete thumbnail;
diff --git a/src/gui/save/ServerSaveActivity.h b/src/gui/save/ServerSaveActivity.h
index c18425b..267939b 100644
--- a/src/gui/save/ServerSaveActivity.h
+++ b/src/gui/save/ServerSaveActivity.h
@@ -31,7 +31,7 @@ public:
 	virtual void ShowPublishingInfo();
 	virtual void ShowRules();
 	virtual void OnDraw();
-	virtual void OnResponseReady(void * imagePtr);
+	virtual void OnResponseReady(void * imagePtr, int identifier);
 	virtual void OnTick(float dt);
 	virtual ~ServerSaveActivity();
 protected: