Set ENGINE_VERSION to 1.5.1, remove usage of C++11 nullptr

This commit is contained in:
Daniel Gibson 2021-03-14 03:43:43 +01:00
parent f2239c75da
commit c0421c9e0f
3 changed files with 4 additions and 4 deletions

View file

@ -1637,7 +1637,7 @@ void idPhysics_Player::Restore( idRestoreGame *savefile ) {
* Resetting the axis to mat3_identity when restoring a savegame works around that issue * Resetting the axis to mat3_identity when restoring a savegame works around that issue
* and makes sure players can go on playing if their savegame was "corrupted" by saving * and makes sure players can go on playing if their savegame was "corrupted" by saving
* while idPush was active. See https://github.com/dhewm/dhewm3/issues/328 for more details */ * while idPush was active. See https://github.com/dhewm/dhewm3/issues/328 for more details */
if ( clipModel != nullptr ) { if ( clipModel != NULL ) {
clipModel->SetPosition( clipModel->GetOrigin(), mat3_identity ); clipModel->SetPosition( clipModel->GetOrigin(), mat3_identity );
} }
} }

View file

@ -41,12 +41,12 @@ If you have questions concerning this license or the applicable additional terms
#define GAME_NAME "dhewm 3" // appears on window titles and errors #define GAME_NAME "dhewm 3" // appears on window titles and errors
#endif #endif
#define ENGINE_VERSION "dhewm3 1.5.1rc3" // printed in console #define ENGINE_VERSION "dhewm3 1.5.1" // printed in console
#ifdef ID_REPRODUCIBLE_BUILD #ifdef ID_REPRODUCIBLE_BUILD
// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__ // for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__
// NOTE: remember to update esp. the date for (pre-) releases and RCs and the like // NOTE: remember to update esp. the date for (pre-) releases and RCs and the like
#define ID__DATE__ "Feb 21 2021" #define ID__DATE__ "Mar 13 2021"
#define ID__TIME__ "13:37:42" #define ID__TIME__ "13:37:42"
#else // not reproducible build, use __DATE__ and __TIME__ macros #else // not reproducible build, use __DATE__ and __TIME__ macros

View file

@ -1637,7 +1637,7 @@ void idPhysics_Player::Restore( idRestoreGame *savefile ) {
* Resetting the axis to mat3_identity when restoring a savegame works around that issue * Resetting the axis to mat3_identity when restoring a savegame works around that issue
* and makes sure players can go on playing if their savegame was "corrupted" by saving * and makes sure players can go on playing if their savegame was "corrupted" by saving
* while idPush was active. See https://github.com/dhewm/dhewm3/issues/328 for more details */ * while idPush was active. See https://github.com/dhewm/dhewm3/issues/328 for more details */
if ( clipModel != nullptr ) { if ( clipModel != NULL ) {
clipModel->SetPosition( clipModel->GetOrigin(), mat3_identity ); clipModel->SetPosition( clipModel->GetOrigin(), mat3_identity );
} }
} }