Fixed broken function usage and menus

1 files changed, 6 insertions, 3 deletions

diff --git a/npc/functions/magic.txt b/npc/functions/magic.txt
index 470323c2..0094e94a 100644
--- a/npc/functions/magic.txt
+++ b/npc/functions/magic.txt
@@ -20,7 +20,7 @@ function	script	MagicGainBasic	{
 // ------------------------------------------------------------
 // Initialise Menu for selecting a choice of things to ask about
 // ------------------------------------------------------------
-function	script	MagicTalkOptionsSetup {
+function	script	MagicTalkOptionsSetup	{
         set @QQ_ELANORE, 1;
         set @QQ_MANASEED, 2;
         set @QQ_MANAPOTION, 3;
@@ -29,15 +29,17 @@ function	script	MagicTalkOptionsSetup {
         set @QQ_AULDSBEL, 6;
         set @QQ_IMP, 7;
         set @QQ_OLDWIZ, 8;
+        return;
 }
 
 // ------------------------------------------------------------
 // Print and run menu for choice of things to ask about
 // Ignores the entry in @ignore
-// Returns the result in `@c, or `0'
+// Returns the result in @c, or returns 0 if there is no result
 // ------------------------------------------------------------
 
-function	script	MagicTalkMenu {
+
+function	script	MagicTalkMenu	{
         setarray @choice$, "", "", "", "", "", "", "", "", "";
         set @choices_nr, 0;
         setarray @choice_idx, 0, 0, 0, 0, 0, 0, 0, 0, 0;
@@ -132,4 +134,5 @@ L_Q_post_imp:
 		set @menu, 0;
 	
         set @c, @choice_idx[@menu];
+        return @c;
 }