More repairs on search-replace results.

diff --git a/adventure.text b/adventure.text
index fd8144ab90f1aa2e7d77b876128b29defb001fe2..290a0d0a262407ac9352543074b81159b8635a0d 100644 (file)
--- a/adventure.text
+++ b/adventure.text
@@ -1256,7 +1256,7 @@
 1058   POTTE
 1059   EMERA
 1060   PLATI
 1058   POTTE
 1059   EMERA
 1060   PLATI

-1060   PYRAMID
+1060   PYRAM

 1061   PEARL
 1062   RUG
 1062   PERSI
 1061   PEARL
 1062   RUG
 1062   PERSI

diff --git a/adventure.yaml b/adventure.yaml
index 65fe2e5a2544475e3c907be6d55bc37692716ab8..48353c272b8eb91da06fb9c55898913fd50a9d3c 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -449,7 +449,7 @@ locations: !!omap
       short: 'You''re at top of stalactite.'
 - LOC_DIFFERENT2:
     description:
       short: 'You''re at top of stalactite.'
 - LOC_DIFFERENT2:
     description:

-      long: 'You are in a little maze of twisting passages, all different.'
+      long: '1You are in a little maze of twisting passages, all different.'

       short: !!null
 - LOC_RESERVOIR:
     description:
       short: !!null
 - LOC_RESERVOIR:
     description:


@@ -932,8 +932,8 @@ arbitrary_messages:  !!omap
 - LAMP_OUT: 'Your lamp has run out of power.'
 - PLEASE_ANSWER: 'Please answer the question.'
 - PIRATE_SPOTTED: 'There are faint rustling noises from the darkness behind you.  As you\nturn toward them, the beam of your lamp falls across a bearded pirate.\nHe is carrying a large chest.  "Shiver me timbers!" he cries, "I''ve\nbeen spotted!  I''d best hie meself off to the maze to hide me chest!"\nWith that, he vanishes into the gloom.'
 - LAMP_OUT: 'Your lamp has run out of power.'
 - PLEASE_ANSWER: 'Please answer the question.'
 - PIRATE_SPOTTED: 'There are faint rustling noises from the darkness behind you.  As you\nturn toward them, the beam of your lamp falls across a bearded pirate.\nHe is carrying a large chest.  "Shiver me timbers!" he cries, "I''ve\nbeen spotted!  I''d best hie meself off to the maze to hide me chest!"\nWith that, he vanishes into the gloom.'

-- GET_BATTERYIES: 'Your lamp is getting dim.  You''d best go back for those batteries.'
-- REPLACE_BATTERYIES: 'Your lamp is getting dim.  I''m taking the liberty of replacing the\nbatteries.'
+- GET_BATTERIES: 'Your lamp is getting dim.  You''d best go back for those batteries.'
+- REPLACE_BATTERIES: 'Your lamp is getting dim.  I''m taking the liberty of replacing the\nbatteries.'

 - MISSING_BATTERYIES: 'Your lamp is getting dim, and you''re out of spare batteries.  You''d\nbest start wrapping this up.'
 - REMOVE_MESSAGE: 'You sift your fingers through the dust, but succeed only in\nobliterating the cryptic message.'
 - OGRE_QUERY: 'Do you need help dealing with the ogre?'
 - MISSING_BATTERYIES: 'Your lamp is getting dim, and you''re out of spare batteries.  You''d\nbest start wrapping this up.'
 - REMOVE_MESSAGE: 'You sift your fingers through the dust, but succeed only in\nobliterating the cryptic message.'
 - OGRE_QUERY: 'Do you need help dealing with the ogre?'

diff --git a/main.c b/main.c
index c4892ffe04e8eb04f74b0cae5bebb62c2d5777e4..b14e5ca09be2878f7b060a224673bbae5b564d5d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -841,7 +841,7 @@ static void lampcheck(void)
      *  goes out.  Even then, he can explore outside for a while
      *  if desired. */
     if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) {
      *  goes out.  Even then, he can explore outside for a while
      *  if desired. */
     if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) {

-        RSPEAK(REPLACE_BATTERYIES);
+        RSPEAK(REPLACE_BATTERIES);

         game.prop[BATTERY] = 1;
         if (TOTING(BATTERY))
             DROP(BATTERY, game.loc);
         game.prop[BATTERY] = 1;
         if (TOTING(BATTERY))
             DROP(BATTERY, game.loc);


@@ -855,7 +855,7 @@ static void lampcheck(void)
     } else if (game.limit <= WARNTIME) {
         if (!game.lmwarn && HERE(LAMP)) {
             game.lmwarn = true;
     } else if (game.limit <= WARNTIME) {
         if (!game.lmwarn && HERE(LAMP)) {
             game.lmwarn = true;

-            int spk = GET_BATTERYIES;
+            int spk = GET_BATTERIES;

             if (game.place[BATTERY] == NOWHERE)spk = LAMP_DIM;
             if (game.prop[BATTERY] == 1)spk = MISSING_BATTERYIES;
             RSPEAK(spk);
             if (game.place[BATTERY] == NOWHERE)spk = LAMP_DIM;
             if (game.prop[BATTERY] == 1)spk = MISSING_BATTERYIES;
             RSPEAK(spk);