Clear (most) new warnings

1 files changed, 28 insertions, 28 deletions

diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index e51213ae..1048a108 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -47,12 +47,12 @@
     set @month, 1;
     set @start_day, 24;
     set @end_day, 26;
-    if (gettime(6) != @month) goto no_event;
-    if (gettime(5) < @start_day) goto no_event;
-    if (gettime(5) > @end_day) goto no_event;
+    if (gettime(6) != @month) goto L_no_event;
+    if (gettime(5) < @start_day) goto L_no_event;
+    if (gettime(5) > @end_day) goto L_no_event;
     if (gettimetick(2)-TUT_var < 2*7*86400 ) //player must be created at least 2 weeks ago
-        goto no_event;
-    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto event_done;
+        goto L_no_event;
+    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto L_event_done;
     getinventorylist;
     if (@inventorylist_count == 100) goto L_Full_Inv;
 
@@ -67,140 +67,140 @@
     mes "\"Clos'd under hatches,\"";
     mes "\"Spairges about the brunstane cootie\"";
     mes "\"To scaud poor wretches!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Hear me, Auld Hangie, for a wee,\"";
     mes "\"An' let poor damned bodies be;\"";
     mes "\"I'm sure sma' pleasure it can gie,\"";
     mes "\"E'en to a deil,\"";
     mes "\"To skelp an' scaud poor dogs like me,\"";
     mes "\"An' hear us squeel!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Great is thy pow'r, an' great thy fame;\"";
     mes "\"Far ken'd an' noted is thy name;\"";
     mes "\"An' tho' yon lowin heugh's thy hame,\"";
     mes "\"Thou travels far;\"";
     mes "\"An' faith! thou's neither lag nor lame,\"";
     mes "\"Nor blate nor scaur.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Whyles, ranging like a roarin lion,\"";
     mes "\"For prey a' holes an' corners tryin;\"";
     mes "\"Whyles, on the strong-wing'd tempest flyin,\"";
     mes "\"Tirlin' the kirks;\"";
     mes "\"Whyles, in the human bosom pryin,\"";
     mes "\"Unseen thou lurks.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"I've heard my rev'rend graunie say,\"";
     mes "\"In lanely glens ye like to stray;\"";
     mes "\"Or whare auld ruin'd castles gray\"";
     mes "\"Nod to the moon,\"";
     mes "\"Ye fright the nightly wand'rer's way\"";
     mes "\"Wi' eldritch croon.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When twilight did my graunie summon\"";
     mes "\"To say her pray'rs, douce honest woman!\"";
     mes "\"Aft yont the dike she's heard you bummin,\"";
     mes "\"Wi' eerie drone;\"";
     mes "\"Or, rustlin thro' the boortrees comin,\"";
     mes "\"Wi' heavy groan.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Ae dreary, windy, winter night,\"";
     mes "\"The stars shot down wi' sklentin light,\"";
     mes "\"Wi' you mysel I gat a fright,\"";
     mes "\"Ayont the lough;\"";
     mes "\"Ye like a rash-buss stood in sight,\"";
     mes "\"Wi' waving sugh.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"The cudgel in my nieve did shake,\"";
     mes "\"Each bristl'd hair stood like a stake,\"";
     mes "\"When wi' an eldritch, stoor 'Quaick, quaick,'\"";
     mes "\"Amang the springs,\"";
     mes "\"Awa ye squatter'd like a drake,\"";
     mes "\"On whistling wings.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Let warlocks grim an' wither'd hags\"";
     mes "\"Tell how wi' you on ragweed nags\"";
     mes "\"They skim the muirs an' dizzy crags\"";
     mes "\"Wi' wicked speed;\"";
     mes "\"And in kirk-yards renew their leagues,\"";
     mes "\"Owre howket dead.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, countra wives wi' toil an' pain\"";
     mes "\"May plunge an' plunge the kirn in vain;\"";
     mes "\"For oh! the yellow treasure's taen\"";
     mes "\"By witchin skill;\"";
     mes "\"An' dawtet, twal-pint hawkie's gaen\"";
     mes "\"As yell's the bill.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, mystic knots mak great abuse,\"";
     mes "\"On young guidmen, fond, keen, an' croose;\"";
     mes "\"When the best wark-lume i' the house,\"";
     mes "\"By cantraip wit,\"";
     mes "\"Is instant made no worth a louse,\"";
     mes "\"Just at the bit.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When thowes dissolve the snawy hoord,\"";
     mes "\"An' float the jinglin icy-boord,\"";
     mes "\"Then water-kelpies haunt the foord\"";
     mes "\"By your direction,\"";
     mes "\"An' nighted trav'lers are allur'd\"";
     mes "\"To their destruction.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"And aft your moss-traversing spunkies\"";
     mes "\"Decoy the wight that late an drunk is:\"";
     mes "\"The bleezin, curst, mischievous monkeys\"";
     mes "\"Delude his eyes,\"";
     mes "\"Till in some miry slough he sunk is,\"";
     mes "\"Ne'er mair to rise.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When Masons' mystic word an grip\"";
     mes "\"In storms an' tempests raise you up,\"";
     mes "\"Some cock or cat your rage maun stop,\"";
     mes "\"Or, strange to tell!\"";
     mes "\"The youngest brither ye wad whip\"";
     mes "\"Aff straught to hell!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Lang syne, in Eden'd bonie yard,\"";
     mes "\"When youthfu' lovers first were pair'd,\"";
     mes "\"An all the soul of love they shar'd,\"";
     mes "\"The raptur'd hour,\"";
     mes "\"Sweet on the fragrant flow'ry swaird,\"";
     mes "\"In shady bow'r;\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Then you, ye auld snick-drawin dog!\"";
     mes "\"Ye cam to Paradise incog,\"";
     mes "\"And play'd on man a cursed brogue,\"";
     mes "\"(Black be your fa'!)\"";
     mes "\"An gied the infant warld a shog,\"";
     mes "\"Maist ruin'd a'.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"D'ye mind that day, when in a bizz,\"";
     mes "\"Wi' reeket duds an reestet gizz,\"";
     mes "\"Ye did present your smoutie phiz\"";
     mes "\"Mang better folk,\"";
     mes "\"An' sklented on the man of Uz\"";
     mes "\"Your spitefu' joke?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' how ye gat him i' your thrall,\"";
     mes "\"An' brak him out o' house and hal',\"";
     mes "\"While scabs and blotches did him gall,\"";
     mes "\"Wi' bitter claw,\"";
     mes "\"An' lows'd his ill-tongued, wicked scaul,\"";
     mes "\"Was warst ava?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But a' your doings to rehearse,\"";
     mes "\"Your wily snares an' fechtin fierce,\"";
     mes "\"Sin' that day Michael did you pierce,\"";
     mes "\"Down to this time,\"";
     mes "\"Wad ding a Lallan tongue, or Erse,\"";
     mes "\"In prose or rhyme.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' now, Auld Cloots, I ken ye're thinkin,\"";
     mes "\"A certain Bardie's rantin, drinkin,\"";
     mes "\"Some luckless hour will send him linkin,\"";
     mes "\"To your black pit;\"";
     mes "\"But faith! he'll turn a corner jinkin,\"";
     mes "\"An' cheat you yet.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But fare you weel, Auld Nickie-ben!\"";
     mes "\"O wad ye tak a thought an' men'!\"";
     mes "\"Ye aiblins might--I dinna ken--\"";
@@ -222,12 +222,12 @@ L_Next:
     set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
     close;
 
-no_event:
+L_no_event:
     mes "[Shannon]";
     mes "\"I'm a traveling poet and admirer of Robert Burns.\"";
     close;
 
-event_done:
+L_event_done:
     mes "[Shannon]";
     mes "\"Ah, my dear friend. Good to see you again in this remarkable time of the year.\"";
     next;
@@ -391,7 +391,7 @@ L_Full_Inv:
     mes "\"Maybe you should turn away from the mundane world and get rid of this burden to change your view to the beauty of poetry.\"";
     close;
 
-food_menu:
+S_food_menu:
     setarray @choice_idx, 0,0,0,0,0,0;
     setarray @choice$, "","","","","","";