From 376a2f11e49ca7faac149ab5089203279aee5528 Mon Sep 17 00:00:00 2001 From: Marqt Date: Tue, 17 May 2016 21:03:30 +0200 Subject: [PATCH] Version updated to 1.0.2, fixed message in ViZDoomMismatchedVersionException Former-commit-id: 54a1091830aa08b3afc8e811dbb4f8947bb20bce --- .gitignore | 1 + README.md | 2 +- include/ViZDoomDefines.h | 4 ++-- src/lib/ViZDoomExceptions.cpp | 2 +- src/vizdoom/src/vizdoom_defines.h | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f916d86d4..560115da1 100644 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,7 @@ src/vizdoom/tools/updaterevision/x64/ src/vizdoom/tools/zipdir/x64 src/vizdoom/tools/zipdir/zipdir src/vizdoom/wadsrc_wad +src/vizdoom/zdoom_docs src/vizdoom/zlib/x64/ # Game wads, scenarios backups and personal configurations diff --git a/README.md b/README.md index 0240df25a..918dafe74 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ make ###Windows -We are providing compiled runtime binaries and development libraries for Windows [here](https://github.com/Marqt/ViZDoom/releases/download/1.0.1/ViZDoom-1.0.1-Win-x86_64.zip). +We are providing compiled runtime binaries and development libraries for Windows [here](https://github.com/Marqt/ViZDoom/releases/download/1.0.1/ViZDoom-1.0.2-Win-x86_64.zip). ####Dependencies * CMake 3.0+ diff --git a/include/ViZDoomDefines.h b/include/ViZDoomDefines.h index 857c51018..02d81c220 100644 --- a/include/ViZDoomDefines.h +++ b/include/ViZDoomDefines.h @@ -27,8 +27,8 @@ namespace vizdoom{ - #define VIZDOOM_LIB_VERSION 101 - #define VIZDOOM_LIB_VERSION_STR "1.0.1" + #define VIZDOOM_LIB_VERSION 102 + #define VIZDOOM_LIB_VERSION_STR "1.0.2" typedef unsigned char uint8_t; diff --git a/src/lib/ViZDoomExceptions.cpp b/src/lib/ViZDoomExceptions.cpp index 1f9483b95..e9bd19b68 100644 --- a/src/lib/ViZDoomExceptions.cpp +++ b/src/lib/ViZDoomExceptions.cpp @@ -58,7 +58,7 @@ namespace vizdoom{ ViZDoomMismatchedVersionException::~ViZDoomMismatchedVersionException() throw(){} const char* ViZDoomMismatchedVersionException::what() const throw(){ - std::string what = "Controlled ViZDoom version (" + this->vizdoomVersion + ") does not match library version (" + this->vizdoomVersion + ")."; + std::string what = "Controlled ViZDoom version (" + this->vizdoomVersion + ") does not match library version (" + this->libVersion + ")."; return strdup(what.c_str()); } diff --git a/src/vizdoom/src/vizdoom_defines.h b/src/vizdoom/src/vizdoom_defines.h index 31be12983..b154ab2ff 100644 --- a/src/vizdoom/src/vizdoom_defines.h +++ b/src/vizdoom/src/vizdoom_defines.h @@ -29,8 +29,8 @@ extern bool vizdoomNextTic; extern bool vizdoomUpdate; extern unsigned int vizdoomLastUpdate; -#define VIZDOOM_VERSION 101 -#define VIZDOOM_VERSION_STR "1.0.1" +#define VIZDOOM_VERSION 102 +#define VIZDOOM_VERSION_STR "1.0.2" #define VIZDOOM_TIME (level.starttime + level.maptime)