Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2e00c25

Browse files
authored
Merge branch 'master' into bugfix/camera_fov_modes
2 parents 24f44fb + 5f7cb8e commit 2e00c25

File tree

146 files changed

+6890
-7817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+6890
-7817
lines changed

‎Client/core/CGUI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void CLocalGUI::CreateWindows(bool bGameIsAlreadyLoaded)
158158
m_pLabelVersionTag->SetTextColor(255, 255, 255);
159159
m_pLabelVersionTag->SetZOrderingEnabled(false);
160160
m_pLabelVersionTag->MoveToBack();
161-
if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
161+
if (MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED)
162162
m_pLabelVersionTag->SetAlwaysOnTop(true);
163163

164164
// Create mainmenu

‎Client/game_sa/CPedSA.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class CPedSAInterface : public CPhysicalSAInterface
261261
int unk_52C;
262262

263263
int pedState;
264-
int moveState;
264+
PedMoveState::Enum moveState;
265265
int swimmingMoveState;
266266

267267
int unk_53C;
@@ -276,10 +276,10 @@ class CPedSAInterface : public CPhysicalSAInterface
276276
float fRotationSpeed;
277277
float fMoveAnim;
278278

279-
CEntitySAInterface* pContactEntity;
279+
CEntitySAInterface* pContactEntity;// m_standingOnEntity
280280
CVector unk_56C;
281281
CVector unk_578;
282-
CEntitySAInterface* pLastContactEntity;
282+
CEntitySAInterface* pLastContactEntity;// m_contactEntity
283283

284284
CVehicleSAInterface* pLastVehicle;
285285
CVehicleSAInterface* pVehicle;
@@ -421,8 +421,9 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
421421
void SetFightingStyle(eFightingStyle style, std::uint8_t styleExtra = 6) override;
422422

423423
CEntity* GetContactEntity() const override;
424+
bool IsStandingOnEntity() const override { return GetPedInterface()->pContactEntity != nullptr; };
424425

425-
intGetRunState() const override { return GetPedInterface()->moveState; }
426+
PedMoveState::Enum GetMoveState() const override { return GetPedInterface()->moveState; }
426427

427428
bool GetCanBeShotInVehicle() const override{ return GetPedInterface()->pedFlags.bCanBeShotInVehicle; }
428429
bool GetTestForShotInVehicle() const override { return GetPedInterface()->pedFlags.bTestForShotInVehicle; }

‎Client/launch/Multi Theft Auto.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
3-
<assemblyIdentity type="win32" version="1.6.0.0" processorArchitecture="*" name="Multi Theft Auto" />
3+
<assemblyIdentity type="win32" version="1.7.0.0" processorArchitecture="*" name="Multi Theft Auto" />
44

55
<v3:application>
66
<windowsSettings>

‎Client/launch/NEU/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.xml diff working-tree-encoding=UTF-16 eol=crlf
-3.83 KB
Binary file not shown.

‎Client/launch/launch.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ IDI_ICON1 ICON "resource\\mtaicon.ico"
7171
//
7272

7373
VS_VERSION_INFO VERSIONINFO
74-
FILEVERSION 1,6,0,0
75-
PRODUCTVERSION 1,6,0,0
74+
FILEVERSION 1,7,0,0
75+
PRODUCTVERSION 1,7,0,0
7676
FILEFLAGSMASK 0x17L
7777
#ifdef _DEBUG
7878
FILEFLAGS 0x1L
@@ -89,10 +89,10 @@ BEGIN
8989
BEGIN
9090
VALUE "CompanyName", "Multi Theft Auto"
9191
VALUE "FileDescription", "Multi Theft Auto Launcher"
92-
VALUE "FileVersion", "1.6.0.0"
93-
VALUE "LegalCopyright", "(C) 2003 - 2023 Multi Theft Auto"
92+
VALUE "FileVersion", "1.7.0.0"
93+
VALUE "LegalCopyright", "(C) 2003 - 2025 Multi Theft Auto"
9494
VALUE "ProductName", "MTA San Andreas"
95-
VALUE "ProductVersion", "1.6.0.0"
95+
VALUE "ProductVersion", "1.7.0.0"
9696
END
9797
END
9898
BLOCK "VarFileInfo"

‎Client/loader/CInstallManager.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,10 @@ SString CInstallManager::_ShowCrashFailDialog()
432432
strMessage += strReason;
433433
}
434434

435-
const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
436-
const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
435+
//const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
436+
const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
437437

438-
if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM && moduleName.EndsWithI("\\kernelbase.dll"))
438+
if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM)
439439
{
440440
strMessage += '\n';
441441
strMessage += _("** Out of memory - this crash was caused by insufficient free or fragmented memory. **");

‎Client/loader/MainFunctions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ void CheckDataFiles()
977977
//////////////////////////////////////////////////////////
978978
void CheckLibVersions()
979979
{
980-
#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
980+
#if MTASA_VERSION_TYPE >= VERSION_TYPE_UNTESTED
981981

982982
const char* moduleList[] = {"MTA\\loader.dll",
983983
"MTA\\cgui.dll",

‎Client/mods/deathmatch/CClient.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)
3333
// Make public client test builds expire
3434
if (GetDaysUntilExpire() < -1)
3535
{
36-
MessageBox(NULL, _("This version has expired."), "MTA: San Andreas " MTA_DM_BUILDTAG_LONG + _E("CD64"), MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
36+
MessageBoxA(NULL, _("This version has expired."), SStringX("MTA: San Andreas " MTA_DM_BUILDTAG_LONG) + _E("CD64"),
37+
MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
3738
TerminateProcess(GetCurrentProcess(), 1);
3839
}
3940
#endif

‎Client/mods/deathmatch/logic/CClientColTube.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CClientColTube final : public CClientColShape
2626
float GetRadius() { return m_fRadius; };
2727
void SetRadius(float fRadius)
2828
{
29-
m_fRadius = fRadius;
29+
m_fRadius = (fRadius / 2.0f) + 0.15f;
3030
SizeChanged();
3131
};
3232
float GetHeight() { return m_fHeight; };

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /