From 205889c0e52c9e0c7594bd074ce386aec9850a0f Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Wed, 7 Dec 2011 22:22:23 +0000
Subject: [PATCH] [Add] Added RGB method in addition to SDL_Color in the text
 class.

---
 src/libUnuk/MainMenu.cpp |  7 +++++++
 src/libUnuk/MainMenu.h   |  4 +++-
 src/libUnuk/Text.cpp     | 19 +++++++++++++++++++
 src/libUnuk/Text.h       |  4 ++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/libUnuk/MainMenu.cpp b/src/libUnuk/MainMenu.cpp
index fe7940b..e141e51 100644
--- a/src/libUnuk/MainMenu.cpp
+++ b/src/libUnuk/MainMenu.cpp
@@ -24,8 +24,13 @@ MainMenu::MainMenu(void) {
   btnExit.SetTextRGB(0, 0, 0);
   btnExit.SetText("Exit");
   btnExit.SetXY(100, 250);
+
+  menuLabel.SetXY(100, 50);
+  menuLabel.SetTextBlended("MainMenu", "large", 0, 0, 0);
+
   m_background = new Map;
   m_background->Load("MainMenu");
+
   camera.x = 0;
   camera.y = 0;
 }
@@ -63,6 +68,8 @@ int MainMenu::HandleInput(void) {
 void MainMenu::Render(void) {
   m_background->Render();
 
+  menuLabel.Render();
+
   btnNewGame.Render();
   btnLoadGame.Render();
   btnOptions.Render();
diff --git a/src/libUnuk/MainMenu.h b/src/libUnuk/MainMenu.h
index caf2c81..328ebb0 100644
--- a/src/libUnuk/MainMenu.h
+++ b/src/libUnuk/MainMenu.h
@@ -1,10 +1,10 @@
 #ifndef _MAINMENU_H_
 #define _MAINMENU_H_
 #include "../Unuk/Constants.h"
-#include "ParticleEmitter.h"
 #include "Menu.h"
 #include "Map.h"
 #include "Rect.h"
+#include "Text.h"
 
 const int MAIN_MENU_NOTHING     = 0;
 const int MAIN_MENU_NEW_GAME    = 1;
@@ -23,6 +23,8 @@ public:
 private:
   Map* m_background;
 
+  Text menuLabel;
+
   Button btnNewGame;
   Button btnLoadGame;
   Button btnOptions;
diff --git a/src/libUnuk/Text.cpp b/src/libUnuk/Text.cpp
index 54847f5..2b02561 100644
--- a/src/libUnuk/Text.cpp
+++ b/src/libUnuk/Text.cpp
@@ -74,6 +74,11 @@ int Text::SetTextBlended(string textArg, string size, SDL_Color colour) {
   }
 }
 
+int Text::SetTextBlended(string textArg, string size, Uint8 r, Uint8 g, Uint8 b) {
+  SDL_Color f = { r, g, b };
+  return SetTextBlended(textArg, size, f);
+}
+
 int Text::SetTextShaded(string textArg, string size, SDL_Color colour, SDL_Color bgColour) {
   m_textContents = textArg;
 
@@ -103,10 +108,24 @@ int Text::SetTextShaded(string textArg, string size, SDL_Color colour, SDL_Color
   }
 }
 
+int Text::SetTextShaded(string textArg, string size, Uint8 rF, Uint8 gF, Uint8 bF, Uint8 rB, Uint8 gB, Uint8 bB) {
+  SDL_Color f = { rF, gF, bF };
+  SDL_Color b = { rB, gB, bB };
+  return SetTextShaded(textArg, size, f, b);
+}
+
 void Text::Render(void) {
   ApplySurface(x, y, m_text, screen);
 }
 
+void Text::Render(int xArg, int yArg) {
+  ApplySurface(xArg, yArg, m_text, screen);
+}
+
 void Text::RenderLiteral(void) {
   ApplySurfaceLiteral(x, y, m_text, screen);
 }
+
+void Text::RenderLiteral(int xArg, int yArg) {
+  ApplySurfaceLiteral(xArg, yArg, m_text, screen);
+}
diff --git a/src/libUnuk/Text.h b/src/libUnuk/Text.h
index 042987c..a74cc08 100644
--- a/src/libUnuk/Text.h
+++ b/src/libUnuk/Text.h
@@ -29,10 +29,14 @@ public:
   void SetXY(int xArg, int yArg);
 
   int SetTextBlended(string textArg, string size, SDL_Color);
+  int SetTextBlended(string textArg, string size, Uint8 r, Uint8 g, Uint8 b);
   int SetTextShaded(string textArg, string size, SDL_Color, SDL_Color);
+  int SetTextShaded(string textArg, string size, Uint8 rF, Uint8 gF, Uint8 bF, Uint8 rB, Uint8 gB, Uint8 bB);
 
   void Render(void);
+  void Render(int xArg, int yArg);
   void RenderLiteral(void);
+  void RenderLiteral(int xArg, int yArg);
 
 private:
   int x, y, w, h;