Skip to content

Commit

Permalink
WUPS 0.8.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Maschell committed Dec 26, 2023
1 parent 3e7be32 commit b0e76d1
Show file tree
Hide file tree
Showing 4 changed files with 204 additions and 249 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/wiiu-env/devkitppc:20230621
FROM ghcr.io/wiiu-env/devkitppc:20231112

COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230719 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.0-dev-20231221-ca17105 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO

WORKDIR project
19 changes: 10 additions & 9 deletions src/globals.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include "globals.h"

int gPreferSystemSettings = 1;
int gSkipOwnRegion = 1;
int gAutoDetection = 1;
bool gPreferSystemSettings = DEFAULT_PREFER_SYSTEM_SETTINGS;
bool gSkipOwnRegion = DEFAULT_SKIP_OWN_REGION;
bool gAutoDetection = DEFAULT_AUTO_DETECTION_VALUE;

int gForceSettingsEnabled = 0;
Lanuages gDefaultLanguage = LANG_ENGLISH;
int32_t gDefaultCountry = 78;
Expand All @@ -12,9 +13,9 @@ Lanuages gCurrentLanguage = gDefaultLanguage;
int32_t gCurrentCountry = gDefaultCountry;
MCPRegion gCurrentProductArea = gDefaultProductArea;

Lanuages gDefaultLangForEUR = LANG_ENGLISH;
int32_t gDefaultCountryForEUR = 110;
Lanuages gDefaultLangForUSA = LANG_ENGLISH;
int32_t gDefaultCountryForUSA = 49;
Lanuages gDefaultLangForJPN = LANG_JAPANESE;
int32_t gDefaultCountryForJPN = 1;
Lanuages gDefaultLangForEUR = DEFAULT_LANG_FOR_EUR;
int32_t gDefaultCountryForEUR = DEFAULT_COUNTRY_FOR_EUR;
Lanuages gDefaultLangForUSA = DEFAULT_LANG_FOR_USA;
int32_t gDefaultCountryForUSA = DEFAULT_COUNTRY_FOR_USA;
Lanuages gDefaultLangForJPN = DEFAULT_LANG_FOR_JPN;
int32_t gDefaultCountryForJPN = DEFAULT_COUNTRY_FOR_JPN;
22 changes: 19 additions & 3 deletions src/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@ enum Lanuages {
LANG_RUSSKI = 10,
};

#define DEFAULT_AUTO_DETECTION_VALUE true
extern bool gAutoDetection;

#define DEFAULT_PREFER_SYSTEM_SETTINGS true
extern bool gPreferSystemSettings;

#define DEFAULT_SKIP_OWN_REGION true
extern bool gSkipOwnRegion;

extern int gPreferSystemSettings;
extern int gSkipOwnRegion;
extern int gAutoDetection;
extern Lanuages gDefaultLanguage;
extern int32_t gDefaultCountry;
extern MCPRegion gDefaultProductArea;
Expand All @@ -32,9 +37,20 @@ extern Lanuages gCurrentLanguage;
extern int32_t gCurrentCountry;
extern MCPRegion gCurrentProductArea;

#define DEFAULT_LANG_FOR_EUR LANG_ENGLISH
#define DEFAULT_COUNTRY_FOR_EUR 110

#define DEFAULT_LANG_FOR_USA LANG_ENGLISH
#define DEFAULT_COUNTRY_FOR_USA 49

#define DEFAULT_LANG_FOR_JPN LANG_JAPANESE
#define DEFAULT_COUNTRY_FOR_JPN 1

extern Lanuages gDefaultLangForEUR;
extern int32_t gDefaultCountryForEUR;

extern Lanuages gDefaultLangForUSA;
extern int32_t gDefaultCountryForUSA;

extern Lanuages gDefaultLangForJPN;
extern int32_t gDefaultCountryForJPN;
Loading

0 comments on commit b0e76d1

Please sign in to comment.