diff options
Diffstat (limited to 'src/libui_sdl')
-rw-r--r-- | src/libui_sdl/DlgEmuSettings.cpp | 2 | ||||
-rw-r--r-- | src/libui_sdl/DlgEmuSettings.h | 2 | ||||
-rw-r--r-- | src/libui_sdl/DlgInputConfig.cpp | 4 | ||||
-rw-r--r-- | src/libui_sdl/DlgInputConfig.h | 2 | ||||
-rw-r--r-- | src/libui_sdl/Platform.cpp | 2 | ||||
-rw-r--r-- | src/libui_sdl/main.cpp | 44 |
6 files changed, 49 insertions, 7 deletions
diff --git a/src/libui_sdl/DlgEmuSettings.cpp b/src/libui_sdl/DlgEmuSettings.cpp index 8cb2ccc..77bb18e 100644 --- a/src/libui_sdl/DlgEmuSettings.cpp +++ b/src/libui_sdl/DlgEmuSettings.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. diff --git a/src/libui_sdl/DlgEmuSettings.h b/src/libui_sdl/DlgEmuSettings.h index f26ae14..f8da148 100644 --- a/src/libui_sdl/DlgEmuSettings.h +++ b/src/libui_sdl/DlgEmuSettings.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. diff --git a/src/libui_sdl/DlgInputConfig.cpp b/src/libui_sdl/DlgInputConfig.cpp index 5a98a91..6496307 100644 --- a/src/libui_sdl/DlgInputConfig.cpp +++ b/src/libui_sdl/DlgInputConfig.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. @@ -309,7 +309,7 @@ void Open() uiBoxAppend(in_ctrl, uiControl(g_key), 1); uiGrid* b_key = uiNewGrid(); uiGroupSetChild(g_key, uiControl(b_key)); - + const int width = 120; for (int i = 0; i < 12; i++) diff --git a/src/libui_sdl/DlgInputConfig.h b/src/libui_sdl/DlgInputConfig.h index 33529c2..c044016 100644 --- a/src/libui_sdl/DlgInputConfig.h +++ b/src/libui_sdl/DlgInputConfig.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. diff --git a/src/libui_sdl/Platform.cpp b/src/libui_sdl/Platform.cpp index 80aa0e9..0c29f6b 100644 --- a/src/libui_sdl/Platform.cpp +++ b/src/libui_sdl/Platform.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index 6736fbc..873d95a 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2019 StapleButter This file is part of melonDS. @@ -37,6 +37,8 @@ #include "../Platform.h" #include "../Config.h" +#include "../Savestate.h" + const int kScreenRot[4] = {0, 1, 2, 3}; const int kScreenGap[6] = {0, 1, 8, 64, 90, 128}; @@ -1046,6 +1048,46 @@ int main(int argc, char** argv) return 1; } + // TESTORZ + + u32 zab = 12; + u16 zib = 18; + u8 zob = 9; + u32 zub = 42; + + Savestate* dorp = new Savestate("dorp.zog", true); + dorp->Section("BAKA"); + dorp->Var32(&zab); + dorp->Var8(&zob); + dorp->Section("SHIT"); + dorp->Var16(&zib); + dorp->Var32(&zub); + delete dorp; + + zab = 0; zib = 0; zob = 0; zub = 0; + dorp = new Savestate("dorp.zog", false); + dorp->Section("BAKA"); + dorp->Var32(&zab); + dorp->Var8(&zob); + dorp->Section("SHIT"); + dorp->Var16(&zib); + dorp->Var32(&zub); + delete dorp; + printf("-> %d %d %d %d\n", zab, zib, zob, zub); + + zab = 0; zib = 0; zob = 0; zub = 0; + dorp = new Savestate("dorp.zog", false); + dorp->Section("SHIT"); + dorp->Var16(&zib); + dorp->Var32(&zub); + dorp->Section("BAKA"); + dorp->Var32(&zab); + dorp->Var8(&zob); + delete dorp; + printf("-> %d %d %d %d\n", zab, zib, zob, zub); + + // TESTORZ END + Config::Load(); if (!Config::HasConfigFile("bios7.bin") || !Config::HasConfigFile("bios9.bin") || !Config::HasConfigFile("firmware.bin")) |