Merge branch 'master' into issue-9916

patrikjuvonen · web-flow · commit 07765c01d6d5 · 2018-07-22T20:52:41.000+03:00
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -5578,7 +5578,7 @@ void CStaticFunctionDefinitions::GUIMemoSetVerticalScrollPosition(CClientEntity&
     {
         CClientGUIElement& GUIElement = static_cast<CClientGUIElement&>(Entity);
 
-        // Are we a gridlist?
+        // Are we a memo?
         if (IS_CGUIELEMENT_MEMO(&GUIElement))
         {
             CGUIMemo* guiMemo = static_cast<CGUIMemo*>(GUIElement.GetCGUIElement());

Original file line number	Diff line number	Diff line change
`@@ -5578,7 +5578,7 @@ void CStaticFunctionDefinitions::GUIMemoSetVerticalScrollPosition(CClientEntity&`
`5578`	`5578`	`{`
`5579`	`5579`	`CClientGUIElement& GUIElement = static_cast<CClientGUIElement&>(Entity);`
`5580`	`5580`
`5581`		`- // Are we a gridlist?`
	`5581`	`+ // Are we a memo?`
`5582`	`5582`	`if (IS_CGUIELEMENT_MEMO(&GUIElement))`
`5583`	`5583`	`{`
`5584`	`5584`	`CGUIMemo* guiMemo = static_cast<CGUIMemo*>(GUIElement.GetCGUIElement());`