R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: use SQString's '_stringval' macro for LiveAPI

Browse Source 
Light code cleanup, no logic has been modified.
This commit is contained in:
Kawe Mazidjatari 2024-04-04 02:18:28 +02:00
parent 6d8315626e
commit d1b2fe805f
1 changed files with 38 additions and 38 deletions

76
r5dev/game/server/liveapi/liveapi.cpp

@ -420,7 +420,7 @@ static bool LiveAPI_SetPlayerIdentityFields(HSQUIRRELVM const v, const SQTable*
case rtech::liveapi::Player::kNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_name(_string(obj)->_val);
playerMsg->set_name(_stringval(obj));
break;
}
@ -483,14 +483,14 @@ static bool LiveAPI_SetPlayerIdentityFields(HSQUIRRELVM const v, const SQTable*
case rtech::liveapi::Player::kHardwareNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_hardwarename(_string(obj)->_val);
playerMsg->set_hardwarename(_stringval(obj));
break;
}
case rtech::liveapi::Player::kTeamNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_teamname(_string(obj)->_val);
playerMsg->set_teamname(_stringval(obj));
break;
}
@ -504,14 +504,14 @@ static bool LiveAPI_SetPlayerIdentityFields(HSQUIRRELVM const v, const SQTable*
case rtech::liveapi::Player::kCharacterFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_character(_string(obj)->_val);
playerMsg->set_character(_stringval(obj));
break;
}
case rtech::liveapi::Player::kSkinFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, playerMsg, fieldNum);
playerMsg->set_skin(_string(obj)->_val);
playerMsg->set_skin(_stringval(obj));
break;
}
@ -558,14 +558,14 @@ static bool LiveAPI_SetInventoryItem(HSQUIRRELVM const v, const SQTable* const t
case rtech::liveapi::InventoryItem::kItemFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_item(_string(obj)->_val);
event->set_item(_stringval(obj));
break;
}
case rtech::liveapi::InventoryItem::kExtraDataFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_extradata(_string(obj)->_val);
event->set_extradata(_stringval(obj));
break;
}
@ -678,28 +678,28 @@ static bool LiveAPI_HandleMatchSetup(HSQUIRRELVM const v, const SQObject& obj, r
case rtech::liveapi::MatchSetup::kMapFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_map(_string(obj)->_val);
event->set_map(_stringval(obj));
break;
}
case rtech::liveapi::MatchSetup::kPlaylistNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_playlistname(_string(obj)->_val);
event->set_playlistname(_stringval(obj));
break;
}
case rtech::liveapi::MatchSetup::kPlaylistDescFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_playlistdesc(_string(obj)->_val);
event->set_playlistdesc(_stringval(obj));
break;
}
case rtech::liveapi::MatchSetup::kDatacenterFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
LiveAPI_SetDataCenter(event->mutable_datacenter(), _string(obj)->_val);
LiveAPI_SetDataCenter(event->mutable_datacenter(), _stringval(obj));
break;
}
@ -720,7 +720,7 @@ static bool LiveAPI_HandleMatchSetup(HSQUIRRELVM const v, const SQObject& obj, r
case rtech::liveapi::MatchSetup::kServerIdFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_serverid(_string(obj)->_val);
event->set_serverid(_stringval(obj));
break;
}
@ -758,7 +758,7 @@ static bool LiveAPI_HandleAmmoUsed(HSQUIRRELVM const v, const SQObject& obj, rte
case rtech::liveapi::AmmoUsed::kAmmoTypeFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_ammotype(_string(obj)->_val);
event->set_ammotype(_stringval(obj));
break;
}
@ -809,7 +809,7 @@ static bool LiveAPI_HandleInventoryChange(HSQUIRRELVM const v, const SQObject& o
case event->kItemFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_item(_string(obj)->_val);
event->set_item(_stringval(obj));
break;
}
@ -845,7 +845,7 @@ static bool LiveAPI_HandleInventoryDrop(HSQUIRRELVM const v, const SQObject& obj
case rtech::liveapi::InventoryDrop::kItemFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_item(_string(obj)->_val);
event->set_item(_stringval(obj));
break;
}
@ -869,7 +869,7 @@ static bool LiveAPI_HandleInventoryDrop(HSQUIRRELVM const v, const SQObject& obj
continue;
LIVEAPI_ENSURE_TYPE(v, fieldObj, OT_STRING, event, fieldNum);
event->add_extradata(_string(fieldObj)->_val);
event->add_extradata(_stringval(fieldObj));
}
break;
@ -891,7 +891,7 @@ static bool LiveAPI_HandleGameStateChanged(HSQUIRRELVM const v, const SQObject&
case rtech::liveapi::GameStateChanged::kStateFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_state(_string(obj)->_val);
event->set_state(_stringval(obj));
break;
}
@ -912,7 +912,7 @@ static bool LiveAPI_HandleMatchStateEnd(HSQUIRRELVM const v, const SQObject& obj
case rtech::liveapi::MatchStateEnd::kStateFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_state(_string(obj)->_val);
event->set_state(_stringval(obj));
break;
}
@ -1169,7 +1169,7 @@ static bool LiveAPI_HandlePlayerDowned(HSQUIRRELVM const v, const SQObject& obj,
case rtech::liveapi::PlayerDowned::kWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_weapon(_string(obj)->_val);
event->set_weapon(_stringval(obj));
break;
}
@ -1214,7 +1214,7 @@ static bool LiveAPI_HandlePlayerKilled(HSQUIRRELVM const v, const SQObject& obj,
case rtech::liveapi::PlayerKilled::kWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_weapon(_string(obj)->_val);
event->set_weapon(_stringval(obj));
break;
}
@ -1289,7 +1289,7 @@ static bool LiveAPI_HandlePlayerDamaged(HSQUIRRELVM const v, const SQObject& obj
case rtech::liveapi::PlayerDamaged::kWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_weapon(_string(obj)->_val);
event->set_weapon(_stringval(obj));
break;
}
@ -1333,7 +1333,7 @@ static bool LiveAPI_HandlePlayerAssist(HSQUIRRELVM const v, const SQObject& obj,
case rtech::liveapi::PlayerAssist::kWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_weapon(_string(obj)->_val);
event->set_weapon(_stringval(obj));
break;
}
@ -1516,7 +1516,7 @@ static bool LiveAPI_HandleLinkedEntityEvent(HSQUIRRELVM const v, const SQObject&
case event->kLinkedEntityFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_linkedentity(_string(obj)->_val);
event->set_linkedentity(_stringval(obj));
break;
}
@ -1545,14 +1545,14 @@ static bool LiveAPI_HandleWeaponSwitchedEvent(HSQUIRRELVM const v, const SQObjec
case rtech::liveapi::WeaponSwitched::kOldWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_oldweapon(_string(obj)->_val);
event->set_oldweapon(_stringval(obj));
break;
}
case rtech::liveapi::WeaponSwitched::kNewWeaponFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_newweapon(_string(obj)->_val);
event->set_newweapon(_stringval(obj));
break;
}
@ -1581,7 +1581,7 @@ static bool LiveAPI_HandleBlackMarketActionEvent(HSQUIRRELVM const v, const SQOb
case rtech::liveapi::BlackMarketAction::kItemFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_item(_string(obj)->_val);
event->set_item(_stringval(obj));
break;
}
@ -1639,14 +1639,14 @@ static bool LiveAPI_HandleLegendUpgradeSelected(HSQUIRRELVM const v, const SQObj
case rtech::liveapi::LegendUpgradeSelected::kUpgradeNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_upgradename(_string(obj)->_val);
event->set_upgradename(_stringval(obj));
break;
}
case rtech::liveapi::LegendUpgradeSelected::kUpgradeDescFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_upgradedesc(_string(obj)->_val);
event->set_upgradedesc(_stringval(obj));
break;
}
@ -1725,7 +1725,7 @@ static bool LiveAPI_HandlePlayerStatChanged(HSQUIRRELVM const v, const SQObject&
case rtech::liveapi::PlayerStatChanged::kStatNameFieldNumber:
{
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_statname(_string(obj)->_val);
event->set_statname(_stringval(obj));
break;
}
@ -1809,7 +1809,7 @@ static bool LiveAPI_SetCustomArrayFields(HSQUIRRELVM const v, google::protobuf::
listData->add_values()->set_number_value(_float(valueObj));
break;
case OT_STRING:
listData->add_values()->set_string_value(_string(valueObj)->_val);
listData->add_values()->set_string_value(_stringval(valueObj));
break;
case OT_VECTOR:
LiveAPI_SetCustomVectorField(listData->add_values()->mutable_struct_value(), _vector3d(valueObj));
@ -1875,24 +1875,24 @@ static bool LiveAPI_SetCustomTableFields(HSQUIRRELVM const v, google::protobuf::
switch (valueType)
{
case OT_BOOL:
(*structData->mutable_fields())[_string(node.key)->_val].set_bool_value(_bool(node.val));
(*structData->mutable_fields())[_stringval(node.key)].set_bool_value(_bool(node.val));
break;
case OT_INTEGER:
(*structData->mutable_fields())[_string(node.key)->_val].set_number_value(_integer(node.val));
(*structData->mutable_fields())[_stringval(node.key)].set_number_value(_integer(node.val));
break;
case OT_FLOAT:
(*structData->mutable_fields())[_string(node.key)->_val].set_number_value(_float(node.val));
(*structData->mutable_fields())[_stringval(node.key)].set_number_value(_float(node.val));
break;
case OT_STRING:
(*structData->mutable_fields())[_string(node.key)->_val].set_string_value(_string(node.val)->_val);
(*structData->mutable_fields())[_stringval(node.key)].set_string_value(_stringval(node.val));
break;
case OT_VECTOR:
LiveAPI_SetCustomVectorField((*structData->mutable_fields())[_string(node.key)->_val].mutable_struct_value(), _vector3d(node.val));
LiveAPI_SetCustomVectorField((*structData->mutable_fields())[_stringval(node.key)].mutable_struct_value(), _vector3d(node.val));
break;
case OT_ARRAY:
LIVEAPI_CHECK_RECURSION_DEPTH(v, counter.Get());
if (!LiveAPI_SetCustomArrayFields(v, (*structData->mutable_fields())[_string(node.key)->_val].mutable_list_value(), _array(node.val)))
if (!LiveAPI_SetCustomArrayFields(v, (*structData->mutable_fields())[_stringval(node.key)].mutable_list_value(), _array(node.val)))
return false;
break;
@ -1905,7 +1905,7 @@ static bool LiveAPI_SetCustomTableFields(HSQUIRRELVM const v, google::protobuf::
return false;
}
if (!LiveAPI_SetCustomTableFields(v, (*structData->mutable_fields())[_string(node.key)->_val].mutable_struct_value(), _table(node.val)))
if (!LiveAPI_SetCustomTableFields(v, (*structData->mutable_fields())[_stringval(node.key)].mutable_struct_value(), _table(node.val)))
return false;
break;
@ -1929,7 +1929,7 @@ static bool LiveAPI_HandleCustomEvent(HSQUIRRELVM const v, const SQObject& obj,
{
case rtech::liveapi::CustomEvent::kNameFieldNumber:
LIVEAPI_ENSURE_TYPE(v, obj, OT_STRING, event, fieldNum);
event->set_name(_string(obj)->_val);
event->set_name(_stringval(obj));
break;
case rtech::liveapi::CustomEvent::kDataFieldNumber: