Added more missing functions

Author: rasikhq

VCMP-LUA/Core.cpp

@@ -33,7 +33,7 @@ extern "C" EXPORT unsigned int VcmpPluginInit(PluginFuncs * pluginFuncs, PluginC
 	g_Calls = pluginCalls;
 	g_Info = pluginInfo;
 
-	pluginInfo->pluginVersion = 0x1001;
+	pluginInfo->pluginVersion = 0x2401;
 	pluginInfo->apiMajorVersion = PLUGIN_API_MAJOR;
 	pluginInfo->apiMinorVersion = PLUGIN_API_MINOR;
 

VCMP-LUA/include/vcmp.h

@@ -39,9 +39,6 @@ typedef struct {
 	uint32_t flags;
 } ServerSettings;
 
-#define PLUGIN_API_MAJOR 2
-#define PLUGIN_API_MINOR 0
-
 typedef struct {
 	uint32_t structSize;
 	uint32_t pluginId;

VCMP-LUA/vcmpWrap/Classes/Player.cpp

@@ -45,6 +45,12 @@ void Player::msgAll(const std::string& msg, sol::variadic_args args)
 		player.msg(msg, args);
 }
 
+void Player::announceAll(const std::string& msg, sol::variadic_args args) 
+{
+	for(auto& player : s_Players)
+		player.announce(msg, args);
+}
+
 Player::Player(int32_t id)
 	: m_ID(id), m_LuaData(Lua.create_table()) {
 
@@ -57,6 +63,12 @@ void Player::msg(const std::string& msg, sol::variadic_args args) {
 	g_Funcs->SendClientMessage(m_ID, color, msg.c_str());
 }
 
+void Player::announce(const std::string& msg, sol::variadic_args args) 
+{
+	int32_t type = args.size() > 0 ? args[0] : 0;
+	g_Funcs->SendGameMessage(m_ID, type, msg.c_str());
+}
+
 bool Player::getOption(vcmpPlayerOption option) const {
 	return g_Funcs->GetPlayerOption(m_ID, option);
 }
@@ -489,9 +501,11 @@ void Player::Init(sol::state* L) {
 	userdata["count"] = []() { return s_Players.size(); };
 	userdata["getActive"] = sol::overload([]() -> sol::table { return Player::getActive(false); }, &Player::getActive);
 	userdata["msgAll"] = &Player::msgAll;
+	userdata["announceAll"] = &Player::announceAll;
 
 	/*** METHODS ***/
 	userdata["msg"] = &Player::msg;
+	userdata["announce"] = &Player::announce;
 	userdata["getOption"] = &Player::getOption;
 	userdata["setOption"] = &Player::setOption;
 	userdata["isPlayerStreamed"] = &Player::isPlayerStreamed;

VCMP-LUA/vcmpWrap/Classes/Player.h

@@ -17,6 +17,7 @@ class Player {
 	static inline const char* getStaticType() { return "Player"; }
 	static sol::table getActive(bool spawned = false);
 	static void msgAll(const std::string& msg, sol::variadic_args args);
+	static void announceAll(const std::string& msg, sol::variadic_args args);
 
 	/*** @Lua meta-functions & extra ***/
 	bool operator==(const Player& other) { return this->m_ID == other.m_ID; }
@@ -27,6 +28,8 @@ class Player {
 
 	/*** METHODS ***/
 	void msg(const std::string&, sol::variadic_args);
+	void announce
+	(const std::string&, sol::variadic_args);
 	bool getOption(vcmpPlayerOption) const;
 	void setOption(vcmpPlayerOption, bool);
 	bool isPlayerStreamed(Player*) const;

VCMP-LUA/vcmpWrap/Classes/Server.cpp

@@ -157,6 +157,30 @@ float Server::getVehicleRespawnHeight()
 	return g_Funcs->GetVehiclesForcedRespawnHeight();
 }
 
+sol::object Server::getWastedSettings() 
+{
+	sol::table settings = Lua.create_table();
+
+	uint32_t deathTimer, fadeTimer, fadeColour, corpseFadeStart, corpseFadeTime;
+	float fadeInSpeed, fadeOutSpeed;
+
+	g_Funcs->GetWastedSettings(&deathTimer, &fadeTimer, &fadeInSpeed, &fadeOutSpeed, &fadeColour, &corpseFadeStart, &corpseFadeTime);
+	settings["deathTimer"] = deathTimer;
+	settings["fadeTimer"] = fadeTimer;
+	settings["fadeInSpeed"] = fadeInSpeed;
+	settings["fadeOutSpeed"] = fadeOutSpeed;
+	settings["fadeColour"] = fadeColour;
+	settings["corpseFadeStart"] = corpseFadeStart;
+	settings["corpseFadeTime"] = corpseFadeTime;
+
+	return settings;
+}
+
+int32_t Server::getKillDelay() 
+{
+	return g_Funcs->GetKillCommandDelay();
+}
+
 void Server::setFallTimer(uint16_t value)
 {
 	g_Funcs->SetFallTimer(value);
@@ -207,6 +231,24 @@ void Server::setVehicleRespawnHeight(float value)
 	g_Funcs->SetVehiclesForcedRespawnHeight(value);
 }
 
+void Server::setWastedSettings(sol::table settings) 
+{
+	g_Funcs->SetWastedSettings(
+		settings.get_or("deathTimer", 0),
+		settings.get_or("fadeTimer", 0),
+		settings.get_or("fadeInSpeed", .0f),
+		settings.get_or("fadeOutSpeed", .0f),
+		settings.get_or("fadeColour", 0),
+		settings.get_or("corpseFadeStart", 0),
+		settings.get_or("corpseFadeTime", 0)
+	);
+}
+
+void Server::setKillDelay(int32_t delay)
+{
+	g_Funcs->SetKillCommandDelay(delay);
+}
+
 bool Server::banIP(char* ip)
 {
 	if (isIPBanned(ip))
@@ -1182,6 +1224,8 @@ void Server::Init(sol::state* L) {
 	usertype["gameSpeed"] = sol::property(&Server::getGameSpeed, &Server::setGameSpeed);
 	usertype["flightAltitude"] = sol::property(&Server::getFlightAltitude, &Server::setFlightAltitude);
 	usertype["vehicleRespawnHeight"] = sol::property(&Server::getVehicleRespawnHeight, &Server::setVehicleRespawnHeight);
+	usertype["wastedSettings"] = sol::property(&Server::getWastedSettings, &Server::setWastedSettings);
+	usertype["killDelay"] = sol::property(&Server::getKillDelay, &Server::setKillDelay);
 
 	usertype["getSkinID"] = [](std::string name) -> int {
 		return GetSkinID(name.c_str());
@@ -1412,6 +1456,7 @@ void Server::Init(sol::state* L) {
 }
 
 /*****************************************************************************************************/
+
 std::string Map::GetDistrictName(float x, float y) {
 	if (x > -1613.03f && y > 413.218f && x < -213.73f && y < 1677.32f)
 		return "Downtown Vice City";

VCMP-LUA/vcmpWrap/Classes/Server.h

@@ -45,6 +45,8 @@ class Server {
 	static float getGameSpeed();
 	static float getFlightAltitude();
 	static float getVehicleRespawnHeight();
+	static sol::object getWastedSettings();
+	static int32_t getKillDelay();
 
 	static void setFallTimer(uint16_t);
 	static void setTimeRate(int32_t);
@@ -56,6 +58,8 @@ class Server {
 	static void setGameSpeed(float);
 	static void setFlightAltitude(float);
 	static void setVehicleRespawnHeight(float);
+	static void setWastedSettings(sol::table);
+	static void setKillDelay(int32_t);
 
 	/*** PLAYER ***/
 	static bool banIP(char*);