Correct some instances where game officers were being treated as Game Masters.

In the last commit, mostly. Masters can change the game, officers cannot.

2 files changed, 3 insertions, 3 deletions

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index e4c5f0486..45df8c6c0 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -263,7 +263,7 @@ OnInit:
     //query_sql("SELECT online FROM `char` WHERE name='Saulc GM'", .@online);
     // TODO
     .@online=$@BG1_SIZE;
-    if (!.@online) {
+    if (!.@online && !is_master()) {
         mesn;
         mesq l("We are planning to take over Hurnscald from the Monster King, and we will need everybody's help.");
         next;
diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
index d7f8bf54f..8f2e07b4c 100644
--- a/npc/026-6/ctrl.c
+++ b/npc/026-6/ctrl.c
@@ -34,7 +34,7 @@ L_Warp:
         end;
     }
     // Not a hero
-    if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$ && !is_gm()) {
+    if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$ && !is_master()) {
         dispbottom l("I should wait for %s or one of the heroes to challenge the Monster King.", $MOST_HEROIC$);
         end;
     }
@@ -54,7 +54,7 @@ OnInit:
 026-6,22,40,0,	script	#MKBossFightFire	NPC_HIDDEN,0,0,{
     end;
 OnTouch:
-    if ($@MK_COOLDOWN > gettimetick(2) && !is_gm()) {
+    if ($@MK_COOLDOWN > gettimetick(2) && !is_master()) {
         dispbottom l("I should wait for %s.", ($GAME_STORYLINE >= 5 ? l("the Moubootaur arrange a new puppet") : l("the blood stains to be cleaned up")));
         end;
     }