improperly terminated quest message
Add a missing check to makedefs so it prints a warning about misplaced %Es. Fix a couple places in quest.txt pointed out by the new warning. There's no visible effect on play, since the code that actually reads the message keeps reading until the next %C.
This commit is contained in:
+2
-2
@@ -2658,7 +2658,6 @@ bad influences on your actions. Remember, only by following the %a
|
|||||||
path can you hope to overcome the obstacles you will face."
|
path can you hope to overcome the obstacles you will face."
|
||||||
%E
|
%E
|
||||||
%Cc Tou 00021
|
%Cc Tou 00021
|
||||||
%E
|
|
||||||
"You have indeed proven yourself a worthy %c, %p.
|
"You have indeed proven yourself a worthy %c, %p.
|
||||||
|
|
||||||
"But now your kinfolk and I must ask you to put aside your travels and
|
"But now your kinfolk and I must ask you to put aside your travels and
|
||||||
@@ -2673,6 +2672,7 @@ and recover %o.
|
|||||||
"Do not be distracted on your quest. If you do not return quickly I fear
|
"Do not be distracted on your quest. If you do not return quickly I fear
|
||||||
that all will be lost. Let us both pray now that %d will guide you
|
that all will be lost. Let us both pray now that %d will guide you
|
||||||
and keep you safe."
|
and keep you safe."
|
||||||
|
%E
|
||||||
%Cp Tou 00025
|
%Cp Tou 00025
|
||||||
"Do not be fooled by the false promises of %n."
|
"Do not be fooled by the false promises of %n."
|
||||||
%E
|
%E
|
||||||
@@ -3153,7 +3153,6 @@ in ruins and simplify the task of %n.
|
|||||||
truly ready for this quest. May %d guide you in this task."
|
truly ready for this quest. May %d guide you in this task."
|
||||||
%E
|
%E
|
||||||
%Cc Wiz 00021
|
%Cc Wiz 00021
|
||||||
%E
|
|
||||||
"Yes, %p, you truly are ready for this dire task. Listen,
|
"Yes, %p, you truly are ready for this dire task. Listen,
|
||||||
carefully, for what I tell you now will be of vital importance.
|
carefully, for what I tell you now will be of vital importance.
|
||||||
|
|
||||||
@@ -3176,6 +3175,7 @@ shall soon perish.
|
|||||||
find and overcome %n, and return %o to me.
|
find and overcome %n, and return %o to me.
|
||||||
|
|
||||||
"Go now, with %d, and complete this quest before it is too late."
|
"Go now, with %d, and complete this quest before it is too late."
|
||||||
|
%E
|
||||||
%Cp Wiz 00025
|
%Cp Wiz 00025
|
||||||
"Beware, for %n is immune to most magical attacks."
|
"Beware, for %n is immune to most magical attacks."
|
||||||
%E
|
%E
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ struct qthdr {
|
|||||||
#define CREC_IN_MSG "Control record encountered during message - line %d\n"
|
#define CREC_IN_MSG "Control record encountered during message - line %d\n"
|
||||||
#define DUP_MSG "Duplicate message number at line %d\n"
|
#define DUP_MSG "Duplicate message number at line %d\n"
|
||||||
#define END_NOT_IN_MSG "End record encountered before message - line %d\n"
|
#define END_NOT_IN_MSG "End record encountered before message - line %d\n"
|
||||||
|
#define TEXT_NOT_IN_MSG "Text encountered outside message - line %d\n"
|
||||||
#define UNREC_CREC "Unrecognized Control record at line %d\n"
|
#define UNREC_CREC "Unrecognized Control record at line %d\n"
|
||||||
#define OUT_OF_HEADERS "Too many message types (line %d)\nAdjust N_HDR in qtext.h and recompile.\n"
|
#define OUT_OF_HEADERS "Too many message types (line %d)\nAdjust N_HDR in qtext.h and recompile.\n"
|
||||||
#define OUT_OF_MESSAGES "Too many messages in class (line %d)\nAdjust N_MSG in qtext.h and recompile.\n"
|
#define OUT_OF_MESSAGES "Too many messages in class (line %d)\nAdjust N_MSG in qtext.h and recompile.\n"
|
||||||
|
|||||||
@@ -1511,6 +1511,9 @@ static void
|
|||||||
do_qt_text(s)
|
do_qt_text(s)
|
||||||
char *s;
|
char *s;
|
||||||
{
|
{
|
||||||
|
if (!in_msg) {
|
||||||
|
Fprintf(stderr, TEXT_NOT_IN_MSG, qt_line);
|
||||||
|
}
|
||||||
curr_msg->size += strlen(s);
|
curr_msg->size += strlen(s);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user