Merge pull request #17 from GamerMan7799/dev

Update Master to v4.1.0

Author: Patrick Rye

.gitignore

@@ -40,6 +40,30 @@
 *.stackdump
 
 # Code Blocks files
-*.cbp
-*.depend
+/Project/bin/
+/Project/bin/*
+/Project/obj/
+/Project/obj/*
 *.layout
+*.depend
+
+# My stuff
+
+# Archived images that don't need to be on Github
+*.zip
+*.rar
+
+# I'll name files this if I don't want them on Github
+*.tmp
+
+# I store my SDL2 include and lib here
+/SDL2Stuff/include/
+/SDL2Stuff/lib/
+
+# Random stuff that also doesn't need to be on github
+/RandomCrap/
+/RandomCrap/*
+
+# Other Libraries (such as libjpeg-9) that I store the dll & license files here in case I decide to use them later.
+/OtherLibraries/
+/OtherLibraries/*

Cleanup.bat

@@ -0,0 +1,45 @@
+@echo off
+:: This batch file will go through the folders and delete files that are not needed.
+:: Once again really just for personal use
+:: There are a lot of random files that get throw about, this batch file will delete them if they are there.
+:: because I'm too lazy to go searching for them myself, but I want to keep my folders clean.
+
+echo Cleaning Debug Folder...
+IF EXIST %~dp0Debug\build.rasm.log del /F %~dp0Debug\build.rasm.log
+IF EXIST %~dp0Debug\PlatformerExperiment-PRIVATE.exe.stackdump del /F %~dp0Debug\PlatformerExperiment-PRIVATE.exe.stackdump
+echo.
+
+echo Cleaning Project Folder...
+IF EXIST %~dp0Project\bin RMDIR /S /Q %~dp0Project\bin
+IF EXIST %~dp0Project\obj RMDIR /S /Q %~dp0Project\obj
+IF EXIST %~dp0Project\Experimental-Platformer-AI.depend del /F %~dp0Project\Experimental-Platformer-AI.depend
+IF EXIST %~dp0Project\Experimental-Platformer-AI.layout del /F %~dp0Project\Experimental-Platformer-AI.layout
+echo.
+
+echo Cleaning Resources Folder...
+IF EXIST %~dp0Resource\boilerplate.res del /F %~dp0Resource\boilerplate.res
+echo.
+
+echo Cleaning Source Folder...
+IF EXIST %~dp0Source\main.o del /F %~dp0Source\main.o
+IF EXIST %~dp0Source\config.o del /F %~dp0Source\config.o
+IF EXIST %~dp0Source\map.o del /F %~dp0Source\map.o
+IF EXIST %~dp0Source\entity.o del /F %~dp0Source\entity.o
+IF EXIST %~dp0Source\tick.o del /F %~dp0Source\tick.o
+IF EXIST %~dp0Source\screen.o del /F %~dp0Source\screen.o
+echo.
+
+echo Cleaning Main Folder...
+IF EXIST %~dp0Config.ini del /F %~dp0Config.ini
+IF EXIST %~dp0gmon.out del /F %~dp0gmon.out
+IF EXIST %~dp0Images.rar del /F %~dp0Images.rar
+IF EXIST %~dp0Images.zip del /F %~dp0Images.zip
+IF EXIST %~dp0PlatformerExperiment.exe del /F %~dp0PlatformerExperiment.exe
+IF EXIST %~dp0PlatformerExperiment-PRIVATE.exe del /F %~dp0PlatformerExperiment-PRIVATE.exe
+IF EXIST %~dp0PlatformerExperiment del /F %~dp0PlatformerExperiment
+IF EXIST %~dp0PlatformerExperiment-PRIVATE del /F %~dp0PlatformerExperiment-PRIVATE
+IF EXIST %~dp0Player.log del /F %~dp0Player.log
+echo.
+
+echo All cleaning done.
+

Debug/Compile-Debug.bat

@@ -0,0 +1,70 @@
+@echo off
+:: A few quick notes about this. 
+:: %~dp0 is the directory the batch file is in, and it ends with a '\' so don't add it
+:: The Batch file has to stay in the main to work as it is written right now
+
+:: This will create the debug verison of the program 
+:: I recommend using Code::Blocks instead but this is here is it is needed
+
+echo Deleting old files...
+::Delete the old .exe if it exists
+IF EXIST PlatformerExperiment-PRIVATE.exe del /F PlatformerExperiment-PRIVATE.exe
+::Delete Stackdump if it exists (so as to not confuse me later)
+IF EXIST PlatformerExperiment-PRIVATE.exe.stackdump del /F PlatformerExperiment-PRIVATE.exe.stackdump
+echo.
+
+::Move to the Resources directory
+cd %~dp0Resources
+echo Compiling Resources...
+::Compile the resource files of the icon and boilerplate
+windres boilerplate.rc -DDEFINED_BUILD_MODE_PRIVATE -O coff boilerplate.res
+echo.
+
+
+::Move to the source folder
+cd %~dp0Source
+echo Compiling source files...
+::Complie each of the cpp files
+echo Compiling main.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c main.cpp
+
+echo Compiling config.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c config.cpp
+
+echo Compiling map.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c map.cpp
+
+echo Compiling entity.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c entity.cpp
+
+echo Compiling tick.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c tick.cpp
+
+echo Compiling screen.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c screen.cpp
+
+::Move back to the main directory
+cd %~dp0
+
+echo.
+
+::Complie everything together!
+echo Linking everything together...
+g++ -std=c++11 -L"C:\Program Files (x86)\CodeBlocks\MinGW\lib" -L%~dp0SDL2Stuff\lib -Wall -Wextra -g -DDEFINED_BUILD_MODE_PRIVATE -o PlatformerExperiment-PRIVATE.exe %~dp0Source\main.o %~dp0source\config.o %~dp0source\map.o %~dp0source\entity.o %~dp0source\tick.o %~dp0source\screen.o %~dp0Resources\boilerplate.res -pg -lgmon -lmingw32 -lSDL2main -lSDL2 -lSDL2_Image -lSDL2_TTF
+
+echo. 
+::Delete all the leftover parts
+echo Deleting object files...
+IF EXIST %~dp0Resources\boilerplate.res del /F %~dp0Resources\boilerplate.res
+IF EXIST %~dp0Source\main.o del /F %~dp0Source\main.o
+IF EXIST %~dp0Source\config.o del /F %~dp0Source\config.o
+IF EXIST %~dp0Source\map.o del /F %~dp0Source\map.o
+IF EXIST %~dp0Source\entity.o del /F %~dp0Source\entity.o
+IF EXIST %~dp0Source\tick.o del /F %~dp0Source\tick.o
+IF EXIST %~dp0Source\screen.o del /F %~dp0Source\screen.o
+
+echo. 
+
+echo Done!
+::Pause encase there was a complie error to allow user to see what the issue is.
+pause

Compile.bat renamed to Debug/Compile-Final.bat

@@ -3,18 +3,19 @@
 :: %~dp0 is the directory the batch file is in, and it ends with a '\' so don't add it
 :: The Batch file has to stay in the main to work as it is written right now
 
+:: This will create the final program not a debug verison
+
 echo Deleting old files...
 ::Delete the old .exe if it exists
-IF EXIST Platformer-Experiment.exe del /F Platformer-Experiment.exe
+IF EXIST PlatformerExperiment.exe del /F PlatformerExperiment.exe
 ::Delete Stackdump if it exists (so as to not confuse me later)
-IF EXIST Platformer-Experiment.exe.stackdump del /F Platformer-Experiment.exe.stackdump
+IF EXIST PlatformerExperiment.exe.stackdump del /F PlatformerExperiment.exe.stackdump
 echo.
 
 ::Move to the Resources directory
 cd %~dp0Resources
 echo Compiling Resources...
 ::Compile the resource files of the icon and boilerplate
-windres my_icon.rc -O coff my_icon.res
 windres boilerplate.rc -O coff boilerplate.res
 echo.
 
@@ -24,19 +25,22 @@ cd %~dp0Source
 echo Compiling source files...
 ::Complie each of the cpp files
 echo Compiling main.cpp...
-g++ -std=c++11 -Wall -g -c main.cpp
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c main.cpp
 
 echo Compiling config.cpp...
-g++ -std=c++11 -Wall -g -c config.cpp
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c config.cpp
 
 echo Compiling map.cpp...
-g++ -std=c++11 -Wall -g -c map.cpp
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c map.cpp
 
 echo Compiling entity.cpp...
-g++ -std=c++11 -Wall -g -c entity.cpp
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c entity.cpp
 
 echo Compiling tick.cpp...
-g++ -std=c++11 -Wall -g -c tick.cpp
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c tick.cpp
+
+echo Compiling screen.cpp...
+g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c screen.cpp
 
 ::Move back to the main directory
 cd %~dp0
@@ -45,21 +49,20 @@ echo.
 
 ::Complie everything together!
 echo Linking everything together...
-g++ -std=c++11 -Wall -g -o Platformer-Experiment.exe %~dp0Source\main.o %~dp0source\config.o %~dp0source\map.o %~dp0source\entity.o %~dp0source\tick.o %~dp0Resources\my_icon.res %~dp0Resources\boilerplate.res
+g++ -std=c++11 -LC:\MinGW\lib -L..\SDL2Stuff\lib -w -Os -s -o PlatformerExperiment.exe %~dp0Source\main.o %~dp0source\config.o %~dp0source\map.o %~dp0source\entity.o %~dp0source\tick.o %~dp0source\screen.o %~dp0Resources\boilerplate.res -lmingw32 -lSDL2main -lSDL2 -lSDL2_Image -lSDL2_TTF
 
 echo. 
 ::Delete all the leftover parts
 echo Deleting object files...
 IF EXIST %~dp0Resources\boilerplate.res del /F %~dp0Resources\boilerplate.res
-IF EXIST %~dp0Resources\my_icon.res del /F %~dp0Resources\my_icon.res
 IF EXIST %~dp0Source\main.o del /F %~dp0Source\main.o
 IF EXIST %~dp0Source\config.o del /F %~dp0Source\config.o
 IF EXIST %~dp0Source\map.o del /F %~dp0Source\map.o
 IF EXIST %~dp0Source\entity.o del /F %~dp0Source\entity.o
 IF EXIST %~dp0Source\tick.o del /F %~dp0Source\tick.o
+IF EXIST %~dp0Source\screen.o del /F %~dp0Source\screen.o
 
 echo. 
 
 echo Done!
-::Pause encase there was a complie error to allow user to see what the issue is.
-pause
+pause

Debug/Object-Builder.sh

@@ -1,3 +1,3 @@
 #This will make a dump of the objects for the exe
 #use this with the stackdump to figure out what went wrong.
-objdump -D -S ../Platformer-Experiment.exe > build.rasm.log
+objdump -D -S ../PlatformerExperiment-PRIVATE.exe > build.rasm.log

Debug/complie.sh

@@ -3,29 +3,29 @@
 #Move out of Debug directory
 cd ../
 #Delete the old .exe if it exists
-rm Platformer-Experiment.exe
+rm Platformer-Experiment-PRIVATE.exe
 #Move to the Resources directory
 cd ./Resources/
 #Complie the resource files of the icon and boilerplate
-windres my_icon.rc -O coff my_icon.res
 windres boilerplate.rc -O coff boilerplate.res
 #Move to the source folder
 cd ../Source
 #Complie each of the cpp files
-g++ -std=c++11 -Wall -g -c main.cpp
-g++ -std=c++11 -Wall -g -c config.cpp
-g++ -std=c++11 -Wall -g -c map.cpp
-g++ -std=c++11 -Wall -g -c entity.cpp
-g++ -std=c++11 -Wall -g -c tick.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c main.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c config.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c map.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c entity.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c tick.cpp
+g++ -std=c++11 -I../SDL2Stuff/include -Wall -Wextra -pg -g -c screen.cpp
 #Move back to the main directory
 cd ../
 #Complie everything together!
-g++ -std=c++11 -Wall -g -o Platformer-Experiment.exe ./Source/main.o ./Source/config.o ./Source/map.o ./Source/entity.o ./Source/tick.o ./Resources/my_icon.res ./Resources/boilerplate.res
+g++ -std=c++11 -L./SDL2Stuff/lib -Wall -Wextra -pg -g -o PlatformerExperiment-PRIVATE.exe ./Source/main.o ./Source/config.o ./Source/map.o ./Source/entity.o ./Source/tick.o ./Source/screen.o ./Resources/boilerplate.res -lSDL2main -lSDL2 -lSDL2_Image -lSDL2_TTF
 #Delete all the leftover parts
 rm ./Resources/boilerplate.res 
-rm ./Resources/my_icon.res 
 rm ./Source/main.o 
 rm ./Source/config.o 
 rm ./Source/map.o 
 rm ./Source/entity.o 
 rm ./Source/tick.o 
+rm ./Source/screen.o