diff --git a/CMakeLists.txt b/CMakeLists.txt index afe3903dca..5c2dffd641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.7) -project(EasyRPG_Player VERSION 0.5.4 LANGUAGES CXX) +project(EasyRPG_Player VERSION 0.6.0 LANGUAGES CXX) # C++11 is required set(CMAKE_CXX_STANDARD 11) diff --git a/README.md b/README.md index 507d14cc40..6f7112d9b5 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.5.4.tar.xz # unpack the tarball - cd easyrpg-player-0.5.4 # enter in the package directory + tar xf easyrpg-player-0.6.0.tar.xz # unpack the tarball + cd easyrpg-player-0.6.0 # enter in the package directory ./configure # find libraries, set options make # compile the executable @@ -99,8 +99,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.5.4.tar.xz # unpack the tarball - cd easyrpg-player-0.5.4 # enter in the package directory + tar xf easyrpg-player-0.6.0.tar.xz # unpack the tarball + cd easyrpg-player-0.6.0 # enter in the package directory cmake . -DCMAKE_BUILD_TYPE=Release # configure project cmake --build . # compile the executable sudo cmake --build . --target install # install system-wide diff --git a/builds/switch/Makefile b/builds/switch/Makefile index f232a1cef9..b800f2d3f6 100644 --- a/builds/switch/Makefile +++ b/builds/switch/Makefile @@ -49,7 +49,7 @@ EXEFS_SRC := exefs_src APP_TITLE := EasyRPG Player APP_AUTHOR := EasyRPG Team & Rinnegatamante -APP_VERSION := 0.5.4 +APP_VERSION := 0.6.0 ICON := icon.jpg #--------------------------------------------------------------------------------- diff --git a/builds/wii/meta.xml b/builds/wii/meta.xml index adfc55fec7..843c4bcf60 100644 --- a/builds/wii/meta.xml +++ b/builds/wii/meta.xml @@ -2,8 +2,8 @@ EasyRPG Player EasyRPG Team - 0.5.4 - 20181026000000 + 0.6.0 + 20190303000000 RPG Maker 2000/2003 player EasyRPG Player is a Role Playing Game interpreter for playing games created by RPG Maker 2000/2003. diff --git a/configure.ac b/configure.ac index 7206f5cd21..3404d28b41 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([easyrpg-player],[0.5.4],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) +AC_INIT([easyrpg-player],[0.6.0],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) AC_CONFIG_AUX_DIR([builds/autoconf/aux]) AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects tar-ustar -Wall dist-xz]) diff --git a/resources/osx/Info.plist b/resources/osx/Info.plist index fb57537047..21c20c4e13 100644 --- a/resources/osx/Info.plist +++ b/resources/osx/Info.plist @@ -31,7 +31,7 @@ APPL CFBundleShortVersionString - 0.5.4 + 0.6.0 diff --git a/resources/player.rc b/resources/player.rc index f2b7102a9f..5bb1a19c31 100644 --- a/resources/player.rc +++ b/resources/player.rc @@ -3,8 +3,8 @@ 1 24 "player.xml" #endif 1 VERSIONINFO -FILEVERSION 0,5,4,0 -PRODUCTVERSION 0,5,4,0 +FILEVERSION 0,6,0,0 +PRODUCTVERSION 0,6,0,0 FILETYPE 0x00000001L { BLOCK "StringFileInfo" @@ -13,13 +13,13 @@ FILETYPE 0x00000001L { VALUE "Comments", "https://easyrpg.org" VALUE "CompanyName", "EasyRPG Project" - VALUE "FileVersion", "0.5.4.0" + VALUE "FileVersion", "0.6.0.0" VALUE "FileDescription", "EasyRPG Player" VALUE "InternalName", "easyrpg-player" - VALUE "LegalCopyright", "2007-2018 EasyRPG Project" + VALUE "LegalCopyright", "2007-2019 EasyRPG Project" VALUE "OriginalFilename", "Player.exe" VALUE "ProductName", "EasyRPG Player" - VALUE "ProductVersion", "0.5.4.0" + VALUE "ProductVersion", "0.6.0.0" } } BLOCK "VarFileInfo" diff --git a/src/filefinder.cpp b/src/filefinder.cpp index 59efbecd2a..190dd3b1d9 100644 --- a/src/filefinder.cpp +++ b/src/filefinder.cpp @@ -233,10 +233,10 @@ namespace { } if (!disable_rtp_warnings && !rtp_name.empty()) { - std::string msg = "Cannot find: %s/%s. " + std::string(search_paths.empty() ? + std::string msg = "Cannot find: %s/%s (%s). " + std::string(search_paths.empty() ? "Install RTP %d to resolve this warning." : "RTP %d was probably not installed correctly."); - Output::Warning(msg.c_str(), dir.c_str(), rtp_name.c_str(), Player::EngineVersion()); + Output::Warning(msg.c_str(), dir.c_str(), name.c_str(), rtp_name.c_str(), Player::EngineVersion()); } else { // not an RTP asset or RTP support was disabled Output::Debug("Cannot find: %s/%s", dir.c_str(), name.c_str()); diff --git a/src/version.h b/src/version.h index 8da77516ce..f7841d7a31 100644 --- a/src/version.h +++ b/src/version.h @@ -27,8 +27,8 @@ * FIXME: Make this a proper, generated version header redefined by the build system. */ #define PLAYER_MAJOR 0 -#define PLAYER_MINOR 5 -#define PLAYER_PATCH 4 +#define PLAYER_MINOR 6 +#define PLAYER_PATCH 0 #define PLAYER_ADDTL "" #define PLAYER_VERSION TO_STRING(PLAYER_MAJOR) "." TO_STRING(PLAYER_MINOR) "." TO_STRING(PLAYER_PATCH) diff --git a/src/window_battlestatus.cpp b/src/window_battlestatus.cpp index 2ea162712f..c66ab79499 100644 --- a/src/window_battlestatus.cpp +++ b/src/window_battlestatus.cpp @@ -88,7 +88,7 @@ void Window_BattleStatus::Refresh() { DrawActorName(*actor, 4, y); DrawActorState(*actor, 84, y); - if (Data::battlecommands.battle_type == RPG::BattleCommands::BattleType_traditional) { + if (Player::IsRPG2k3() && Data::battlecommands.battle_type == RPG::BattleCommands::BattleType_traditional) { contents->TextDraw(126 + 42 + 4 * 6, y, Font::ColorDefault, std::to_string(actor->GetHp()), Text::AlignRight); } else { DrawActorHp(*actor, 126, y, true);