Software/SystemK
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the Dubuque Protocol the default. #3

Merged
Joe merged 2 commits from Make_KTag_Dubuque_Again into main 2025-06-11 01:05:32 +00:00
Conversation 0 Commits 2 Files changed 2 +8 -2
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
States/Playing/State_Playing__Interacting.c
View file

@ -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)
{

4
States/State_Initializing.c
View file

@ -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();
}