avatars are now shown in the profile viewer, fix some memory leaks

Author: jacob1

src/graphics/VideoBuffer.cpp

@@ -13,7 +13,7 @@ VideoBuffer::VideoBuffer(int width, int height):
 
 VideoBuffer::~VideoBuffer()
 {
-	delete vid;
+	delete[] vid;
 }
 
 void VideoBuffer::Clear()
@@ -275,4 +275,18 @@ int VideoBuffer::DrawText(int x, int y, const char *s, int r, int g, int b, int
 	}
 	return x;
 }
+
+void VideoBuffer::DrawImage(pixel *img, int x, int y, int w, int h)
+{
+	for (int j = 0; j < h; j++)
+		for (int i = 0; i < w; i++)
+		{
+			int r = PIXR(*img);
+			int g = PIXG(*img);
+			int b = PIXB(*img);
+			DrawPixel(x+i, y+j, r, g, b, 255);
+			img++;
+		}
+}
+
 #endif

src/graphics/VideoBuffer.h

@@ -25,6 +25,8 @@ class VideoBuffer
 	int DrawChar(int x, int y, unsigned char c, int r, int g, int b, int a);
 	int DrawText(int x, int y, const char *s, int r, int g, int b, int a);
 
+	void DrawImage(pixel *image, int x, int y, int w, int h);
+
 	pixel* GetVid() { return vid; }
 };
 

src/gui/profile/ProfileViewer.cpp

@@ -9,27 +9,28 @@
 #include "game/Download.h"
 
 ProfileViewer::ProfileViewer(std::string profileName):
-	Window_(Point(CENTERED, CENTERED), Point(200, 300)),
+	Window_(Point(CENTERED, CENTERED), Point(250, 300)),
 	name(profileName),
+	avatar(NULL),
 	ageLabel(NULL),
 	websiteLabel(NULL),
 	biographyLabel(NULL)
 {
-	profileInfoDownload = new Download("http://" SERVER "/User.json?Name=" + profileName);
+	profileInfoDownload = new Download("http://" SERVER "/User.json?Name=" + name);
 	//profileInfoDownload->AuthHeaders();
 	profileInfoDownload->Start();
 
-	usernameLabel = new Label(Point(8, 7), Point(Label::AUTOSIZE, Label::AUTOSIZE), profileName);
+	avatarDownload = new Download("http://" STATICSERVER "/avatars/" + name + ".pti");
+	avatarDownload->Start();
+
+	usernameLabel = new Label(Point(8, 7), Point(Label::AUTOSIZE, Label::AUTOSIZE), name);
 	this->AddComponent(usernameLabel);
 	MainLoop();
 }
 
 ProfileViewer::~ProfileViewer()
 {
-	delete usernameLabel;
-	delete ageLabel;
-	delete websiteLabel;
-	delete biographyLabel;
+	free(avatar);
 }
 
 // To be removed later when there is a main engine loop for the entire game
@@ -45,8 +46,7 @@ void ProfileViewer::OnTick(float dt)
 {
 	if (profileInfoDownload && profileInfoDownload->CheckDone())
 	{
-		int length, status;
-		char *data = profileInfoDownload->Finish(&length, &status);
+		char *data = profileInfoDownload->Finish(NULL, NULL);
 
 		json::Object parsed = ParseJSON(data);
 
@@ -55,20 +55,41 @@ void ProfileViewer::OnTick(float dt)
 		converter << ((json::Number)parsed["User"]["Age"]).Value();
 		std::string age = converter.str();
 
-		ageLabel = new Label(Point(30, 19), Point(Label::AUTOSIZE, Label::AUTOSIZE), age, true);
-		websiteLabel = new Label(Point(50, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), ((json::String)parsed["User"]["Website"]).Value(), true);
-		biographyLabel = new Label(Point(8, 43), Point(180, Label::AUTOSIZE), ((json::String)parsed["User"]["Biography"]).Value(), true);
+		ageLabel = new Label(Point(30, 19), Point(Label::AUTOSIZE, Label::AUTOSIZE), age);
+		websiteLabel = new Label(Point(50, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), ((json::String)parsed["User"]["Website"]).Value());
+		biographyLabel = new Label(Point(8, 43), Point(230, Label::AUTOSIZE), ((json::String)parsed["User"]["Biography"]).Value(), true);
 		this->AddComponent(ageLabel);
 		this->AddComponent(websiteLabel);
 		this->AddComponent(biographyLabel);
 
-		delete data;
+		free(data);
 		profileInfoDownload = NULL;
 	}
+
+	if (avatarDownload && avatarDownload->CheckDone())
+	{
+		int length;
+		char *data = avatarDownload->Finish(&length, NULL);
+		if (data)
+		{
+			int w, h;
+			avatar = ptif_unpack(data, length, &w, &h);
+			if (w != 40 || h != 40)
+			{
+				free(avatar);
+				avatar = NULL;
+			}
+		}
+
+		free(data);
+		avatarDownload = NULL;
+	}
 }
 
 void ProfileViewer::OnDraw(VideoBuffer *buf)
 {
+	if (avatar)
+		buf->DrawImage(avatar, 200, 10, 40, 40);
 	buf->DrawText(10, 22, "Age:", 175, 175, 175, 255);
 	buf->DrawText(10, 34, "Website:", 175, 175, 175, 255);
 	buf->DrawText(10, 46, "Biography:", 175, 175, 175, 255);

src/gui/profile/ProfileViewer.h

@@ -4,13 +4,16 @@
 
 #include <string>
 #include "interface/Window.h"
+#include "graphics.h"
 
 class Download;
 class Label;
 class ProfileViewer : public Window_
 {
 	std::string name;
 	Download *profileInfoDownload;
+	Download *avatarDownload;
+	pixel *avatar;
 
 	Label *usernameLabel, *ageLabel, *websiteLabel, *biographyLabel;
 	void MainLoop();

src/interface/Engine.cpp

@@ -186,13 +186,13 @@ void Engine::ShowWindow(Window_ *window)
 	windows.push(window);
 	if (top == NULL)
 		top = window;
+	fillrect(vid_buf, -1, -1, XRES+BARSIZE+1, YRES+MENUSIZE+1, 0, 0, 0, 100);
 }
 
 void Engine::CloseWindow(Window_ *window)
 {
 	if (window == windows.top())
 	{
-		delete windows.top();
 		windows.pop();
 		if (windows.size())
 			top = windows.top();

src/interface/Window.cpp

@@ -11,6 +11,7 @@ Window_::Window_(Point position_, Point size_):
 	size(size_),
 	Components(NULL),
 	focused(NULL),
+	clicked(NULL),
 	toDelete(false)
 {
 	if (position.X == CENTERED)

src/main.cpp

@@ -2882,7 +2882,8 @@ int main(int argc, char *argv[])
 #ifdef NEWINTERFACE
 						if (x <= XRES+BARSIZE-(510-399))
 						{
-							new ProfileViewer(svf_user);
+							ProfileViewer *temp = new ProfileViewer(svf_user);
+							delete temp;
 						}
 						else
 #endif