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

Merge 6c81a92d94 into 68a344afcf

Browse source
This commit is contained in:
Nathan-MV 2025-03-21 17:40:28 +01:00 • committed by GitHub
commit 5c615220de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
binding/binding-mri.cpp
View file

@ -166,10 +166,20 @@ static void mriBindingInit() {
if (rgssVer == 1) {
windowBindingInit();
tilemapBindingInit();
} else {
windowVXBindingInit();
}
if (shState->config().tilemapVersion == 1) {
tilemapBindingInit();
} else if (shState->config().tilemapVersion == 2) {
tilemapVXBindingInit();
} else {
if (rgssVer == 1) {
tilemapBindingInit();
} else {
tilemapVXBindingInit();
}
}
inputBindingInit();

9
mkxp.json
View file

@ -531,6 +531,15 @@
// },
// Use alternate tilemap class independent of RGSS version.
// 0: Match RGSS version
// 1: XP
// 2: VX/Ace
// (default: 0)
//
// "tilemapVersion": 0
// Dump tile atlas (for debugging purposes)
// (default: false)
//

2
src/config.cpp
View file

@ -197,6 +197,7 @@ void Config::read(int argc, char *argv[]) {
{"JITMaxCache", 100},
{"JITMinCalls", 10000},
{"YJITEnable", false},
{"tilemapVersion", 0},
{"dumpAtlas", false},
{"bindingNames", json::object({
{"a", "A"},
@ -314,6 +315,7 @@ try { exp } catch (...) {}
SET_OPT_CUSTOMKEY(BGM.trackCount, BGMTrackCount, integer);
SET_STRINGOPT(customScript, customScript);
SET_OPT(useScriptNames, boolean);
SET_OPT(tilemapVersion, integer);
SET_OPT(dumpAtlas, boolean);
fillStringVec(opts["preloadScript"], preloadScripts);

1
src/config.h
View file

@ -146,6 +146,7 @@ struct Config {
bool enabled;
} yjit;
int tilemapVersion;
bool dumpAtlas;
// Keybinding action name mappings