Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added an option to disable Popups for deaths and level exit/entry (#20)

This commit is contained in:
Isaac 2022-03-13 10:06:18 +10:00 committed by GitHub
parent a0cd40adf3
commit fa96370fc2
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pc/configfile.c
View File

@ -113,6 +113,7 @@ bool configCameraMouse = false;
bool configSkipIntro = 0; bool configSkipIntro = 0;
bool configShareLives = 0; bool configShareLives = 0;
bool configEnableCheats = 0; bool configEnableCheats = 0;
bool configDisablePopups = 0;
bool configBubbleDeath = true; bool configBubbleDeath = true;
unsigned int configAmountofPlayers = 16; unsigned int configAmountofPlayers = 16;
bool configHUD = true; bool configHUD = true;
@ -186,6 +187,7 @@ static const struct ConfigOption options[] = {
{.name = "bettercam_degrade", .type = CONFIG_TYPE_UINT, .uintValue = &configCameraDegrade}, {.name = "bettercam_degrade", .type = CONFIG_TYPE_UINT, .uintValue = &configCameraDegrade},
#endif #endif
{.name = "skip_intro", .type = CONFIG_TYPE_BOOL, .boolValue = &configSkipIntro}, {.name = "skip_intro", .type = CONFIG_TYPE_BOOL, .boolValue = &configSkipIntro},
{.name = "enable_popups", .type = CONFIG_TYPE_BOOL, .boolValue = &configDisablePopups},
{.name = "enable_cheats", .type = CONFIG_TYPE_BOOL, .boolValue = &configEnableCheats}, {.name = "enable_cheats", .type = CONFIG_TYPE_BOOL, .boolValue = &configEnableCheats},
#ifdef DISCORDRPC #ifdef DISCORDRPC
{.name = "discordrpc_enable", .type = CONFIG_TYPE_BOOL, .boolValue = &configDiscordRPC}, {.name = "discordrpc_enable", .type = CONFIG_TYPE_BOOL, .boolValue = &configDiscordRPC},

1
src/pc/configfile.h
View File

@ -71,6 +71,7 @@ extern bool configHUD;
extern bool configSkipIntro; extern bool configSkipIntro;
extern bool configShareLives; extern bool configShareLives;
extern bool configEnableCheats; extern bool configEnableCheats;
extern bool configDisablePopups;
extern bool configBubbleDeath; extern bool configBubbleDeath;
extern unsigned int configAmountofPlayers; extern unsigned int configAmountofPlayers;
#ifdef DISCORDRPC #ifdef DISCORDRPC

6
src/pc/djui/djui_panel_display.c
View File

@ -7,7 +7,7 @@ static void djui_panel_display_apply(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_display_create(struct DjuiBase* caller) { void djui_panel_display_create(struct DjuiBase* caller) {
f32 bodyHeight = 32 * 7 + 64 * 2 + 16 * 7; f32 bodyHeight = 32 * 7 + 64 * 2 + 32 * 7;
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create(bodyHeight, "\\#ff0800\\D\\#1be700\\I\\#00b3ff\\S\\#ffef00\\P\\#ff0800\\L\\#1be700\\A\\#00b3ff\\Y"); struct DjuiThreePanel* panel = djui_panel_menu_create(bodyHeight, "\\#ff0800\\D\\#1be700\\I\\#00b3ff\\S\\#ffef00\\P\\#ff0800\\L\\#1be700\\A\\#00b3ff\\Y");
@ -29,6 +29,10 @@ void djui_panel_display_create(struct DjuiBase* caller) {
djui_base_set_size_type(&checkbox4->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); djui_base_set_size_type(&checkbox4->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&checkbox4->base, 1.0f, 32); djui_base_set_size(&checkbox4->base, 1.0f, 32);
struct DjuiCheckbox* checkbox5 = djui_checkbox_create(&body->base, "Disable Popups", &configDisablePopups);
djui_base_set_size_type(&checkbox5->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&checkbox5->base, 1.0f, 32);
char* filterChoices[3] = { "Nearest", "Linear", "Tripoint" }; char* filterChoices[3] = { "Nearest", "Linear", "Tripoint" };
struct DjuiSelectionbox* selectionbox1 = djui_selectionbox_create(&body->base, "Filtering", filterChoices, 3, &configFiltering); struct DjuiSelectionbox* selectionbox1 = djui_selectionbox_create(&body->base, "Filtering", filterChoices, 3, &configFiltering);
djui_base_set_size_type(&selectionbox1->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); djui_base_set_size_type(&selectionbox1->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);

2
src/pc/network/network_player.c
View File

@ -327,8 +327,10 @@ void network_player_update_course_level(struct NetworkPlayer* np, s16 courseNum,
} else { } else {
snprintf(popupMsg, 128, "%s%s\\#dcdcdc\\ entered\n%s", playerColorString, np->name, get_level_name(courseNum, levelNum, areaIndex)); snprintf(popupMsg, 128, "%s%s\\#dcdcdc\\ entered\n%s", playerColorString, np->name, get_level_name(courseNum, levelNum, areaIndex));
} }
if (configDisablePopups == 0) {
djui_popup_create(popupMsg, 1); djui_popup_create(popupMsg, 1);
} }
}
np->currCourseNum = courseNum; np->currCourseNum = courseNum;
np->currActNum = actNum; np->currActNum = actNum;

2
src/pc/network/packets/packet_player.c
View File

@ -344,8 +344,10 @@ void network_receive_player(struct Packet* p) {
char* playerColorString = network_get_player_text_color_string(np->localIndex); char* playerColorString = network_get_player_text_color_string(np->localIndex);
char popupMsg[128] = { 0 }; char popupMsg[128] = { 0 };
snprintf(popupMsg, 128, "%s%s\\#dcdcdc\\ died", playerColorString, np->name); snprintf(popupMsg, 128, "%s%s\\#dcdcdc\\ died", playerColorString, np->name);
if (configDisablePopups == 0) {
djui_popup_create(popupMsg, 1); djui_popup_create(popupMsg, 1);
} }
}
// action changed, reset timer // action changed, reset timer
if (m->action != oldData.action) { if (m->action != oldData.action) {