Make sure (The) and (the) make sense with new narrative voices. Manti…

…s 1381.
DavidGriffith · Aug 4, 2014 · 02dae8f · 02dae8f
1 parent 1edaa1e
commit 02dae8f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/parserm.h b/parserm.h
@@ -6843,8 +6843,20 @@ Array StorageForShortName -> WORDSIZE + SHORTNAMEBUF_LEN;
     caps_mode = false;
     if ((~~o ofclass Object) || o has proper) {
         indef_mode = NULL;
-        print (PSN__) o;
-        indef_mode = saveIndef;
+        if (o == player) {
+            if (player provides narrative_voice) {
+                switch (player.narrative_voice) {
+                  1:  print (address) ME1__WD;
+                  2:  ThatOrThose(player);
+                  3:  print (PSN__) o;
+                }
+            }
+            else ThatOrThose(player);
+        } else {
+            print (PSN__) o;
+            indef_mode = saveIndef;
+        }
+
         return;
     }
     PrefaceByArticle(o, 1);