From 2d1d11fb56ec470db64827f3576ca4bd443f1719 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 3 Sep 2019 23:11:04 -0700 Subject: [PATCH] Update submodules, fix compiling against kabufuda --- .idea/markdown-navigator/profiles_settings.xml | 3 +++ Runtime/CMemoryCardSys.cpp | 2 +- jbus | 2 +- kabufuda | 2 +- specter | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .idea/markdown-navigator/profiles_settings.xml diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 000000000..db0626632 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Runtime/CMemoryCardSys.cpp b/Runtime/CMemoryCardSys.cpp index 800fcf80d..0d47a4fbb 100644 --- a/Runtime/CMemoryCardSys.cpp +++ b/Runtime/CMemoryCardSys.cpp @@ -11,7 +11,7 @@ namespace urde { using ECardResult = kabufuda::ECardResult; static kabufuda::SystemString g_CardImagePaths[2] = {}; -static kabufuda::Card g_CardStates[2] = {{"GM8E", "01"}, {"GM8E", "01"}}; +static kabufuda::Card g_CardStates[2] = {kabufuda::Card{"GM8E", "01"}, kabufuda::Card{"GM8E", "01"}}; // static kabufuda::ECardResult g_OpResults[2] = {}; CSaveWorldIntermediate::CSaveWorldIntermediate(CAssetId mlvl, CAssetId savw) : x0_mlvlId(mlvl), x8_savwId(savw) { diff --git a/jbus b/jbus index a79aeacfb..d72163ad2 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit a79aeacfb9dbb4fb388d9373402f9967ba6dc17b +Subproject commit d72163ad27c4a8b4d993e1a29d758a3548d92bed diff --git a/kabufuda b/kabufuda index 91a0a41ce..35e5c7c90 160000 --- a/kabufuda +++ b/kabufuda @@ -1 +1 @@ -Subproject commit 91a0a41ceef15adb19245c3f1d8d3819f8432cf7 +Subproject commit 35e5c7c90f9d368f29ab191a005d30f91774e50e diff --git a/specter b/specter index 3fed6f728..9e0160b37 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 3fed6f7283a540b6e41859a170aad753cff591cb +Subproject commit 9e0160b379d1dd8cc355e07dcd76a3625b9a4a02