Fixed Linux build issues; good luck Windows!

Author: 123outerme

main.c

@@ -1514,7 +1514,7 @@ bool doBattle(player* player, bool isBoss)
             if ((playerTurn && player->HP > 0) || (!playerTurn && enemyHP > 0 && !run))
             {
                 bool dispDamage = false;
-                drawTextBox(textBoxText, player, (SDL_Color){0, 0, 0}, (SDL_Rect){.y = 9 * TILE_SIZE, .w = SCREEN_WIDTH, .h = (HEIGHT_IN_TILES - 9) * TILE_SIZE}, true);
+                drawTextBox(textBoxText, player, (SDL_Color){0, 0, 0}, (SDL_Rect){.y = 9 * TILE_SIZE, .w = SCREEN_WIDTH, .h = (HEIGHT_IN_TILES - 9) * TILE_SIZE}, false);
                 if (((attackCode !=  ATTACK_CODE_BLOCK && attackCode != ATTACK_CODE_RUN) && playerTurn) || !playerTurn)
                 {
                     drawText("DAMAGE:", TILE_SIZE / 4, 10 * TILE_SIZE + 2 * TILE_SIZE / 8 , SCREEN_WIDTH, TILE_SIZE, (SDL_Color){0, 0, 0}, false);

outerSDL.c

@@ -28,6 +28,17 @@
 #define ARRAY_OF_MAP_IDS {playerSprite->worldNum, 1.1, 1.2, 1.21, 1.22, 1.31, 1.32, 1.33, 2.1, 2.11, 2.12, 2.21, 2.22, 2.23, 2.33, 3.1, 3.2, 3.22, 3.3, 3.31, 3.32, 4.1, 4.11, 4.12, 4.21, 4.22, 4.31, 4.32, 5.1, 5.11, 5.12, 5.2, 5.21, 5.22, 5.32, 6.1, 6.11, 6.2, 6.21, 6.22, 6.31, 6.32, 7.1, 7.11, 7.12, 7.13, 7.2, 7.21, 7.22, 7.23, 7.24, 8.1, 8.11, 8.2, 8.21, 8.22, 8.32, 8.33}
 #define SIZE_OF_MAP_ARRAY 58
 
+SDL_Window* mainWindow;
+SDL_Surface* mainScreen;
+SDL_Texture* tilesetTexture;
+SDL_Renderer* mainRenderer;
+bool textBoxOn;
+TTF_Font* mainFont;
+//TTF_Font* smallFont;
+int tilemap[HEIGHT_IN_TILES][WIDTH_IN_TILES];
+
+int CUSTOM_SCANCODES[SIZE_OF_SCANCODE_ARRAY];
+
 int init()
 {
     int done = 0;

outerSDL.h

@@ -14,9 +14,9 @@
 */
 #define SDL_MAIN_HANDLED 1
 
-#include "SDL/SDL.h"       //This is included because it's an SDL2 program... duh
-#include "SDL/SDL_image.h" //This is included so we can use PNGs.
-#include "SDL/SDL_ttf.h"   //This is included for text stuff
+#include <SDL2/SDL.h>       //This is included because it's an SDL2 program... duh
+#include <SDL2/SDL_image.h>  //This is included so we can use PNGs.
+#include <SDL2/SDL_ttf.h>   //This is included for text stuff
 #include <stdio.h>         //This is included because it's fundamental always. Even if it ain't needed
 #include <string.h>        //This is included for strncat and other string functions
 #include <stdlib.h>        //This is included for calloc, rand(), and a lot of other stuff
@@ -156,7 +156,7 @@ bool checkCollision();  //checks if player has collided with a solid tile
 SDL_Keycode waitForKey();  //waits for a player to press any key, returns the key that was pressed
 void savePlayerData(player* player, char* filePath);  //saves sprite data to a file
 void saveConfig(char* filePath);  //saves config data to the file
-void changeKey(int keyIndex, int newKey, bool isKeyCode);  //changes the key read from CUSTOM_SCANCODES[keyIndex] to newKey. Converts from keycode, if last arg evals to true.
+void changeKey(int keyIndex, int newKey, bool isKeyCode);  //changes the key read from CUSTOM_SCANCODES[keyIndex] to newKey. Converts from keycode, if last arg evals to true.
 void closeSDL();  //closes out SDL and necessary game systems
 
 char* toString(int value, char * result);  //turns inputted int into a string
@@ -172,16 +172,16 @@ int writeLine(char* filePath, char* stuff);  //appends a line to a file
 char* readLine(char* filePath, int lineNum, char** output);  //reads a certain line from a file
 
 
-SDL_Window* mainWindow;
-SDL_Surface* mainScreen;
-SDL_Texture* tilesetTexture;
-SDL_Renderer* mainRenderer;
-bool textBoxOn;
-TTF_Font* mainFont;
+extern SDL_Window* mainWindow;
+extern SDL_Surface* mainScreen;
+extern SDL_Texture* tilesetTexture;
+extern SDL_Renderer* mainRenderer;
+extern bool textBoxOn;
+extern TTF_Font* mainFont;
 //TTF_Font* smallFont;
-int tilemap[HEIGHT_IN_TILES][WIDTH_IN_TILES];
+extern int tilemap[HEIGHT_IN_TILES][WIDTH_IN_TILES];
 
-int CUSTOM_SCANCODES[SIZE_OF_SCANCODE_ARRAY];
+extern int CUSTOM_SCANCODES[SIZE_OF_SCANCODE_ARRAY];
 #define SC_UP CUSTOM_SCANCODES[0]
 #define SC_DOWN CUSTOM_SCANCODES[1]
 #define SC_LEFT CUSTOM_SCANCODES[2]

version.h

@@ -2,10 +2,10 @@
 #define VERSION_H
 
 	//Date Version Types
-	#define DATE "25"
-	#define MONTH "10"
+	#define DATE "30"
+	#define MONTH "11"
 	#define YEAR "2017"
-	#define UBUNTU_VERSION_STYLE  "17.10"
+	#define UBUNTU_VERSION_STYLE  "17.11"
 
 	//Software Status
 	#define STATUS  ""
@@ -14,14 +14,14 @@
 	//Standard Version Type
 	#define MAJOR  1
 	#define MINOR  1
-	#define BUILD  0
+	#define BUILD  2
 	#define REVISION  0
 
 	//Miscellaneous Version Types
 	#define BUILDS_COUNT  434
-	#define RC_FILEVERSION 1,1,0,0
-	#define RC_FILEVERSION_STRING "1, 1, 0, 0\0"
-	#define FULLVERSION_STRING  "1.1.0.0"
+	#define RC_FILEVERSION 1,1,2,0
+	#define RC_FILEVERSION_STRING "1, 1, 2, 0\0"
+	#define FULLVERSION_STRING  "1.1.2.0"
 
 	//These values are to keep track of your versioning state, don't modify them.
 	#define BUILD_HISTORY  0