1 files changed, 60 insertions, 15 deletions

diff --git a/JnR.cpp b/JnR.cpp
index 9cc3e61..8b9bd43 100644
--- a/JnR.cpp
+++ b/JnR.cpp
@@ -3,11 +3,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include <SDL/SDL_rotozoom.h>
 #include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <ctime>
-//#include "/usr/include/SDL/SDL_image.h"
 #include <cstdio>
 #include <vector>
 #include <list>
@@ -15,7 +16,14 @@
 
 using namespace std;
 
-/*
+
+string lltostr(const long long& l)
+{
+        stringstream str;
+        str << l;
+        return str.str();
+}
+
 class Label
 {
 protected:
@@ -82,7 +90,7 @@ int Label::setCaption(string ncaption)
 
 int Label::render()
 {
-        TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf",pos.h);
+        TTF_Font *font = TTF_OpenFont("fonts/OpenSans-Semibold.ttf",pos.h);
         image = NULL;
         image = TTF_RenderText_Solid(font, caption.c_str(),textColor);
         if(caption.size() == 0)
@@ -108,7 +116,7 @@ Label::~Label()
 {
         SDL_FreeSurface(image);
 }
-*/
+
 
 int xres = 600;
 int yres = 450;
@@ -148,6 +156,13 @@ void blacken(SDL_Surface* screen)
         SDL_FillRect(screen,NULL,0);
 }
 
+Uint8 playerR = 100;
+Uint8 playerG = 100;
+Uint8 playerB = 100;
+
+Uint8 obstacleR = 255;
+Uint8 obstacleG = 100;
+Uint8 obstacleB = 100;
 
 class Obstacle
 {
@@ -174,7 +189,7 @@ public:
                 temp.x -= levelx;
                 temp.y -= levely;
                 temp.y = yres - temp.y- temp.h;
-                SDL_FillRect(screen, &temp, SDL_MapRGB(screen->format, 255, 255, 255));
+                SDL_FillRect(screen, &temp, SDL_MapRGB(screen->format, obstacleR, obstacleG, obstacleB));
         }
         void step(double time)
         {
@@ -240,6 +255,7 @@ public:
         }
 };
 
+
 vector<Particle> makeDeathAnimation(double x, double y, double r, double vxb, double vyb, int mode)
 {
         vector<Particle> result;
@@ -251,7 +267,7 @@ vector<Particle> makeDeathAnimation(double x, double y, double r, double vxb, do
                         continue;
                 tx += x;
                 ty += y; 
-                Particle temp = Particle(tx, ty, 1, 100, 100, 100);
+                Particle temp = Particle(tx, ty, 1, playerR, playerG, playerB);
                 double vb = (rand()%5000)/30.0;
                 double vp = ((rand()%10000)/10000.0)*2*M_PI;
                 if(!mode)
@@ -283,16 +299,37 @@ double position_multiplier = 3;
 double win_bonus = 5000;
 bool hardcore = false;
 
+void loadConstants()
+{
+        ifstream ins;
+        ins.open("settings.dat");
+        int i = 0;
+        ins >> i;
+        playerR = i;
+        ins >> i;
+        playerG = i;
+        ins >> i;
+        playerB = i;
+        ins >> i;
+        obstacleR = i;
+        ins >> i;
+        obstacleG = i;
+        ins >> i;
+        obstacleB = i;
+        ins.close();
+}
+
 int main()
 {
+        loadConstants();
         string name;
         cout << "This is a simple jump and run" << endl;
         cout << "Please enter your name:";
         cin >> name;
-        cout << "Please enter difficulty (0-100):" << endl;
+        cout << "Please enter difficulty (0-100):";
         int difficulty;
         cin >> difficulty;
-        cout << "Do you want to play in hardcore mode?" << endl;
+        cout << "Do you want to play in hardcore mode(0/1)?";
         cin >> hardcore;
         if(hardcore)
         {
@@ -315,21 +352,21 @@ int main()
         if(SDL_Init(SDL_INIT_VIDEO) == -1)
         {
                 cout << "Error: Could not initialize SDL" << endl;
-                return 0;
+                return 1;
         }
         screen = SDL_SetVideoMode(xres,yres,32,SDL_SWSURFACE);
         if(!screen)
         {
                 cout << "could not initialize screen" << endl;
-                return 0;
+                return 1;
         }
-        /*
+        
         if(TTF_Init() == -1)
         {
                 cout << "could not initialize True Fonts" << endl;
-                return 0;
-        }*/
-        SDL_WM_SetCaption("Ballroller - v0.1", NULL);
+                return 1;
+        }
+        SDL_WM_SetCaption("Ballroller - v0.2", NULL);
         
         
         bool Game_Quit = false;
@@ -368,6 +405,8 @@ int main()
         lpos.y = 10;
         lpos.w = 300;
         lpos.h = 20;
+        Label scoreLabel = Label("Score: " + lltostr((long long)((1+0.5*hardcore)*(highscore + x_pos*position_multiplier))), lpos);
+        
         while(!Game_Quit)
         {
                 steps++;
@@ -414,6 +453,7 @@ int main()
                                 cout << "Collision: You lost the game" << endl;
                                 cout << "Better luck next time!" << endl;
                                 highscore = (int)((1+0.5*hardcore)*(highscore + x_pos*position_multiplier));
+                                scoreLabel.setCaption("Score: " + lltostr(highscore));
                                 cout << "Your highscore: " << highscore << endl;
                                 lost = true;
                                 deathanimation = makeDeathAnimation(x_pos,y_pos,ball_rad,x_vel, y_vel,1);
@@ -430,7 +470,8 @@ int main()
                 {
                         x_pos = x_pos + x_vel/60.0;
                         y_pos = y_pos + y_vel/60.0;
-                        drawCircle(screen, xres/4, fabs(yres-y_pos), ball_rad, 100, 100, 100);
+                        drawCircle(screen, xres/4, fabs(yres-y_pos), ball_rad, playerR, playerG, playerB);
+                        scoreLabel.setCaption("Score: " + lltostr((long long)((1+0.5*hardcore)*(highscore + x_pos*position_multiplier))));
                 }
                 
                 right = -keyState[SDLK_LEFT]+keyState[SDLK_RIGHT];
@@ -472,6 +513,7 @@ int main()
                         cout << "You win the game!" << endl;
                         highscore = (int)((1+0.5*hardcore)*(highscore + x_pos*position_multiplier + win_bonus));
                         cout << "Your highscore: " << highscore << endl;
+                        scoreLabel.setCaption("Score: " + lltostr(highscore));
                         Game_Quit = true;
                 }
                 for(int i = 0; i < xres; ++i)
@@ -487,11 +529,14 @@ int main()
                 }
                 if(animation_term && lost)
                         Game_Quit = true;
+                scoreLabel.draw(screen);
                 SDL_Flip(screen);
                 Uint32 time = SDL_GetTicks()-start;
                 if(1000/60.0 - time > 0)
                         SDL_Delay(1000/60.0 - time);
         }
+        
+        /*The Game has ended*/
         if(!quickquit)
         {
                 ifstream ins;