Merge branch 'master' into feature/rendering-list-size

Author: FileEX

.github/CODEOWNERS

@@ -3,18 +3,15 @@
 <!-- When changing Lua APIs, consider including code samples and documentation. -->
 
 
-
 #### Motivation
 <!-- Why are you making this change? Which GitHub issue does this resolve, if any? Any additional context? -->
 
 
-
 #### Test plan
-<!-- How have you tested this change? This should give confidence to the reviewer  -->
+<!-- How have you tested this change? This should give confidence to the reviewer that your change is safe. -->
 <!-- If someone makes changes to this code in the future, what steps can they follow to check that it's still working correctly? -->
 
 
-
 #### Checklist
 
 * [ ] Your code should follow the [coding guidelines](https://wiki.multitheftauto.com/index.php?title=Coding_guidelines).

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,11 +18,27 @@ jobs:
         shell: pwsh
         run: ./utils/clang-format.ps1 -Verbose
 
+      - name: Generate GitHub App token
+        id: app-token
+        if: |
+          steps.clang_format.outcome == 'failure' &&
+          github.ref == 'refs/heads/master' &&
+          github.event_name == 'push' &&
+          !github.event.repository.fork
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ secrets.GH_APP_MTA_CLIENT_ID }}
+          private-key: ${{ secrets.GH_APP_MTA_PEM }}
+          owner: ${{ github.repository_owner }}
+          repositories: ${{ github.event.repository.name }}
+          permission-contents: write
+
       - name: Auto-fix formatting issues
         if: |
           steps.clang_format.outcome == 'failure' &&
           github.ref == 'refs/heads/master' &&
-          github.event_name == 'push'
+          github.event_name == 'push' &&
+          !github.event.repository.fork
         shell: bash
         run: |
           # Stage the formatted files (clang-format.ps1 already ran in-place)
@@ -38,15 +54,16 @@ jobs:
           fi
 
           # Allow commit to work
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "multitheftauto[bot]"
+          git config user.email "274826127+multitheftauto[bot]@users.noreply.github.com"
 
           # Append a commit with a fix applied
           git commit -m "Fix formatting issues introduced by ${GITHUB_SHA}
 
           cc @${GITHUB_ACTOR} please make sure to run clang-format locally before pushing changes to avoid this in the future."
 
-          # And we're off to the races!
+          # Authenticate with the GitHub App token and push
+          git remote set-url origin https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/${{ github.repository }}
           git push
 
       - name: Report formatting issues

.github/workflows/clang-format.yml

@@ -4,10 +4,10 @@ Run ./utils/clang-format.ps1 after making changes to C++ files, to ensure that t
 
 ## Code comments
 
-When making code changes, explain *why* the code you're written should exist and the motivation behind the changes. This ensures that future engineers don't have to read between the lines.
+When making code changes, explain *why* the code you've written should exist and the motivation behind the changes. This ensures that future engineers don't have to read between the lines.
 
 ## Steer the user towards writing clear commit messages
 
-Tell the user to include details about the prompt / goals / motivation / "why"s / how they tested their changes.
+Tell the user to include details about the prompt / goals / motivation / reasoning / how they tested their changes.
 
-Don't assume the user will include this information in the commit messages, proactively tell them to include this information in their commit messages.
+Don't assume the user will include this information in the commit messages; proactively tell them to include this information in their commit messages.

AGENTS.md

@@ -3240,13 +3240,15 @@ namespace
         int iOut = -2;
         if (*(DWORD*)dwThis != 0)
         {
+            // clang-format off
             _asm
             {
                 mov     ecx, dwThis
                 mov     ecx, [ecx]
                 call    dwFunc
                 mov     iOut, eax
             }
+            // clang-format on
         }
 
         return iOut;

Client/core/CCrashDumpWriter.cpp

@@ -25,6 +25,7 @@ CDiscordRichPresence::CDiscordRichPresence() : m_uiDiscordAppStart(0), m_uiDisco
 
     m_strDiscordAppState.clear();
     m_strDiscordCustomResourceName.clear();
+    m_bDiscordRPCEnabled = false;
     m_bConnected = false;
 }
 

Client/core/CDiscordRichPresence.cpp

@@ -774,21 +774,7 @@ bool CLocalGUI::InputGoesToGUI()
     if (!pGUI)
         return false;
 
-    bool shouldShowCursorForGUI = false;
-    if (pGUI->GetGUIInputEnabled())
-    {
-        eInputMode inputMode = pGUI->GetGUIInputMode();
-        if (inputMode == INPUTMODE_NO_BINDS_ON_EDIT)
-        {
-            shouldShowCursorForGUI = true;
-        }
-        else if (inputMode == INPUTMODE_NO_BINDS)
-        {
-            shouldShowCursorForGUI = false;
-        }
-    }
-
-    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || shouldShowCursorForGUI ||
+    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() ||
             !CCore::GetSingleton().IsFocused() || IsWebRequestGUIVisible());
 }
 

Client/core/CGUI.cpp

@@ -45,6 +45,7 @@ class CGraphStats : public CGraphStatsInterface
     bool                              m_bEnabled;
     std::map<SString, SGraphStatLine> m_LineList;
     TIMEUS                            m_StartTime;
+    int                               m_iGraphSizeX;
 };
 
 ///////////////////////////////////////////////////////////////
@@ -112,16 +113,13 @@ void CGraphStats::AddTimingPoint(const char* szName)
     if (!IsEnabled())
         return;
 
-    CGraphicsInterface* pGraphics = g_pCore->GetGraphics();
-
-    std::uint32_t viewportWidth = pGraphics->GetViewportWidth();
-    std::uint32_t sizeX = viewportWidth / 4;  // one quarter of screen width
-
-    if (sizeX == 0)
+    // Use the cached graph width from Draw(), which runs in MTA's render zone
+    // with the real viewport. AddTimingPoint runs from OnBeginScene where GTA SA
+    // may have set a smaller internal viewport (water reflections, radar, etc.).
+    const int iSizeX = m_iGraphSizeX;
+    if (iSizeX <= 0)
         return;
 
-    const int iSizeX = static_cast<int>(sizeX);
-
     // Start of next frame?
     if (szName[0] == 0)
     {
@@ -162,7 +160,7 @@ void CGraphStats::AddTimingPoint(const char* szName)
         // Add new line
         MapSet(m_LineList, szName, SGraphStatLine());
         pLine = MapFind(m_LineList, szName);
-        pLine->dataHistory.resize(sizeX);
+        pLine->dataHistory.resize(iSizeX);
         pLine->iDataPos = 0;
         pLine->prevData = 0;
         pLine->strName = szName;
@@ -238,6 +236,14 @@ void CGraphStats::Draw()
 
     const int iSizeX = static_cast<int>(sizeX);
 
+    // Cache the graph width for AddTimingPoint, which may run outside MTA's render zone
+    // where GTA SA has temporarily changed the D3D viewport (water reflections, radar, etc.)
+    if (m_iGraphSizeX != iSizeX)
+    {
+        m_LineList.clear();
+        m_iGraphSizeX = iSizeX;
+    }
+
     originY = originY + sizeY + 30;  // add graph height plus a little gap to the overall Y position
 
     float fLineScale = 1 / 1000.f / rangeY * sizeY;