Skip to content

Commit ebfadeb

Browse files
authored
Merge branch 'master' into upgrades
2 parents 9d861e6 + 884923f commit ebfadeb

File tree

7 files changed

+409
-392
lines changed

7 files changed

+409
-392
lines changed

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,14 +2510,14 @@ bool CLuaPedDefs::killPedTask(CClientPed* ped, taskType taskType, std::uint8_t t
25102510
}
25112511
}
25122512

2513-
void CLuaPedDefs::PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probabilty)
2513+
void CLuaPedDefs::PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probability)
25142514
{
25152515
auto speechContextId = static_cast<ePedSpeechContext>(speechId);
25162516
if (speechContextId < ePedSpeechContext::NOTHING || speechContextId >= ePedSpeechContext::NUM_PED_CONTEXT)
25172517
throw LuaFunctionError("The argument speechId is invalid. The valid range is 0-359.");
25182518

2519-
if (probabilty.has_value() && probabilty < 0.0f)
2520-
throw LuaFunctionError("The argument probabilty cannot have a negative value.");
2519+
if (probability.has_value() && probability < 0.0f)
2520+
throw LuaFunctionError("The argument probability cannot have a negative value.");
25212521

2522-
ped->Say(speechContextId, probabilty.value_or(1.0f));
2522+
ped->Say(speechContextId, probability.value_or(1.0f));
25232523
}

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,5 @@ class CLuaPedDefs : public CLuaDefs
119119

120120
static bool killPedTask(CClientPed* ped, taskType taskType, std::uint8_t taskNumber, std::optional<bool> gracefully);
121121

122-
static void PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probabilty);
122+
static void PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probability);
123123
};

Shared/data/MTA San Andreas/MTA/locale/ar_SA/client.pot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: 2d3d942aa8adf891478198912ac0b233\n"
44
"Report-Msgid-Bugs-To: \n"
55
"POT-Creation-Date: 2025-03-23 20:04+0000\n"
6-
"PO-Revision-Date: 2025-03-28 00:54\n"
6+
"PO-Revision-Date: 2025-04-03 22:01\n"
77
"Last-Translator: \n"
88
"Language-Team: Arabic\n"
99
"Language: ar_SA\n"
@@ -1662,7 +1662,7 @@ msgstr "إظهار نافذة التنزيل دائمًا"
16621662

16631663
#: Client/core/CSettings.cpp:403
16641664
msgid "Allow connecting with Discord Rich Presence"
1665-
msgstr "سماح الاتصال بـ Discord Rich Presence"
1665+
msgstr "السماح بالاتصال بـ Discord Rich Presence"
16661666

16671667
#. Enable camera photos getting saved to documents folder
16681668
#: Client/core/CSettings.cpp:409
@@ -3040,7 +3040,7 @@ msgstr[5] "لاعبون"
30403040

30413041
#: Client/core/ServerBrowser/CServerList.cpp:151
30423042
msgid "on"
3043-
msgstr "يعمل"
3043+
msgstr "في"
30443044

30453045
#: Client/core/ServerBrowser/CServerList.cpp:154
30463046
msgid "server"

0 commit comments

Comments
 (0)