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

Cleanup

Browse source
This commit is contained in:
Joe Kearney 2025-11-22 14:16:01 -06:00
parent 6d8dab53e0
commit edf80ba83b
5 changed files with 59 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Game/Weapons.c
View file

@ -36,11 +36,11 @@ Weapon_t WeaponsByID[NUMBER_OF_WEAPONS] =
.Time_To_Reload_in_ms = 0
},
// Bayonette
// Bayonet
{
.ID = BAYONETTE_ID,
.ID = BAYONET_ID,
.Type = EDGE,
.Protocol = MILES_TAG_II_PROTOCOL, // For now...
.Protocol = DUBUQUE_PROTOCOL,
.Damage_Per_Shot = 1,
.Shots_Per_Reload = UINT16_MAX,
.Delay_Before_Sending_Shot_in_ms = 0,
@ -52,7 +52,7 @@ Weapon_t WeaponsByID[NUMBER_OF_WEAPONS] =
{
.ID = PISTOL_ID,
.Type = PROJECTILE,
.Protocol = MILES_TAG_II_PROTOCOL, // For now...
.Protocol = DUBUQUE_PROTOCOL,
.Damage_Per_Shot = 10,
.Shots_Per_Reload = 8,
.Delay_Before_Sending_Shot_in_ms = 0,
@ -64,7 +64,7 @@ Weapon_t WeaponsByID[NUMBER_OF_WEAPONS] =
{
.ID = SHOTGUN_ID,
.Type = PROJECTILE,
.Protocol = MILES_TAG_II_PROTOCOL, // For now...
.Protocol = DUBUQUE_PROTOCOL,
.Damage_Per_Shot = 20,
.Shots_Per_Reload = 2,
.Delay_Before_Sending_Shot_in_ms = 0,
@ -76,7 +76,7 @@ Weapon_t WeaponsByID[NUMBER_OF_WEAPONS] =
{
.ID = RIFLE_ID,
.Type = PROJECTILE,
.Protocol = MILES_TAG_II_PROTOCOL, // For now...
.Protocol = DUBUQUE_PROTOCOL,
.Damage_Per_Shot = 10,
.Shots_Per_Reload = 8,
.Delay_Before_Sending_Shot_in_ms = 0,
@ -88,11 +88,11 @@ Weapon_t WeaponsByID[NUMBER_OF_WEAPONS] =
{
.ID = MACHINE_GUN_ID,
.Type = PROJECTILE,
.Protocol = MILES_TAG_II_PROTOCOL, // For now...
.Protocol = DUBUQUE_PROTOCOL,
.Damage_Per_Shot = 10,
.Shots_Per_Reload = 250,
.Delay_Before_Sending_Shot_in_ms = 0,
.Time_Between_Shots_in_ms = 0,
.Time_Between_Shots_in_ms = 100,
.Time_To_Reload_in_ms = 2*60*1000
},

4
Game/Weapons.h
View file

@ -26,7 +26,7 @@
typedef enum
{
TEST_PATTERN_ID = 0,
BAYONETTE_ID = 1,
BAYONET_ID = 1,
PISTOL_ID = 2,
SHOTGUN_ID = 3,
RIFLE_ID = 4,
@ -68,7 +68,7 @@ extern Weapon_t WeaponsByID[NUMBER_OF_WEAPONS];
__attribute__((always_inline)) inline Weapon_t GetWeaponFromID(WeaponID_t id)
{
Weapon_t result = WeaponsByID[TEST_PATTERN_ID];
Weapon_t result = WeaponsByID[DUBUQUE_PROTOCOL_ID];
if (id < NUMBER_OF_WEAPONS)
{