From 9431dc453499c93f6337476ff75519a0bdc3a7bf Mon Sep 17 00:00:00 2001 From: Joe Kearney Date: Wed, 11 Jun 2025 01:05:32 +0000 Subject: [PATCH] Make the Dubuque Protocol the default. (#3) Until we have menus implemented to change protocols, the Dubuque Protocol will be the default. Fixes https://git.ktag.clubk.club/Management/KTag_Project_Management/issues/5 Co-authored-by: Joe Kearney Reviewed-on: https://git.ktag.clubk.club/Software/SystemK/pulls/3 --- States/Playing/State_Playing__Interacting.c | 6 ++++++ States/State_Initializing.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/States/Playing/State_Playing__Interacting.c b/States/Playing/State_Playing__Interacting.c index ddb9f44..69254aa 100644 --- a/States/Playing/State_Playing__Interacting.c +++ b/States/Playing/State_Playing__Interacting.c @@ -311,6 +311,12 @@ static void Playing__Interacting_Do(StateMachineContext_T * context) KLOG_INFO(KLOG_TAG, "%u of %u health remaining", KTAG_Game_Data.My_Health, KTAG_Game_Data.Max_Health); #endif // LOG_INTERACTING_SUBSTATE } + else + { +#ifdef LOG_INTERACTING_SUBSTATE + KLOG_INFO(KLOG_TAG, "Tag was my own--ignoring."); +#endif // LOG_INTERACTING_SUBSTATE + } } else if (player_ID != my_player_ID) { diff --git a/States/State_Initializing.c b/States/State_Initializing.c index 0b490d8..1570297 100644 --- a/States/State_Initializing.c +++ b/States/State_Initializing.c @@ -110,8 +110,8 @@ static void Initializing_Exit(StateMachineContext_T * context) Perform_Audio_Action(&audio_action); //! \todo Add a menu item to change the weapon. - KLOG_WARN(KLOG_TAG, "Weapon hardcoded to the Nerf Laser Strike Blaster!"); - uint8_t weapon_ID = NERF_LASER_STRIKE_BLASTER_ID; + KLOG_WARN(KLOG_TAG, "Weapon hardcoded to the Dubuque Protocol!"); + uint8_t weapon_ID = DUBUQUE_PROTOCOL_ID; (void) SETTINGS_set_uint8_t(SYSTEMK_SETTING_WEAPONID, weapon_ID); (void) SETTINGS_Save(); }