new interface code always defined. Also fix locations of some Labels

Author: jacob1

src/graphics/VideoBuffer.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include "VideoBuffer.h"
 #define INCLUDE_FONTDATA
 #include "font.h"
@@ -288,5 +287,3 @@ void VideoBuffer::DrawImage(pixel *img, int x, int y, int w, int h)
 			img++;
 		}
 }
-
-#endif

src/gui/profile/ProfileViewer.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include <sstream>
 #include "ProfileViewer.h"
 #include "interface/Engine.h"
@@ -46,13 +45,6 @@ void ProfileViewer::MainLoop()
 	delete asdf;
 }
 
-std::string NumberToString(int number)
-{
-	std::stringstream converter;
-	converter << number;
-	return converter.str();
-}
-
 void ProfileViewer::OnTick(float dt)
 {
 	if (profileInfoDownload && profileInfoDownload->CheckDone())
@@ -72,18 +64,18 @@ void ProfileViewer::OnTick(float dt)
 				ageLabel = new Label(Point(30, 19), Point(Label::AUTOSIZE, Label::AUTOSIZE), root["User"]["Age"].asString());
 			else
 				ageLabel = new Label(Point(30, 19), Point(Label::AUTOSIZE, Label::AUTOSIZE), "\bgNot Provided");
-			if (root["User"]["Website"].isString())
-				websiteLabel = new Label(Point(50, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), root["User"]["Website"].asString());
-			else
-				websiteLabel = new Label(Point(50, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), "\bgNot Provided");
 			if (root["User"]["Location"].isString())
-				locationLabel = new Label(Point(54, 43), Point(Label::AUTOSIZE, Label::AUTOSIZE), root["User"]["Location"].asString());
+				locationLabel = new Label(Point(54, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), root["User"]["Location"].asString());
+			else
+				locationLabel = new Label(Point(54, 31), Point(Label::AUTOSIZE, Label::AUTOSIZE), "\bgNot Provided");
+			if (root["User"]["Website"].isString())
+				websiteLabel = new Label(Point(50, 43), Point(Label::AUTOSIZE, Label::AUTOSIZE), root["User"]["Website"].asString());
 			else
-				locationLabel = new Label(Point(54, 43), Point(Label::AUTOSIZE, Label::AUTOSIZE), "\bgNot Provided");
+				websiteLabel = new Label(Point(50, 43), Point(Label::AUTOSIZE, Label::AUTOSIZE), "\bgNot Provided");
 			if (root["User"]["Biography"].isString())
-				biographyLabel = new Label(Point(8, 103), Point(240, Label::AUTOSIZE), root["User"]["Biography"].asCString(), true);
+				biographyLabel = new Label(Point(8, 115), Point(240, Label::AUTOSIZE), root["User"]["Biography"].asCString(), true);
 			else
-				biographyLabel = new Label(Point(8, 103), Point(240, Label::AUTOSIZE), "\bgNot Provided", true);
+				biographyLabel = new Label(Point(8, 115), Point(240, Label::AUTOSIZE), "\bgNot Provided", true);
 
 			this->AddComponent(ageLabel);
 			this->AddComponent(locationLabel);
@@ -105,7 +97,7 @@ void ProfileViewer::OnTick(float dt)
 		}
 		catch (std::exception &e)
 		{
-			biographyLabel = new Label(Point(8, 79), Point(230, Label::AUTOSIZE), "\brError parsing data from server", true);
+			biographyLabel = new Label(Point(8, 115), Point(230, Label::AUTOSIZE), "\brError parsing data from server", true);
 			this->AddComponent(biographyLabel);
 		}
 
@@ -138,13 +130,11 @@ void ProfileViewer::OnDraw(VideoBuffer *buf)
 	if (avatar)
 		buf->DrawImage(avatar, 210, 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, "Location:", 175, 175, 175, 255);
+	buf->DrawText(10, 34, "Location:", 175, 175, 175, 255);
+	buf->DrawText(10, 46, "Website:", 175, 175, 175, 255);
 	buf->DrawText(10, 58, "Saves:", 175, 175, 175, 255);
 	buf->DrawText(15, 70, "Count:", 175, 175, 175, 255);
 	buf->DrawText(15, 82, "Average Score:", 175, 175, 175, 255);
 	buf->DrawText(15, 94, "Highest Score:", 175, 175, 175, 255);
 	buf->DrawText(10, 106, "Biography:", 175, 175, 175, 255);
 }
-
-#endif

src/gui/profile/ProfileViewer.h

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #ifndef PROFILEVIEWER_H
 #define PROFILEVIEWER_H
 
@@ -27,4 +26,3 @@ class ProfileViewer : public Window_
 };
 
 #endif
-#endif

src/interface.cpp

@@ -66,6 +66,8 @@
 #include "simulation/ToolNumbers.h"
 #include "simulation/GolNumbers.h"
 
+#include "gui/profile/ProfileViewer.h"
+
 SDLMod sdl_mod;
 int sdl_key, sdl_rkey, sdl_wheel, sdl_ascii, sdl_zoom_trig=0;
 #if defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
