Merge remote-tracking branch 'upstream/develop' into develop

YoYoGames · Jul 10, 2024 · 7ef8889 · 7ef8889
2 parents 3e1a3e6 + 9d50ef2
commit 7ef8889
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/display_reset.htm b/Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/display_reset.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>display_reset</title>
-  <meta name="generator" content="Adobe RoboHelp 2020" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
   <link rel="stylesheet" href="../../../assets/css/default.css" type="text/css" />
   <script src="../../../assets/scripts/main_script.js"></script>
   <meta name="rh-authors" content="Mark Alexander" />

diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Variable_Functions/nameof.htm b/Manual/contents/GameMaker_Language/GML_Reference/Variable_Functions/nameof.htm
@@ -16,9 +16,8 @@
 <body>
   <h1><span data-field="title" data-format="default">nameof</span></h1>
   <p>This function returns the name of the argument you pass to it as a <a href="../Strings/string.htm">string.</a></p>
-  <p>More precisely, this function returns the name of the <a href="https://en.wikipedia.org/wiki/Identifier_(computer_languages)">identifier</a> that you pass to it; any name to <em>identify</em> something used in your GML code: an asset name, a variable name, a function name, an enum name, ...</p>
+  <p>More precisely, this function returns the name of the <a href="https://en.wikipedia.org/wiki/Identifier_(computer_languages)">identifier</a> that you pass to it; any name to <em>identify</em> something used in your GML code: an asset name, a variable name, a function name, the name of an enum (or of one of its members) or a macro name.</p>
   <p><span data-keyref="GameMaker Name">GameMaker</span> resolves the values when <a data-xref="{title}" href="../../../Introduction/Compiling.htm">Compiling</a> the game, i.e. at compile time.</p>
-  <p class="note"><span data-conref="../../../assets/snippets/Tag_note.hts"> </span> You cannot use this function to get the name of <a data-xref="{text}" href="../../GML_Overview/Variables/Constants.htm#h">Macros</a> or members of <a data-xref="{text}" href="../../GML_Overview/Variables/Constants.htm#enumhead">Enums</a>; in this case <span data-keyref="GameMaker Name">GameMaker</span> respectively returns the name of what the macro refers to or the internal value of the enum member.</p>
   <p> </p>
   <h4>Syntax:</h4>
   <p class="code"><span data-field="title" data-format="default">nameof</span>(name);</p>
@@ -36,14 +35,14 @@ <h4>Syntax:</h4>
       </tr>
       <tr>
         <td>name</td>
-        <td><span data-keyref="Type_Any"><a href="GameMaker_Language/GML_Overview/Data_Types.htm#variable" target="_blank">Any</a></span></td>
+        <td><span data-keyref="Type_Any"><a href="../../GML_Overview/Data_Types.htm#variable" target="_blank">Any</a></span></td>
         <td>The variable of which to get the name</td>
       </tr>
     </tbody>
   </table>
   <p> </p>
   <h4>Returns:</h4>
-  <p class="code"><span data-keyref="Type_String"><a href="GameMaker_Language/GML_Overview/Data_Types.htm" target="_blank">String</a></span></p>
+  <p class="code"><span data-keyref="Type_String"><a href="../../GML_Overview/Data_Types.htm" target="_blank">String</a></span></p>
   <p> </p>
   <h4>Example:</h4>
   <p class="code">show_debug_message(&quot;About to reveal internal names...&quot;);<br />
@@ -66,7 +65,7 @@ <h4>Example:</h4>
         <div>Next: <a data-xref="{title}" href="typeof.htm">typeof</a></div>
       </div>
     </div>
-    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2023 All Rights Reserved</span></h5>
+    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
   </div>
   <!-- KEYWORDS
 nameof