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

Commit 490f388

Browse files
author
Patrick Rye
committed
Update to v4.2.0-Beta.6
Added -Message to display software status Fixed -Issue with Windows Release on some computers.
1 parent 69374ea commit 490f388

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

Documentation/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
99
* Added 5 new brick textures
1010
* Map loading functionality
1111
* Doxygen Support
12+
* Messages that informs the user about the software status.
1213

1314
### Changed
1415
* Player and Monster movement is now velocity based.

Project/Experimental-Platformer-AI.cbp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<Add option="-Os" />
4949
<Add option="-std=c++11" />
5050
<Add option="-w" />
51+
<Add option="-D__NO_INLINE__" />
5152
<Add directory="../SDL2Stuff/include" />
5253
</Compiler>
5354
<Linker>

Source/main.cpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/// @brief Holds all the main functions.
55
/// @author GamerMan7799
66
/// @author xPUREx
7-
/// @version 4.2.0-Beta.5
7+
/// @version 4.2.0-Beta.6
88
/// @date 2015
99
/// @copyright Public Domain Unlicense.
1010
/////////////////////////////////////////////////
@@ -18,9 +18,6 @@
1818
#include "globals.h"
1919
#include "screen.h"
2020
/*****************************************************************************/
21-
//General Todos
22-
/** \todo (xPUREx#2#): Add a short message the varies with the Software status (ex warning if using a beta or alpha) */
23-
/*****************************************************************************/
2421
/** This is the namespace that is meant to hold things that need to be referenced between
2522
different files */
2623
namespace Global {
@@ -68,6 +65,23 @@ int main(int argc, char *argv[]) {
6865
///
6966
/////////////////////////////////////////////////
7067

68+
if ( DEFINED_VER_STATUS_SHORT == "a" ) {
69+
printf("This version is an Alpha, meaning that we cannot be sure that it works correctly. ");
70+
printf("Any features that you see may or may not be changed/removed later in the developmental cycle.\n\n");
71+
} else if ( DEFINED_VER_STATUS_SHORT == "b" ) {
72+
printf("This version is a Beta, meaning that while it should work very closely to how we intend it to work, ");
73+
printf("there may still be some bugs that can cause the program to crash.\n\n");
74+
} else if ( DEFINED_VER_STATUS_SHORT == "rc" ) {
75+
printf("This version is a Release Candidate, meaning that it is only a few items away from being an Official ");
76+
printf("Release. There shouldn't be very many bugs but let us know if you find any.\n\n");
77+
} else if ( DEFINED_VER_STATUS_SHORT == "r" ) {
78+
printf("This version is the official release for the game. There should not be any bugs, so if you find any ");
79+
printf("please let us know right away so we can work to fix them.\n\n");
80+
} else {
81+
printf("This version is not properly labeled. There is a mistake in the version.h file.\n\n");
82+
}
83+
84+
7185
Global::Cnfg.Check(); //Load the config file's values
7286
if (Global::blnError) {printf("\nThere was an error!\n"); return 1;}
7387

Source/version.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
/*****************************************************************************/
1616
//Date Version Types
1717
/** The day of the last build of the program, currently not used. */
18-
#define DEFINED_VER_DATE "25"
18+
#define DEFINED_VER_DATE "17"
1919

2020
/** The month of the last build of the program, currently not used. */
21-
#define DEFINED_VER_MONTH "09"
21+
#define DEFINED_VER_MONTH "10"
2222

2323
/** The year of the last build of the program, currently not used. */
2424
#define DEFINED_VER_YEAR "2015"
2525

2626
/** The Ubuntu style of the date of the last build. It is in YY.MM format. */
27-
#define DEFINED_VER_UBUNTU_VERSION_STYLE "15.09"
27+
#define DEFINED_VER_UBUNTU_VERSION_STYLE "15.10"
2828
/*****************************************************************************/
2929
/** The Major number of the version number */
3030
#define DEFINED_VER_MAJOR 4
@@ -37,13 +37,13 @@
3737
/*****************************************************************************/
3838
/** The version number in a format used by Boilerplate.rc, It is in the following format
3939
[MAJOR].[MINOR].[PATCH].[BUILDNUMBER] */
40-
#define DEFINED_VER_RC_FILEVERSION 4,2,0,38
40+
#define DEFINED_VER_RC_FILEVERSION 4,2,0,42
4141

4242
/** Is the same as DEFINED_VER_RC_FILEVERSION but is a null terminated string */
43-
#define DEFINED_VER_RC_FILEVERSION_STRING "4, 2, 0, 38\0"
43+
#define DEFINED_VER_RC_FILEVERSION_STRING "4, 2, 0, 42\0"
4444

4545
/** A more specific string of the file version */
46-
#define DEFINED_VER_FULLVERSION_STRING "4.2.0-beta.5\0"
46+
#define DEFINED_VER_FULLVERSION_STRING "4.2.0-beta.6\0"
4747

4848
//Software Status
4949
/**

0 commit comments

Comments
 (0)