Merge pull request #18 from GamerMan7799/dev

Update Master to v4.1.1

Author: Patrick Rye

Documentation/ChangeLog.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented here.
 This project adheres to [Semantic Versioning](http://semver.org/)
 
+## [4.1.1] - 2015-09-03
+
+### Fixed
+
+* A bug with screen height being linked to player height causing screen to be a bit strange.
+
+
+## Old versions
+
+```
+
 ## [4.1.0] - 2015-09-03
 
 ### Added
@@ -38,10 +49,6 @@ This project adheres to [Semantic Versioning](http://semver.org/)
 * Prompt for using old config not working
 
 
-## Old versions
-
-```
-
 ## [4.0.0] - 2015-08-21
 
 ### Notes

Source/config.cpp

@@ -73,20 +73,17 @@ char clsConfig::verisonCheck(const char *ConfigVerison) {
 	if (Global::blnDebugMode) {
             printf("Config: v %u %u %u %s\n",C_MajorNum,C_MinorNum,C_PatchNum,C_SoftwareStatus);
             printf("Program: v %u %u %u %s\n",DEFINED_VER_MAJOR, DEFINED_VER_MINOR, DEFINED_VER_PATCH, P_SoftwareStatus);
-            getchar();
     }
 
     if (DEFINED_VER_STATUS == "Release"){
         //Since the release doesn't have any any ending in the string we have to check this differently
         if (C_SoftwareStatus[0] != ')') {
             if (Global::blnDebugMode) {printf("Software Status outdated.\n");}
-            getchar();
             return NEWCONFIG;
         }
     } else {
         if ( P_SoftwareStatus[0] != C_SoftwareStatus[0]) {
             if (Global::blnDebugMode) {printf("Software Status outdated.\n");}
-            getchar();
             return NEWCONFIG;
         }
     }

Source/screen.cpp

@@ -13,7 +13,7 @@ clsScreen::clsScreen() {
         //Figure out screen size
         if (Global::Cnfg.getvalues(cnfgScreenWidth) == 0) {width = 35*pic_size;}
         else {width = Global::Cnfg.getvalues(cnfgScreenWidth);}
-        if (Global::Cnfg.getvalues(cnfgScreenHeight) == 0) {height = 14*pic_size;}
+        if (Global::Cnfg.getvalues(cnfgScreenHeight) == 0) {height = DEFINED_MAP_HEIGHT*pic_size;}
         else {height = Global::Cnfg.getvalues(cnfgScreenHeight);}
 
         //Set all the booleans to false
@@ -181,7 +181,7 @@ void clsScreen::update(void) {
     SDL_Rect dst;
 
     //Start updating texture placements
-    for (uint y = (tempPlayer.location.y - 2); (y < (tempPlayer.location.y + Max_Height - 2)) && (y < DEFINED_MAP_HEIGHT); y++) {
+    for (uint y = 0; (y < (Max_Height)) && (y < DEFINED_MAP_HEIGHT); y++) {
         for (uint x = (tempPlayer.location.x - 5); (x < (tempPlayer.location.x + Max_Width - 5)) && (x < DEFINED_MAP_WIDTH); x++) {
             //update where we're trying to put the texture.
             dst.x = (x - tempPlayer.location.x + 5) * pic_size;

Source/version.h

@@ -14,17 +14,17 @@
 //Standard Version Type
 #define DEFINED_VER_MAJOR  4
 #define DEFINED_VER_MINOR  1
-#define DEFINED_VER_PATCH  0
+#define DEFINED_VER_PATCH  1
 
 //Miscellaneous Version Types
 //Don't forget to increment the build number before each build
-#define DEFINED_VER_RC_FILEVERSION 4,1,0,71
-#define DEFINED_VER_RC_FILEVERSION_STRING "4, 1, 0, 71\0"
-#define DEFINED_VER_FULLVERSION_STRING  "4.1.0"
+#define DEFINED_VER_RC_FILEVERSION 4,1,1,4
+#define DEFINED_VER_RC_FILEVERSION_STRING "4, 1, 1, 4\0"
+#define DEFINED_VER_FULLVERSION_STRING  "4.1.1"
 
 //Software Status
-#define DEFINED_VER_STATUS 	"Release"
-#define DEFINED_VER_STATUS_SHORT  "r"
+#define DEFINED_VER_STATUS 	"Alpha"
+#define DEFINED_VER_STATUS_SHORT  "a"
 
 /*
 Software Status can be the following: