diff --git a/src/alien.cpp b/src/alien.cpp index caa2dd5..910d8f3 100644 --- a/src/alien.cpp +++ b/src/alien.cpp @@ -878,7 +878,7 @@ void alien_addSmallAsteroid(object *hostAlien) int debris = 1 + rand() % 10; for (int i = 0 ; i < debris ; i++) - addBullet(&weapon[W_ROCKETS], hostAlien, 0, 0); + bullet_add(&weapon[W_ROCKETS], hostAlien, 0, 0); for (int i = 10 ; i < 20 ; i++) if (!aliens[i].active) diff --git a/src/bullets.cpp b/src/bullets.cpp index c11c72d..8849c60 100644 --- a/src/bullets.cpp +++ b/src/bullets.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . #include "Starfighter.h" -void addBullet(object *theWeapon, object *attacker, int y, int dy) +void bullet_add(object *theWeapon, object *attacker, int y, int dy) { object *bullet; signed char imageIndex; @@ -172,34 +172,34 @@ void fireBullet(object *attacker, int weaponType) if (theWeapon->flags & WF_SPREAD && theWeapon->ammo[0] >= 3) { - addBullet(theWeapon, attacker, y * 1, -2); + bullet_add(theWeapon, attacker, y * 1, -2); if(theWeapon->ammo[0] != 4) - addBullet(theWeapon, attacker, y * 3, 0); + bullet_add(theWeapon, attacker, y * 3, 0); if(theWeapon->ammo[0] != 3) { - addBullet(theWeapon, attacker, y * 2, -1); - addBullet(theWeapon, attacker, y * 4, 1); + bullet_add(theWeapon, attacker, y * 2, -1); + bullet_add(theWeapon, attacker, y * 4, 1); } - addBullet(theWeapon, attacker, y * 5, 2); + bullet_add(theWeapon, attacker, y * 5, 2); } else { if(theWeapon->ammo[0] & 1) - addBullet(theWeapon, attacker, y * 3, 0); + bullet_add(theWeapon, attacker, y * 3, 0); if(theWeapon->ammo[0] >= 2) { - addBullet(theWeapon, attacker, y * 2, 0); - addBullet(theWeapon, attacker, y * 4, 0); + bullet_add(theWeapon, attacker, y * 2, 0); + bullet_add(theWeapon, attacker, y * 4, 0); } if(theWeapon->ammo[0] >= 4) { - addBullet(theWeapon, attacker, y * 1, 0); - addBullet(theWeapon, attacker, y * 5, 0); + bullet_add(theWeapon, attacker, y * 1, 0); + bullet_add(theWeapon, attacker, y * 5, 0); } } diff --git a/src/bullets.h b/src/bullets.h index b808b0b..1a634d6 100644 --- a/src/bullets.h +++ b/src/bullets.h @@ -20,7 +20,7 @@ along with this program. If not, see . #ifndef BULLETS_H #define BULLETS_H -extern void addBullet(object *theWeapon, object *attacker, int y, int dy); +void bullet_add(object *theWeapon, object *attacker, int y, int dy); extern void fireBullet(object *attacker, int weaponType); extern char checkPlayerShockDamage(float x, float y); extern void fireRay(object *attacker);