Skip to content
This repository was archived by the owner on Jun 12, 2025. It is now read-only.

Commit 3f17ff2

Browse files
author
Patrick Rye
committed
Update to 4.1.0-beta.1
28 August 2015 Released version 4.1.0-beta.1 Change log: -Added: Use of the SDL library -Updated: Show map to use 2D SDL graphics -Merged: Icon_App.rc and Boilerplate.rc -Added: Placeholder .bmp pictures -Updated: Compile Batch files (currently not working; just use Code Blocks) -Updated: Code Blocks project -Changed: Default Show Map from false to true -Updated: Makefile (untested) -Moved: clsEntity::start to be in main
1 parent dce811a commit 3f17ff2

28 files changed

+584
-92
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,11 @@
4747
*.layout
4848
*.depend
4949

50+
# My stuff
51+
*.zip
52+
*.rar
53+
*.tmp
54+
/SDL2Stuff/
55+
/includes/
56+
/lib/
57+

‎Compile-Debug.bat‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88

99
echo Deleting old files...
1010
::Delete the old .exe if it exists
11-
IF EXIST Platformer-Experiment-PRIVATE.exe del /F Platformer-Experiment-PRIVATE.exe
11+
IF EXIST PlatformerExperiment-PRIVATE.exe del /F PlatformerExperiment-PRIVATE.exe
1212
::Delete Stackdump if it exists (so as to not confuse me later)
13-
IF EXIST Platformer-Experiment-PRIVATE.exe.stackdump del /F Platformer-Experiment-PRIVATE.exe.stackdump
13+
IF EXIST PlatformerExperiment-PRIVATE.exe.stackdump del /F PlatformerExperiment-PRIVATE.exe.stackdump
1414
echo.
1515

1616
::Move to the Resources directory
1717
cd %~dp0Resources
1818
echo Compiling Resources...
1919
::Compile the resource files of the icon and boilerplate
20-
windres my_icon.rc -O coff my_icon.res
2120
windres boilerplate.rc -DDEFINED_BUILD_MODE_PRIVATE -O coff boilerplate.res
2221
echo.
2322

@@ -27,19 +26,22 @@ cd %~dp0Source
2726
echo Compiling source files...
2827
::Complie each of the cpp files
2928
echo Compiling main.cpp...
30-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c main.cpp
29+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c main.cpp
3130

3231
echo Compiling config.cpp...
33-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c config.cpp
32+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c config.cpp
3433

3534
echo Compiling map.cpp...
36-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c map.cpp
35+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c map.cpp
3736

3837
echo Compiling entity.cpp...
39-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c entity.cpp
38+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c entity.cpp
4039

4140
echo Compiling tick.cpp...
42-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c tick.cpp
41+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c tick.cpp
42+
43+
echo Compiling screen.cpp...
44+
g++ -std=c++11 -I..\SDL2Stuff\include -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -c screen.cpp
4345

4446
::Move back to the main directory
4547
cd %~dp0
@@ -48,18 +50,18 @@ echo.
4850

4951
::Complie everything together!
5052
echo Linking everything together...
51-
g++ -std=c++11 -Wall -Wextra -g -pg -DDEFINED_BUILD_MODE_PRIVATE -o Platformer-Experiment-PRIVATE.exe %~dp0Source\main.o %~dp0source\config.o %~dp0source\map.o %~dp0source\entity.o %~dp0source\tick.o %~dp0Resources\my_icon.res %~dp0Resources\boilerplate.res
53+
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
5254

5355
echo.
5456
::Delete all the leftover parts
5557
echo Deleting object files...
5658
IF EXIST %~dp0Resources\boilerplate.res del /F %~dp0Resources\boilerplate.res
57-
IF EXIST %~dp0Resources\my_icon.res del /F %~dp0Resources\my_icon.res
5859
IF EXIST %~dp0Source\main.o del /F %~dp0Source\main.o
5960
IF EXIST %~dp0Source\config.o del /F %~dp0Source\config.o
6061
IF EXIST %~dp0Source\map.o del /F %~dp0Source\map.o
6162
IF EXIST %~dp0Source\entity.o del /F %~dp0Source\entity.o
6263
IF EXIST %~dp0Source\tick.o del /F %~dp0Source\tick.o
64+
IF EXIST %~dp0Source\screen.o del /F %~dp0Source\screen.o
6365

6466
echo.
6567

‎Compile-Final.bat‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,16 @@
66
:: This will create the final program not a debug verison
77