@@ -1298,7 +1300,10 @@ void draw_svf_ui(pixel *vid_buf, int alternate)// all the buttons at the bottom
 	//the login button
 	drawtext(vid_buf, XRES-122+BARSIZE/*388*/, YRES+(MENUSIZE-13), "\x84", 255, 255, 255, 255);
 	if (svf_login)
+	{
 		drawtextmax(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), 66, svf_user, 255, 255, 255, 255);
+		drawdots(vid_buf, XRES+BARSIZE-108, YRES+(MENUSIZE-15), 12, c, c, c, 255);
+	}
 	else
 		drawtext(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), "[sign in]", 255, 255, 255, 255);
 	drawrect(vid_buf, XRES-125+BARSIZE/*385*/, YRES+(MENUSIZE-16), 91, 14, 255, 255, 255, 255);
@@ -5096,6 +5101,8 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date, int instant_open)
 	ui_edit ed;
 	ui_copytext ctb;
 
+	const char *profileToOpen = "";
+
 	pixel *old_vid=(pixel *)calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
 	if (!old_vid || !info)
 		return 0;
@@ -5464,10 +5471,11 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date, int instant_open)
 							if (b && !bq && mx > 61+(XRES/2) && mx < 61+(XRES/2)+textwidth(info->commentauthors[cc]) && my > ccy+58+comment_scroll && my < ccy+70+comment_scroll && my < YRES+MENUSIZE-76-ed.h+2)
 								if (sdl_mod & (KMOD_CTRL|KMOD_META)) //open profile
 								{
-									char link[128];
+									/*char link[128];
 									strcpy(link, "http://" SERVER "/User.html?Name=");
 									strcaturl(link, info->commentauthorsunformatted[cc]);
-									open_link(link);
+									open_link(link);*/
+									profileToOpen = info->commentauthorsunformatted[cc];
 								}
 								else if (sdl_mod & KMOD_SHIFT) //, or search for a user's saves
 								{
@@ -5854,6 +5862,13 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date, int instant_open)
 
 		if (lasttime<TIMEOUT)
 			lasttime++;
+
+		if (strcmp(profileToOpen, ""))
+		{
+			ProfileViewer *temp = new ProfileViewer(profileToOpen);
+			delete temp;
+			profileToOpen = "";
+		}
 	}
 	//Prevent those mouse clicks being passed down.
 	while (!sdl_poll())

src/interface/Button.cpp

@@ -1,4 +1,4 @@
-#ifdef NEWINTERFACE
+#ifdef TODOFIXTHIS
 #include "Button.h"
 #include "graphics.h"
 #include "graphics/VideoBuffer.h"

src/interface/Engine.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include <SDL/SDL.h>
 #include "Engine.h"
 #include "interface.h"
@@ -200,5 +199,3 @@ void Engine::CloseWindow(Window_ *window)
 			top = NULL;
 	}
 }
-
-#endif

src/interface/Label.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include <algorithm>
 #include "Label.h"
 #include "graphics.h"
@@ -327,5 +326,3 @@ void Label::OnTick()
 	if (!IsClicked() && numClicks && lastClick+300 < SDL_GetTicks())
 		numClicks = 0;
 }
-
-#endif

src/interface/Textbox.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include <algorithm>
 #include "Textbox.h"
 #include "graphics/VideoBuffer.h"
@@ -158,4 +157,3 @@ void Textbox::OnDraw(VideoBuffer* vid)
 	else
 		vid->DrawRect(position.X-1, position.Y-1, size.X+2, size.Y+2, 150, 150, 150, 255);
 }
-#endif

src/interface/Window.cpp

@@ -1,4 +1,3 @@
-#ifdef NEWINTERFACE
 #include "Window.h"
 #include "Engine.h"
 #include "Label.h"
@@ -170,5 +169,3 @@ void Window_::DoKeyRelease(int key, unsigned short character, unsigned char modi
 
 	OnKeyRelease(key, character, modifiers);
 }
-
-#endif

src/main.cpp

@@ -82,10 +82,9 @@
 #include "simulation/ToolNumbers.h"
 #include "simulation/elements/LIFE.h"
 
-#ifdef NEWINTERFACE
+// new interface stuff
 #include "interface/Engine.h"
 #include "gui/profile/ProfileViewer.h"
-#endif
 
 pixel *vid_buf;
 
@@ -1892,10 +1891,6 @@ int main(int argc, char *argv[])
 			}
 			if (sdl_key=='1')
 			{
-#ifdef NEWINTERFACE
-				Engine* asdf = new Engine();
-				asdf->MainLoop();
-#endif
 				if (sdl_mod & (KMOD_CTRL|KMOD_META))
 					display_mode = display_mode&DISPLAY_AIRV ? display_mode&!DISPLAY_AIRV:display_mode|DISPLAY_AIRV;
 				else
@@ -2879,14 +2874,12 @@ int main(int argc, char *argv[])
 					}
 					else if (x>=(XRES+BARSIZE-(510-385)) && x<=(XRES+BARSIZE-(510-476)))
 					{
-#ifdef NEWINTERFACE
-						if (x <= XRES+BARSIZE-(510-399))
+						if (svf_login && x <= XRES+BARSIZE-108)
 						{
 							ProfileViewer *temp = new ProfileViewer(svf_user);
 							delete temp;
 						}
 						else
-#endif
 						{
 							login_ui(vid_buf);
 							if (svf_login)