more compile errors

This commit is contained in:
hjw 2014-01-23 11:01:43 +00:00
parent dc4bbb66eb
commit 18ce11ff78
3 changed files with 474 additions and 465 deletions

View file

@ -75,7 +75,7 @@
#define kCommanderPlayerSpeed 4000
#define kCustomIconColorLength 3
#define kCustomIconNameLength 5
#define kDebugAnimations 1
#define kDebugAnimations 0
#define kDebugServerCaching 1
#define kDebugShowEntityLog 1
#define kDefenseChamberBuildTime 20
@ -84,6 +84,7 @@
#define kDefenseChamberThinkInterval 2
#define kDefensiveChamberHealRange 400
#define kDefensiveChamberRegenAmount 10
#define kDefensiveChamberRegenPercent 1
#define kDevourDamage 3
#define kDevourRange 100
#define kDistressBeaconCost 15
@ -119,23 +120,24 @@
#define kGameDownloadSize 150
#define kGameHDSpaceNeeded 300
#define kGameVersionMajor 3
#define kGameVersionMinor 1
#define kGameVersionMinor 2
#define kGameVersionRevision 0
#define kGestateBaseArmor 150
#define kGestateHealth 200
#define kGorgeArmorUpgrade 50
#define kGorgeBaseArmor 50
#define kGorgeBaseArmor 70
#define kGorgeBaseSpeed 170
#define kGorgeCost 10
#define kGorgeGestateTime 10
#define kGorgeHealth 150
#define kGrenDetonateTime 0.75
#define kGrenDetonateTime 2
#define kGrenadeDamage 125
#define kGrenadeForce 800
#define kGrenadeLauncherCost 15
#define kGrenadeRadius 350
#define kGrenadesResearchCost 10
#define kGrenadesResearchTime 45
#define kHandGrenDetonateTime 0.75
#define kHGDamage 20
#define kHGMaxAmmo 30
#define kHGMaxClip 10
@ -143,7 +145,7 @@
#define kHMGDamage 20
#define kHMGMaxAmmo 250
#define kHMGMaxClip 125
#define kHandGrenadeDamage 100
#define kHandGrenadeDamage 80
#define kHandGrenadeMaxAmmo 2
#define kHealingSprayBuildableScalar 5
#define kHealingSprayDamage 13
@ -164,9 +166,9 @@
#define kInfantryPortalBuildTime 10
#define kInfantryPortalCost 20
#define kInfantryPortalHealth 2500
#define kJetpackCost 15
#define kJetpacksResearchCost 35
#define kJetpacksResearchTime 60
#define kJetpackCost 10
#define kJetpacksResearchCost 45
#define kJetpacksResearchTime 75
#define kKNDamage 30
#define kKillRewardMax 3
#define kKillRewardMin 1
@ -350,7 +352,12 @@
#define kCatalystDamagePercent 0.25
#define kCatalystROFFactor 0.25
#define kCatalystSpeedIncrease 0.25
#define kChargeEnergyCost 0.07
#define kChargeEnergyCost 0.15
#define kChargeMaxPushbackSpeedFactor 2.50
#define kChargeMaxPushbackForce 100.0
#define kChargePushbackRadius 100.0
#define kChargeSpeed 1.00
#define kChargeThresholdTime 0.75
#define kChargingEnergyScalar 2.80
#define kClawsEnergyCost 0.07
#define kClawsROF 0.90
@ -398,7 +405,8 @@
#define kJoinTeamCooldown 3.00
#define kKNROF 0.65
#define kLeapEnergyCost 0.25
#define kLerkBaseAscendSpeedMax 600.00
#define kLerkBaseSpeedMax 650.0
#define kLeapROF 0.50
#define kMGROF 0.10
#define kMarineArmorLevelOne 0.20
#define kMarineArmorLevelThree 0.60
@ -456,6 +464,7 @@
#define kWeaponDamageLevelThree 0.30
#define kWeaponDamageLevelTwo 0.20
#define kWebEnergyCost 0.18
#define kWebWarmupTime 1.5
#define kWebSpinnerROF 0.50
#define kWelderBuildingModifier 1.00
#define kWelderPlayerModifier 0.50

View file

@ -45,7 +45,7 @@ bool CVoiceBanMgr::Init(char const *pGameDir)
Term();
char filename[512];
_snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
// Load in the squelch file.
FILE *fp = fopen(filename, "rb");
@ -96,7 +96,7 @@ void CVoiceBanMgr::SaveState(char const *pGameDir)
{
// Save the file out.
char filename[512];
_snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
FILE *fp = fopen(filename, "wb");
if(fp)

View file

@ -73,7 +73,7 @@ static void VoiceServerDebug( char const *pFmt, ... )
return;
va_start( marker, pFmt );
_vsnprintf( msg, sizeof(msg), pFmt, marker );
vsnprintf( msg, sizeof(msg), pFmt, marker );
va_end( marker );
ALERT( at_console, "%s", msg );