Added score and easy colorsetting

5 files changed, 123 insertions, 16 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;
diff --git a/Makefile b/Makefile
index 11e46ce..47e7d82 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,7 @@
 all: JnR
 
 JnR: JnR.cpp
-        g++ JnR.cpp -O2 -Wall -lSDL -o JnR
+        g++ JnR.cpp -O2 -Wall -lSDL -std=c++11 -lSDL_ttf -o JnR
+
+clean:
+        rm -f JnR
diff --git a/fonts/Apache License Version 2.txt b/fonts/Apache License Version 2.txt
new file mode 100644
index 0000000..4df74b8
--- /dev/null
+++ b/fonts/Apache License Version 2.txt
@@ -0,0 +1,53 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
\ No newline at end of file
diff --git a/fonts/OpenSans-Semibold.ttf b/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 0000000..1a7679e
--- /dev/null
+++ b/fonts/OpenSans-Semibold.ttf
diff --git a/settings.dat b/settings.dat
new file mode 100644
index 0000000..92ca51e
--- /dev/null
+++ b/settings.dat
@@ -0,0 +1,6 @@
+170
+150
+90
+220
+220
+220