Update submodules, fix compiling against kabufuda

This commit is contained in:
Phillip Stephens 2019-09-03 23:11:04 -07:00
parent 74572e5be2
commit 2d1d11fb56
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
5 changed files with 7 additions and 4 deletions

View File

@ -0,0 +1,3 @@
<component name="MarkdownNavigator.ProfileManager">
<settings default="" pdf-export="" plain-text-search-scope="Project Files" />
</component>

View File

@ -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) {

2
jbus

@ -1 +1 @@
Subproject commit a79aeacfb9dbb4fb388d9373402f9967ba6dc17b
Subproject commit d72163ad27c4a8b4d993e1a29d758a3548d92bed

@ -1 +1 @@
Subproject commit 91a0a41ceef15adb19245c3f1d8d3819f8432cf7
Subproject commit 35e5c7c90f9d368f29ab191a005d30f91774e50e

@ -1 +1 @@
Subproject commit 3fed6f7283a540b6e41859a170aad753cff591cb
Subproject commit 9e0160b379d1dd8cc355e07dcd76a3625b9a4a02