88
echo Deleting old files...
9-
::Delete the debug .exe if it exists
10-
IF EXIST Platformer-Experiment-PRIVATE.exe del /F Platformer-Experiment-PRIVATE.exe
11-
::Delete debug Stackdump if it exists (so as to not confuse me later)
12-
IF EXIST Platformer-Experiment-PRIVATE.exe.stackdump del /F Platformer-Experiment-PRIVATE.exe.stackdump
13-
149
::Delete the old .exe if it exists
15-
IF EXIST Platformer-Experiment.exe del /F Platformer-Experiment.exe
10+
IF EXIST PlatformerExperiment.exe del /F PlatformerExperiment.exe
1611
::Delete Stackdump if it exists (so as to not confuse me later)
17-
IF EXIST Platformer-Experiment.exe.stackdump del /F Platformer-Experiment.exe.stackdump
12+
IF EXIST PlatformerExperiment.exe.stackdump del /F PlatformerExperiment.exe.stackdump
1813
echo.
1914

2015
::Move to the Resources directory
2116
cd %~dp0Resources
2217
echo Compiling Resources...
2318
::Compile the resource files of the icon and boilerplate
24-
windres my_icon.rc -O coff my_icon.res
2519
windres boilerplate.rc -O coff boilerplate.res
2620
echo.
2721

@@ -31,19 +25,22 @@ cd %~dp0Source
3125
echo Compiling source files...
3226
::Complie each of the cpp files
3327
echo Compiling main.cpp...
34-
g++ -std=c++11 -w -Os -s -c main.cpp
28+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c main.cpp
3529

3630
echo Compiling config.cpp...
37-
g++ -std=c++11 -w -Os -s -c config.cpp
31+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c config.cpp
3832

3933
echo Compiling map.cpp...
40-
g++ -std=c++11 -w -Os -s -c map.cpp
34+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c map.cpp
4135

4236
echo Compiling entity.cpp...
43-
g++ -std=c++11 -w -Os -s -c entity.cpp
37+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c entity.cpp
4438

4539
echo Compiling tick.cpp...
46-
g++ -std=c++11 -w -Os -s -c tick.cpp
40+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c tick.cpp
41+
42+
echo Compiling screen.cpp...
43+
g++ -std=c++11 -I..\SDL2Stuff\include -w -Os -s -c screen.cpp
4744

4845
::Move back to the main directory
4946
cd %~dp0
@@ -52,19 +49,20 @@ echo.
5249

5350
::Complie everything together!
5451
echo Linking everything together...
55-
g++ -std=c++11 -w -Os -s -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
52+
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
5653

5754
echo.
5855
::Delete all the leftover parts
5956
echo Deleting object files...
6057
IF EXIST %~dp0Resources\boilerplate.res del /F %~dp0Resources\boilerplate.res
61-
IF EXIST %~dp0Resources\my_icon.res del /F %~dp0Resources\my_icon.res
6258
IF EXIST %~dp0Source\main.o del /F %~dp0Source\main.o
6359
IF EXIST %~dp0Source\config.o del /F %~dp0Source\config.o
6460
IF EXIST %~dp0Source\map.o del /F %~dp0Source\map.o
6561
IF EXIST %~dp0Source\entity.o del /F %~dp0Source\entity.o
6662
IF EXIST %~dp0Source\tick.o del /F %~dp0Source\tick.o
63+
IF EXIST %~dp0Source\screen.o del /F %~dp0Source\screen.o
6764

6865
echo.
6966

7067
echo Done!
68+
pause

‎Documentation/ChangeLog.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,26 @@
33
All notable changes to this project will be documented here.
44
This project adheres to [Semantic Versioning](http://semver.org/)
55

6-
## UNRELEASED [4.0.1] - 2015-08-21
6+
## UNRELEASED [4.1.0] - 2015-08-28
77

88
### Added
99

1010
* Debug Compile batch file as well as a final Compile batch
11+
* SDL graphics for show map.
12+
* Place holder bitmaps for map tiles
1113

1214
### Changed
1315

1416
* clsConfig::exists to use the cstdio library instead of fstream
17+
* My_Icon.rc merged into Boilerplate.rc
18+
* Complie batch files updated for changes.
19+
* Default Show Map from false to true
20+
* Makefile with changes.
1521

1622
### Removed
1723

1824
* Some redundant and pointless code.
25+
* Entity Start (now everything is handled in main.cpp)
1926

2027
### Fixed
2128

‎Images/coin.bmp‎

2.38 KB
Binary file not shown.

‎Images/error.bmp‎

2.38 KB
Binary file not shown.

‎Images/monster.bmp‎

2.38 KB
Binary file not shown.

‎Images/player.bmp‎

2.38 KB
Binary file not shown.

‎Images/pole.bmp‎

2.38 KB
Binary file not shown.

‎Images/sky.bmp‎

2.38 KB
Binary file not shown.

0 commit comments

Comments
 (0)