Import v6.12.3 of the Inform 6 standard library

[informlib.git] / verblib.h

diff --git a/verblib.h b/verblib.h
index e3941e40589ac2c6f5a38fccb86d49b601afbde4..e98bb22c1276f21878e1d68da362dd36eee7dd9e 100644 (file)
--- a/verblib.h
+++ b/verblib.h
@@ -1,9 +1,9 @@
 ! ==============================================================================
 !   VERBLIB:  Front end to standard verbs library.
 !
-!   Supplied for use with Inform 6 -- Release 6.12.2 -- Serial number 180520
+!   Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
 !
-!   Copyright Graham Nelson 1993-2004 and David Griffith 2012-2018
+!   Copyright Graham Nelson 1993-2004 and David Griffith 2012-2019
 !
 !   This file is free software: you can redistribute it and/or modify
 !   it under the terms of the GNU Affero General Public License as
@@ -2558,7 +2558,7 @@ Constant ID_BIT        $2000;       ! Print object id after each entry
 [ JumpInSub;
     if (noun has animate) return L__M(##JumpIn, 2, noun);
     if (noun has enterable) <<Enter noun>>;
-    L__M(##JumpOn, 1, noun);
+    L__M(##JumpIn, 1, noun);
 ];
 
 [ JumpOnSub;
@@ -2658,6 +2658,7 @@ Constant ID_BIT        $2000;       ! Print object id after each entry
 
 [ ThrowAtSub;
     if (ObjectIsUntouchable(noun)) return;
+    if (second == nothing) return L__M(##ThrowAt, 1, noun);
     if (second > 1) {
         action = ##ThrownAt;
         if (RunRoutines(second, before)) { action = ##ThrowAt; rtrue; }