thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-25 19:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

the djoslin0 review

Browse source
This commit is contained in:
Cooliokid956 2026-03-26 23:10:46 -05:00
parent fd9168760f
commit d63bfd1719
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/pc/djui/djui_panel_main.c
View file

@ -16,7 +16,7 @@
extern ALIGNED8 u8 texture_coopdx_logo[];
bool gDjuiPanelMainCreated = false;
struct DjuiThreePanel* panel = NULL;
static struct DjuiThreePanel* sPanelMain = NULL;
static void djui_panel_main_quit_yes(UNUSED struct DjuiBase* caller) {
game_exit();
@ -36,15 +36,18 @@ static bool sEggHovered = false;
static bool sEggClicked = false;
static void djui_panel_main_egg_end(struct DjuiBase *base, UNUSED bool *noRender) {
panel->base.x.value -= gGlobalTimer - sEggLastFired + 60;
sPanelMain->base.x.value -= gGlobalTimer - sEggLastFired + 60;
base->color.a = MAX(255.f - ((gGlobalTimer - sEggLastFired + 60) << 3), 0);
if (gGlobalTimer == sEggLastFired) { game_exit(); }
if (gGlobalTimer == sEggLastFired) {
configExCoopTheme = !configExCoopTheme;
game_exit();
}
}
static void djui_panel_main_egg(struct DjuiBase *base, UNUSED bool *noRender) {
if (sEggCounter && sEggLastY == base->clip.y) {
bool hovering = djui_cursor_inside_base(base);
bool clicking = (gInteractablePad.button & PAD_BUTTON_A || mouse_buttons & L_MOUSE_BUTTON);
bool clicking = ((gInteractablePad.button & PAD_BUTTON_A) || (mouse_buttons & L_MOUSE_BUTTON));
if (hovering) {
if (!sEggHovered && sEggLastFired + 20 < gGlobalTimer) {
@ -56,7 +59,6 @@ static void djui_panel_main_egg(struct DjuiBase *base, UNUSED bool *noRender) {
play_sound(SOUND_MENU_COLLECT_SECRET + ((5 - sEggCounter) << 16), gGlobalSoundSource);
if (!--sEggCounter) {
configExCoopTheme = !configExCoopTheme;
play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x1E, 0xFF, 0xFF, 0xFF);
fade_volume_scale(SEQ_PLAYER_LEVEL, 0, 40);
sound_banks_disable(SEQ_PLAYER_SFX, SOUND_BANKS_ALL & ~(1 << SOUND_BANK_MENU));
@ -76,11 +78,11 @@ static void djui_panel_main_egg(struct DjuiBase *base, UNUSED bool *noRender) {
}
void djui_panel_main_create(struct DjuiBase* caller) {
panel = djui_panel_menu_create(configExCoopTheme ? "\\#ff0800\\SM\\#1be700\\64\\#00b3ff\\EX\n\\#ffef00\\COOP" : "", false);
if (configExCoopTheme) { djui_three_panel_get_header(panel)->on_render_pre = djui_panel_main_egg; }
sPanelMain = djui_panel_menu_create(configExCoopTheme ? "\\#ff0800\\SM\\#1be700\\64\\#00b3ff\\EX\n\\#ffef00\\COOP" : "", false);
if (configExCoopTheme) { djui_three_panel_get_header(sPanelMain)->on_render_pre = djui_panel_main_egg; }
{
struct DjuiBase* body = djui_three_panel_get_body(panel);
struct DjuiBase* body = djui_three_panel_get_body(sPanelMain);
{
if (!configExCoopTheme) {
struct DjuiImage* logo = djui_image_create(body, texture_coopdx_logo, 2048, 1024, G_IM_FMT_RGBA, G_IM_SIZ_32b);
@ -109,14 +111,14 @@ void djui_panel_main_create(struct DjuiBase* caller) {
// these two cannot co-exist for some reason
if (gUpdateMessage) {
struct DjuiText* message = djui_text_create(&panel->base, DLANG(NOTIF, UPDATE_AVAILABLE));
struct DjuiText* message = djui_text_create(&sPanelMain->base, DLANG(NOTIF, UPDATE_AVAILABLE));
djui_base_set_size_type(&message->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&message->base, 1.0f, 1.0f);
djui_base_set_color(&message->base, 255, 255, 160, 255);
djui_text_set_alignment(message, DJUI_HALIGN_CENTER, DJUI_VALIGN_BOTTOM);
} else {
struct DjuiText* version = djui_text_create(
&panel->base,
&sPanelMain->base,
#ifdef COMPILE_TIME
get_version_with_build_date()
#else
@ -130,7 +132,7 @@ void djui_panel_main_create(struct DjuiBase* caller) {
}
}
djui_panel_add(caller, panel, NULL);
djui_panel_add(caller, sPanelMain, NULL);
gInteractableOverridePad = true;
gDjuiPanelMainCreated = true;
sEggCounter = 5;

2
src/pc/network/version.h
View file

@ -8,7 +8,7 @@
#define VERSION_NUMBER 41
#define MINOR_VERSION_NUMBER 1
#define VERSION_OFFSET 37
#define VERSION_OFFSET 37 // difference from old versioning system
#if defined(VERSION_JP)
#define VERSION_REGION "JP"

19
src/pc/update_checker.c
View file

@ -64,22 +64,23 @@ size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata) {
}
#endif
void strtov(const char *str, struct Version *ver) {
void string_to_version(const char *str, struct Version *ver) {
char* end;
ver->maj = strtol(str+1, &end, 10);
ver->min = 0; ver->fix = 0;
if (end) ver->min = strtol(end+1, &end, 10);
if (end) ver->fix = strtol(end+1, &end, 10);
}
void vtostr(struct Version ver, char* str) {
void version_to_string(struct Version ver, char* str, size_t size) {
int len;
snprintf(str, 8, "v%i", ver.maj);
snprintf(str, size, "v%i", ver.maj);
if (ver.min || ver.fix) {
len = strlen(str);
snprintf(str + len, 8 - len, ".%i", ver.min);
snprintf(str + len, size - len, ".%i", ver.min);
if (ver.fix) {
len = strlen(str);
snprintf(str + len, 8 - len, ".%i", ver.fix);
snprintf(str + len, size - len, ".%i", ver.fix);
}
}
}
@ -92,9 +93,9 @@ void exify_version(struct Version *ver) {
void exify_version_str(char* str) {
struct Version ver;
strtov(str, &ver);
string_to_version(str, &ver);
exify_version(&ver);
vtostr(ver, str);
version_to_string(ver, str, 8);
}
void parse_version(const char *data) {
@ -108,8 +109,8 @@ void parse_version(const char *data) {
memcpy(sRemoteVersionStr, version, versionLength);
sRemoteVersionStr[versionLength] = '\0';
strtov(sRemoteVersionStr, &sRemoteVersion);
strtov(get_version_online(), &sClientVersion);
string_to_version(sRemoteVersionStr, &sRemoteVersion);
string_to_version(get_version_online(), &sClientVersion);
}
// function to download a text file from the internet