diff options
Diffstat (limited to 'src/weapons')
| -rw-r--r-- | src/weapons/BulletInfo.cpp | 1 | ||||
| -rw-r--r-- | src/weapons/ProjectileInfo.cpp | 3 | ||||
| -rw-r--r-- | src/weapons/Weapon.cpp | 8 | ||||
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 10 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/weapons/BulletInfo.cpp b/src/weapons/BulletInfo.cpp index 92d98a50..389e7486 100644 --- a/src/weapons/BulletInfo.cpp +++ b/src/weapons/BulletInfo.cpp @@ -200,6 +200,7 @@ void CBulletInfo::Update(void) case ENTITY_TYPE_VEHICLE: DMAudio.PlayOneShot(((CVehicle*)pHitEntity)->m_audioEntityId, SOUND_WEAPON_HIT_VEHICLE, 1.0f); break; + default: break; } } CGlass::WasGlassHitByBullet(pHitEntity, point.point); diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp index 8297d953..47bc65ac 100644 --- a/src/weapons/ProjectileInfo.cpp +++ b/src/weapons/ProjectileInfo.cpp @@ -116,6 +116,7 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos, elasticity = 0.5f; break; } + default: break; } int i = 0; @@ -137,6 +138,7 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos, case WEAPONTYPE_GRENADE: ms_apProjectile[i] = new CProjectile(MI_GRENADE); break; + default: break; } if (ms_apProjectile[i] == nil) @@ -183,6 +185,7 @@ CProjectileInfo::RemoveNotAdd(CEntity *entity, eWeaponType weaponType, CVector p case WEAPONTYPE_ROCKETLAUNCHER: CExplosion::AddExplosion(nil, entity, EXPLOSION_ROCKET, pos, 0); break; + default: break; } } diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 3ac769d7..67e01a2e 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -806,6 +806,7 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource) break; } + default: break; } DoBulletImpact(shooter, victim, fireSource, &target, &point, ahead); @@ -1070,6 +1071,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim, break; } + default: break; } } @@ -1101,6 +1103,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim, PlayOneShotScriptObject(SCRIPT_SOUND_BULLET_HIT_GROUND_3, point->point); break; } + default: break; } } else @@ -1328,6 +1331,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) break; } + default: break; } } @@ -1359,6 +1363,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) PlayOneShotScriptObject(SCRIPT_SOUND_BULLET_HIT_GROUND_3, point.point); break; } + default: break; } } else @@ -1768,6 +1773,7 @@ CWeapon::FireInstantHitFromCar(CAutomobile *shooter, bool left) PlayOneShotScriptObject(SCRIPT_SOUND_BULLET_HIT_GROUND_3, point.point); break; } + default: break; } } else @@ -2037,6 +2043,7 @@ CWeapon::Update(int32 audioEntity) break; } + default: break; } } @@ -2131,6 +2138,7 @@ FireOneInstantHitRound(CVector *source, CVector *target, int32 damage) PlayOneShotScriptObject(SCRIPT_SOUND_BULLET_HIT_GROUND_3, point.point); break; } + default: break; } } else diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index aec9c69a..c4ab75d2 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -105,8 +105,8 @@ CWeaponInfo::LoadWeaponData(void) sscanf( &line[lp], "%s %s %f %d %d %d %d %f %f %f %f %f %f %f %s %s %f %f %f %f %d %d", - &weaponName, - &fireType, + weaponName, + fireType, &range, &firingRate, &reload, @@ -119,8 +119,8 @@ CWeaponInfo::LoadWeaponData(void) &fireOffsetX, &fireOffsetY, &fireOffsetZ, - &animToPlay, - &anim2ToPlay, + animToPlay, + anim2ToPlay, &animLoopStart, &animLoopEnd, &delayBetweenAnimAndFire, @@ -201,4 +201,4 @@ CWeaponInfo::Shutdown(void) { debug("Shutting down CWeaponInfo...\n"); debug("CWeaponInfo shut down\n"); -}
\ No newline at end of file +} |