Skip to content

Commit

Permalink
Forced ViZDoom's output to stdout on Windows, bumped version
Browse files Browse the repository at this point in the history
Former-commit-id: 83733e0
  • Loading branch information
mwydmuch committed Oct 19, 2017
1 parent b8a7002 commit 3db2e5f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ project(ViZDoom)

set(ViZDoom_MAJOR_VERSION 1)
set(ViZDoom_MINOR_VERSION 1)
set(ViZDoom_PATCH_VERSION 4)
set(ViZDoom_PATCH_VERSION 5)
set(ViZDoom_VERSION ${ViZDoom_MAJOR_VERSION}.${ViZDoom_MINOR_VERSION}.${ViZDoom_PATCH_VERSION})
set(ViZDoom_VERSION_STR ${ViZDoom_VERSION})
set(ViZDoom_VERSION_ID ${ViZDoom_MAJOR_VERSION}${ViZDoom_MINOR_VERSION}${ViZDoom_PATCH_VERSION})
Expand Down
11 changes: 10 additions & 1 deletion src/lib/ViZDoomController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ namespace vizdoom {
this->sendCommand("viz_render_mode " + b::lexical_cast<std::string>(this->getRenderModeValue()));
}


/* SM setters & getters */
/*----------------------------------------------------------------------------------------------------------------*/

Expand Down Expand Up @@ -889,10 +890,10 @@ namespace vizdoom {

void DoomController::setRunDoomAsync(bool set) { if (!this->doomRunning) this->runDoomAsync = set; }


/* GameVariables getters */
/*----------------------------------------------------------------------------------------------------------------*/


double DoomController::getGameVariable(GameVariable var){

switch (var) {
Expand Down Expand Up @@ -954,6 +955,7 @@ namespace vizdoom {

bool DoomController::isPlayerDead() { return this->gameState->PLAYER_DEAD; }


/* Protected and private functions */
/*----------------------------------------------------------------------------------------------------------------*/

Expand Down Expand Up @@ -983,6 +985,7 @@ namespace vizdoom {
}
}


/* Signals */
/*----------------------------------------------------------------------------------------------------------------*/

Expand All @@ -1004,6 +1007,7 @@ namespace vizdoom {
this->MQController->send(static_cast<uint8_t >(MSG_CODE_SIG + sigNumber));
}


/* Flow */
/*----------------------------------------------------------------------------------------------------------------*/

Expand Down Expand Up @@ -1162,6 +1166,11 @@ namespace vizdoom {
this->doomArgs.push_back("+fullscreen");
this->doomArgs.push_back("0");

#ifdef OS_WIN
// Output to stdout on Windows
this->doomArgs.push_back("-stdout");
#endif

// vizdoom
this->doomArgs.push_back("+viz_controlled");
this->doomArgs.push_back("1");
Expand Down
4 changes: 2 additions & 2 deletions vizdoom-1.1.4-0.rockspec → vizdoom-1.1.5-0.rockspec
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package = "vizdoom"
version = "1.1.4-0"
version = "1.1.5-0"

source = {
url = "git://github.com/mwydmuch/ViZDoom",
tag = "1.1.4"
tag = "1.1.5"
}

description = {
Expand Down

0 comments on commit 3db2e5f

Please sign in to comment.