Update to Inform v6.41

[inform.git] / src / verbs.c

diff --git a/src/verbs.c b/src/verbs.c
index 31b42bb2ee999a5c92087c6c2c840f7e5ea9aa64..9fe65bc913a4491d1d316b27fb6fb3fd6e98f3e0 100644 (file)
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -2,7 +2,7 @@
 /*   "verbs" :  Manages actions and grammar tables; parses the directives    */
 /*              Verb and Extend.                                             */
 /*                                                                           */
-/*   Part of Inform 6.40                                                     */
+/*   Part of Inform 6.41                                                     */
 /*   copyright (c) Graham Nelson 1993 - 2022                                 */
 /*                                                                           */
 /* Inform is free software: you can redistribute it and/or modify            */
@@ -309,8 +309,8 @@ extern void list_verb_table(void)
 static void new_action(char *b, int c)
 {
     /*  Called whenever a new action (or fake action) is created (either
-        by using make_action above, or the Fake_Action directive, or by
-        the linker).  At present just a hook for some tracing code.          */
+        by using make_action above, or the Fake_Action directive).
+        At present just a hook for some tracing code.                        */
 
     if (printactions_switch)
         printf("Action '%s' is numbered %d\n",b,c);
@@ -400,7 +400,7 @@ extern assembly_operand action_of_name(char *name)
     AO.value = symbols[j].value;
     AO.marker = ACTION_MV;
     if (!glulx_mode) {
-      AO.type = (module_switch)?LONG_CONSTANT_OT:SHORT_CONSTANT_OT;
+      AO.type = SHORT_CONSTANT_OT;
       if (symbols[j].value >= 256) AO.type = LONG_CONSTANT_OT;
     }
     else {
@@ -414,9 +414,6 @@ extern void find_the_actions(void)
     char action_name[MAX_IDENTIFIER_LENGTH+4];
     char action_sub[MAX_IDENTIFIER_LENGTH+4];
 
-    if (module_switch)
-        for (i=0; i<no_actions; i++) actions[i].byte_offset = 0;
-    else
     for (i=0; i<no_actions; i++)
     {   strcpy(action_name, symbols[actions[i].symbol].name);
         action_name[strlen(action_name) - 3] = '\0'; /* remove "__A" */