diff -r 317352596197 -r 1808879e4e73 plugins/funcommands.sp --- a/plugins/funcommands.sp Sun Mar 30 12:41:07 2014 -0400 +++ b/plugins/funcommands.sp Sun Mar 30 14:07:14 2014 -0400 @@ -51,11 +51,11 @@ new Handle:hTopMenu = INVALID_HANDLE; // Sounds -new String:g_BlipSound[PLATFORM_MAX_PATH]; -new String:g_BeepSound[PLATFORM_MAX_PATH]; -new String:g_FinalSound[PLATFORM_MAX_PATH]; -new String:g_BoomSound[PLATFORM_MAX_PATH]; -new String:g_FreezeSound[PLATFORM_MAX_PATH]; +#define SOUND_BLIP "buttons/blip1.wav" +#define SOUND_BEEP "buttons/button17.wav" +#define SOUND_FINAL "weapons/cguard/charging.wav" +#define SOUND_BOOM "weapons/explode3.wav" +#define SOUND_FREEZE "physics/glass/glass_impact_bullet4.wav" // Following are model indexes for temp entities new g_BeamSprite = -1; @@ -179,65 +179,45 @@ public OnMapStart() { - new Handle:gameConfig = LoadGameConfigFile("funcommands.games"); - if (gameConfig == INVALID_HANDLE) + PrecacheSound(SOUND_BLIP, true); + PrecacheSound(SOUND_BEEP, true); + PrecacheSound(SOUND_FINAL, true); + PrecacheSound(SOUND_BOOM, true); + PrecacheSound(SOUND_FREEZE, true); + + new EngineVersion:sdkversion = GetEngineVersion(); + if (sdkversion == Engine_Left4Dead || sdkversion == Engine_Left4Dead2 + || sdkversion == Engine_AlienSwarm || sdkversion == Engine_CSGO) { - SetFailState("Unable to load game config funcommands.games"); - return; - } - - if (GameConfGetKeyValue(gameConfig, "SoundBlip", g_BlipSound, sizeof(g_BlipSound)) && g_BlipSound[0]) - { - PrecacheSound(g_BlipSound, true); + g_BeamSprite = PrecacheModel("materials/sprites/laserbeam.vmt"); + g_HaloSprite = PrecacheModel("materials/sprites/glow01.vmt"); + + // l4d, l4d2, and csgo have this. swarm does not. + if (sdkversion != Engine_AlienSwarm) + { + g_BeamSprite2 = PrecacheModel("materials/sprites/physbeam.vmt"); + } + + g_GlowSprite = PrecacheModel("materials/sprites/blueflare1.vmt"); + + if (sdkversion == Engine_Left4Dead || sdkversion == Engine_Left4Dead2) + { + g_ExplosionSprite = PrecacheModel("sprites/floorfire4_.vmt"); + } + else if (sdkversion == Engine_AlienSwarm) + { + g_ExplosionSprite = PrecacheModel("sprites/flamelet1.vmt"); + } } - - if (GameConfGetKeyValue(gameConfig, "SoundBeep", g_BeepSound, sizeof(g_BeepSound)) && g_BeepSound[0]) + else { - PrecacheSound(g_BeepSound, true); - } - - if (GameConfGetKeyValue(gameConfig, "SoundFinal", g_FinalSound, sizeof(g_FinalSound)) && g_FinalSound[0]) - { - PrecacheSound(g_FinalSound, true); - } - - if (GameConfGetKeyValue(gameConfig, "SoundBoom", g_BoomSound, sizeof(g_BoomSound)) && g_BoomSound[0]) - { - PrecacheSound(g_BoomSound, true); + g_BeamSprite = PrecacheModel("materials/sprites/laser.vmt"); + g_HaloSprite = PrecacheModel("materials/sprites/halo01.vmt"); + g_BeamSprite2 = PrecacheModel("sprites/bluelight1.vmt"); + g_GlowSprite = PrecacheModel("sprites/blueglow2.vmt"); + g_ExplosionSprite = PrecacheModel("sprites/sprite_fire01.vmt"); } - if (GameConfGetKeyValue(gameConfig, "SoundFreeze", g_FreezeSound, sizeof(g_FreezeSound)) && g_FreezeSound[0]) - { - PrecacheSound(g_FreezeSound, true); - } - - new String:buffer[PLATFORM_MAX_PATH]; - if (GameConfGetKeyValue(gameConfig, "SpriteBeam", buffer, sizeof(buffer)) && buffer[0]) - { - g_BeamSprite = PrecacheModel(buffer); - } - - if (GameConfGetKeyValue(gameConfig, "SpriteBeam2", buffer, sizeof(buffer)) && buffer[0]) - { - g_BeamSprite2 = PrecacheModel(buffer); - } - - if (GameConfGetKeyValue(gameConfig, "SpriteExplosion", buffer, sizeof(buffer)) && buffer[0]) - { - g_ExplosionSprite = PrecacheModel(buffer); - } - - if (GameConfGetKeyValue(gameConfig, "SpriteGlow", buffer, sizeof(buffer)) && buffer[0]) - { - g_GlowSprite = PrecacheModel(buffer); - } - - if (GameConfGetKeyValue(gameConfig, "SpriteHalo", buffer, sizeof(buffer)) && buffer[0]) - { - g_HaloSprite = PrecacheModel(buffer); - } - - CloseHandle(gameConfig); } public OnMapEnd()