Merge branch 'master' into issue-9916

Author: patrikjuvonen

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**MTA Client (please complete the following information):**
+ - Version [e.g. 1.1, 1.5.4]
+ - Running in Wine? [e.g, No, Yes - Linux, Yes - macOS]
+
+**MTA Server (please complete the following information):**
+ - OS: [e.g. Windows 7, Debian Stretch]
+ - Version [e.g. 1.1, 1.5.4]
+
+**Additional context**
+Add any other context about the problem here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/security-report.md

@@ -0,0 +1,9 @@
+---
+name: Security report
+about: Submit cheat or security vulnerability
+
+---
+
+Please submit your cheats or security vulnerabilities to @ccw on forum.mtasa.com. Please do not submit them here.
+
+@ccw can be found here: https://forum.mtasa.com/profile/7264-ccw/

PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,3 @@
-# Only use pull requests to submit patches! Use [the bug tracker](https://bugs.multitheftauto.com) to report bugs, or [the forum](https://forum.mtasa.com) to ask for help!
-
 Before you go ahead and create a pull request, please make sure:
 
 * [ ] [your code follows the coding guidelines](https://wiki.multitheftauto.com/index.php?title=Coding_guidelines)

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Our project's code repository can be found on the [multitheftauto/mtasa-blue](https://github.com/multitheftauto/mtasa-blue/) Git repository at [GitHub](https://github.com/). We are always looking for new developers, so if you're interested, here are some useful links:
 
 * [Nightly Builds](https://nightly.mtasa.com/)
-* [Bugtracker Roadmap](https://bugs.mtasa.com/roadmap_page.php)
+* [Issue Tracker](https://github.com/multitheftauto/mtasa-blue)
 * [Wiki Roadmap](https://wiki.mtasa.com/wiki/Roadmap)
 
 Before committing, please review the [coding guidelines](https://wiki.mtasa.com/index.php?title=Coding_guidelines).

Client/gui/CGUIMemo_Impl.cpp

@@ -111,6 +111,11 @@ void CGUIMemo_Impl::SetVerticalScrollPosition(float fPosition)
     }
 }
 
+float CGUIMemo_Impl::GetMaxVerticalScrollPosition(void)
+{
+    return GetScrollbarDocumentSize() - GetScrollbarPageSize();
+}
+
 float CGUIMemo_Impl::GetScrollbarDocumentSize(void)
 {
     CEGUI::Scrollbar* pScrollbar = reinterpret_cast<CEGUI::MultiLineEditbox*>(m_pWindow)->d_vertScrollbar;

Client/gui/CGUIMemo_Impl.h

@@ -29,6 +29,7 @@ class CGUIMemo_Impl : public CGUIMemo, public CGUIElement_Impl, public CGUITabLi
 
     float GetVerticalScrollPosition(void);
     void  SetVerticalScrollPosition(float fPosition);
+    float GetMaxVerticalScrollPosition(void);
     float GetScrollbarDocumentSize(void);
     float GetScrollbarPageSize(void);
 

Client/mods/deathmatch/logic/CClientIFP.cpp

@@ -24,22 +24,22 @@ CClientIFP::CClientIFP(class CClientManager* pManager, ElementID ID) : CClientEn
     m_u32Hashkey = 0;
 }
 
-bool CClientIFP::LoadIFP(const SString& strFilePath, const SString& strBlockName)
+bool CClientIFP::LoadIFP(const SString& strFile, const bool isRawData, const SString& strBlockName)
 {
     m_strBlockName = strBlockName;
     m_pVecAnimations = &m_pIFPAnimations->vecAnimations;
 
-    if (LoadIFPFile(strFilePath))
+    if (LoadIFPFile(strFile, isRawData))
     {
         m_u32Hashkey = HashString(strBlockName.ToLower());
         return true;
     }
     return false;
 }
 
-bool CClientIFP::LoadIFPFile(const SString& strFilePath)
+bool CClientIFP::LoadIFPFile(const SString& strFile, const bool isRawData)
 {
-    if (LoadFileToMemory(strFilePath))
+    if (isRawData ? LoadDataBufferToMemory(strFile) : LoadFileToMemory(strFile))
     {
         if (ReadIFPByVersion())
         {

Client/mods/deathmatch/logic/CClientIFP.h

@@ -205,7 +205,7 @@ class CClientIFP : public CClientEntity, CFileReader
     void MarkAsUnloading(void) { m_bUnloading = true; }
     bool IsUnloading(void) { return m_bUnloading; }
 
-    bool LoadIFP(const SString& strFilePath, const SString& strBlockName);
+    bool LoadIFP(const SString& strFile, const bool isRawData, const SString& strBlockName);
 
     const SString&      GetBlockName(void) { return m_strBlockName; }
     const unsigned int& GetBlockNameHash(void) { return m_u32Hashkey; }
@@ -219,7 +219,7 @@ class CClientIFP : public CClientEntity, CFileReader
     void SetPosition(const CVector& vecPosition){};
 
 private:
-    bool LoadIFPFile(const SString& strFilePath);
+    bool LoadIFPFile(const SString& strFile, const bool isRawData);
     bool ReadIFPByVersion(void);
     void ReadIFPVersion1(void);
     void ReadIFPVersion2(bool bAnp3);

Client/mods/deathmatch/logic/CFileReader.cpp

@@ -45,15 +45,31 @@ void CFileReader::SkipBytes(const std::uint32_t u32BytesToSkip)
 bool CFileReader::LoadFileToMemory(const SString& strFilePath)
 {
     std::ifstream   fileStream(FromUTF8(strFilePath), std::ios::binary | std::ios::ate);
-    std::streamsize m_iFileSize = fileStream.tellg();
-    if (m_iFileSize == eIFSTREAM::SIZE_ERROR)
+    std::streamsize iFileSize = fileStream.tellg();
+    if (iFileSize == eIFSTREAM::SIZE_ERROR)
     {
         return false;
     }
 
     fileStream.seekg(0, std::ios::beg);
-    m_vecFileDataBuffer.reserve(static_cast<size_t>(m_iFileSize));
-    if (fileStream.read(m_vecFileDataBuffer.data(), m_iFileSize))
+    m_vecFileDataBuffer.reserve(static_cast<size_t>(iFileSize));
+    if (fileStream.read(m_vecFileDataBuffer.data(), iFileSize))
+    {
+        return true;
+    }
+    return false;
+}
+
+bool CFileReader::LoadDataBufferToMemory(const SString& buffer)
+{
+    std::streamsize iBufferSize = buffer.size();
+    if (iBufferSize == eIFSTREAM::SIZE_ERROR)
+    {
+        return false;
+    }
+
+    m_vecFileDataBuffer.reserve(static_cast<size_t>(iBufferSize));
+    if (std::copy(buffer.begin(), buffer.end(), m_vecFileDataBuffer.data()))
     {
         return true;
     }