thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-01-31 09:57:14 +01:00
Code Releases Activity

Merge branch 'master' of https://github.com/iSLC/VCMP-SqMod

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2018-10-23 21:29:58 +03:00
commit b685d4bf0c
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Misc/Functions.cpp
View File

@ -626,6 +626,15 @@ void PlaySoundEx(Int32 world, Int32 sound, Float32 x, Float32 y, Float32 z)
}
}
// ------------------------------------------------------------------------------------------------
void PlaySoundForWorld(Int32 world, Int32 sound)
{
if (_Func->PlaySound(world, sound, NAN, NAN, NAN) == vcmpErrorArgumentOutOfBounds)
{
STHROWF("Argument value out of bounds");
}
}
// ------------------------------------------------------------------------------------------------
void HideMapObject(Int32 model, const Vector3 & pos)
{

5
source/Misc/Functions.hpp
View File

@ -318,6 +318,11 @@ void PlaySound(Int32 world, Int32 sound, const Vector3 & pos);
*/
void PlaySoundEx(Int32 world, Int32 sound, Float32 x, Float32 y, Float32 z);
/* ------------------------------------------------------------------------------------------------
* Play a game sound to a specific world.
*/
void PlaySoundForWorld(Int32 world, Int32 sound);
/* ------------------------------------------------------------------------------------------------
* Make a map object invisible.
*/

2
source/Misc/Register.cpp
View File

@ -90,6 +90,7 @@ void Register_Misc(HSQUIRRELVM vm)
.Func(_SC("CreateExplosionEx"), &CreateExplosionEx)
.Func(_SC("PlaySound"), &PlaySound)
.Func(_SC("PlaySoundEx"), &PlaySoundEx)
.Func(_SC("PlaySoundForWorld"), &PlaySoundForWorld)
.Func(_SC("HideMapObject"), &HideMapObject)
.Func(_SC("HideMapObjectEx"), &HideMapObjectEx)
.Func(_SC("HideMapObjectRaw"), &HideMapObjectRaw)
@ -151,6 +152,7 @@ void Register_Misc(HSQUIRRELVM vm)
.Func(_SC("IsWeaponNatural"), &IsWeaponNatural)
.Func(_SC("PlaySound"), &PlaySound)
.Func(_SC("PlaySoundEx"), &PlaySoundEx)
.Func(_SC("PlaySoundForWorld"), &PlaySoundForWorld)
.Func(_SC("CreateExplosion"), &CreateExplosion)
.Func(_SC("CreateExplosionEx"), &CreateExplosionEx);

2
source/Misc/Vehicle.cpp
View File

@ -664,7 +664,7 @@ Int32 GetAutomobileID(const StackStrF & name)
// [Vic]e Squad Cheetah
if (c == 'a') return SQMOD_VEHICLE_VICECHEE;
// [Vir]go
if (c == 'o') return SQMOD_VEHICLE_VIRGO;
if (c == 'r') return SQMOD_VEHICLE_VIRGO;
// Default to unknwon
else return SQMOD_UNKNOWN;
// [Vo]odoo

2
source/Misc/Weapon.cpp
View File

@ -288,6 +288,8 @@ Int32 GetWeaponID(const StackStrF & name)
else if (b == 't') return SQMOD_WEAPON_STUBBY;
// [Su]icide
else if (b == 'u') return SQMOD_WEAPON_SUICIDE;
// Pump action [Sh]otgun
else if (b == 'h') return SQMOD_WEAPON_SHOTGUN;
// Default to unknwon
else return SQMOD_UNKNOWN;
// [T]ear Gas