Mirrors/Checkpoint
2
0
Fork 0
mirror of https://github.com/BernardoGiordano/Checkpoint synced 2024-11-24 17:53:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly merge PR

Browse source
This commit is contained in:
BernardoGiordano 2019-07-04 23:21:12 +02:00
parent ea7e58a14b
commit a469fa1ba0
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
3ds/source/title.cpp
View file

@ -375,10 +375,10 @@ u32 Title::extdataId(void)
return 0x12DC; // Fire Emblem If JP
case 0x001B5100:
return 0x1B50; // Pokémon Ultramoon
// TODO: need confirmation for this
// case 0x001C5100:
// case 0x001C5300:
// return 0x0BD3; // Etrian Odyssey V: Beyond the Myth
// TODO: need confirmation for this
// case 0x001C5100:
// case 0x001C5300:
// return 0x0BD3; // Etrian Odyssey V: Beyond the Myth
}
return low >> 8;

3
switch/include/main.hpp
View file

@ -38,8 +38,9 @@ inline u128 g_currentUId = 0;
inline bool g_backupScrollEnabled = 0;
inline bool g_notificationLedAvailable = false;
inline std::shared_ptr<Screen> g_screen = nullptr;
inline bool g_ftpAvailable = false;
inline bool g_shouldExitNetworkLoop = false;
inline std::string g_selectedCheatKey;
inline std::vector<std::string> g_selectedCheatCodes;
inline bool g_shouldExitNetworkLoop = false;
#endif

4
switch/source/MainScreen.cpp
View file

@ -178,8 +178,8 @@ void MainScreen::draw() const
SDLH_DrawText(24, 616, 450, theme().c6, "\ue002 to delete a backup");
if (gethostid() != INADDR_LOOPBACK) {
if (g_ftpAvailable) {
SDLH_DrawText(24, 16 * 6 + checkpoint_w + 8 + ver_w + inst_w, 642 + (40 - checkpoint_h) / 2 + checkpoint_h - inst_h, COLOR_GOLD,
StringUtils::format("FTP server running on %s:5000", getConsoleIP()).c_str());
SDLH_DrawText(24, 16 * 6 + checkpoint_w + 8 + ver_w + inst_w, 642 + (40 - checkpoint_h) / 2 + checkpoint_h - inst_h, COLOR_GOLD,
StringUtils::format("FTP server running on %s:5000", getConsoleIP()).c_str());
}
SDLH_DrawText(24, 16 * 6 + checkpoint_w + 8 + ver_w + inst_w, 672 + (40 - checkpoint_h) / 2 + checkpoint_h - inst_h, COLOR_GOLD,
StringUtils::format("Configuration server running on %s:8000", getConsoleIP()).c_str());

15
switch/source/main.cpp
View file

@ -30,18 +30,11 @@ extern "C" {
#include "ftp.h"
}
float g_currentTime = 0;
u128 g_currentUId = 0;
bool g_backupScrollEnabled = 0;
bool g_notificationLedAvailable = false;
bool g_ftpAvailable = false;
std::shared_ptr<Screen> g_screen = nullptr;
static void networkLoop(void) {
while(appletMainLoop() && !g_shouldExitNetworkLoop) {
// poll server
static void networkLoop(void)
{
while (appletMainLoop() && !g_shouldExitNetworkLoop) {
Configuration::getInstance().pollServer();
if(g_ftpAvailable) {
if (g_ftpAvailable) {
ftp_loop();
}
}