mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump version to 1.3.0

Browse source
This commit is contained in:
Roza 2020-04-22 08:52:54 -04:00
parent 07c0bbceb4
commit 561b591759
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
binding/binding-mri.cpp
View file

@ -61,6 +61,7 @@ extern const char module_rpg1[];
extern const char module_rpg2[];
extern const char module_rpg3[];
// Scripts to run at some point during Ruby execution
#include "EssentialsTilemapHack.rb.xxd"
static void mriBindingExecute();
@ -610,16 +611,20 @@ static void runRMXPScripts(BacktraceData &btData) {
btData.scriptNames.insert(buf, scriptName);
// There is 0 reason for anything other than Essentials to have this class
if (rb_const_defined(rb_cObject, rb_intern("PokemonMapMetadata")) && minimonsters == 0)
if (minimonsters == 0 && rb_const_defined(rb_cObject, rb_intern("PokemonMapMetadata")))
minimonsters = 1;
// Before checking to see if the next script should be skipped,
// make sure to check whether it's the last one or not and run
// any extra stuff before the end (primarily stupid Essentials stuff)
// Will be placed within a build option later
// any extra stuff before the end (primarily stupid Essentials fixes)
// Will be placed within a build option later if I decide to add more
#define SCRIPT(name) rb_str_new((const char*)&___scripts_##name##_rb, ___scripts_##name##_rb_len), #name " (Internal)"
#define EVALFILE(name) if (!evalScript(SCRIPT(name))) break;
if (minimonsters > 0 && i + 2 == scriptCount && !RTEST(rb_gv_get("Z_NOPOKEFIX"))){
evalScript(SCRIPT(EssentialsTilemapHack));
if (i + 2 == scriptCount){
if (minimonsters > 0 && !RTEST(rb_gv_get("Z_NOPOKEFIX"))){
EVALFILE(EssentialsTilemapHack);
}
minimonsters = -1;
}

2
macos/Info.plist
View file

@ -13,7 +13,7 @@
<key>CFBundleIconFile</key>
<string>icon.icns</string>
<key>CFBundleShortVersionString</key>
<string>1.2.2</string>
<string>1.3.0</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>

2
meson.build
View file

@ -1,4 +1,4 @@
project('mkxp-z', 'c', 'cpp', 'objc', 'objcpp', version: '1.2.2', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release', 'warning_level=0'])
project('mkxp-z', 'c', 'cpp', 'objc', 'objcpp', version: '1.3.0', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release', 'warning_level=0'])
minimum_macos_version = get_option('macos_min_version')

8
windows/resource.rc
View file

@ -4,17 +4,17 @@
IDI_APPICON ICON "icon.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,2,0
PRODUCTVERSION 1,2,2,0
FILEVERSION 1,3,0,0
PRODUCTVERSION 1,3,0,0
{
BLOCK "StringFileInfo"
{
BLOCK "040904b0"
{
VALUE "FileVersion", "1.2.2\0"
VALUE "FileVersion", "1.3.0\0"
VALUE "OriginalFilename", "mkxp-z.exe\0"
VALUE "ProductName", "mkxp-z\0"
VALUE "ProductVersion", "1.2.2\0"
VALUE "ProductVersion", "1.3.0\0"
}
}
BLOCK "VarFileInfo"