From 240de5590ce83954574790406f64e3e64b5f1450 Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sat, 8 Jun 2013 21:21:34 -0400 Subject: Fixed some spacings, typos, and sentences Thanks rAthena! --- npc/quests/quests_13_1.txt | 88 +++++++++++++++++++++++----------------------- src/map/script.c | 24 ++++++------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 78c843ae5..627688922 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -8877,7 +8877,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ mes "What is it?"; next; mes "[Staff Officer Abidal]"; - mes "Err? Hey, aren't you that famous adventurer," + strcharinfo(0) + "? I've heard many good things about you."; + mes "Err? Hey, aren't you that famous adventurer, " + strcharinfo(0) + "? I've heard many good things about you."; next; mes "[Instructor Igrid]"; mes "I don't know what you're talking about. Boss, do you know this adventurer?"; @@ -8919,7 +8919,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{ } else if (ep13_1_edq == 2) { mes "[Hibba Agip]"; - mes "Oh yes, right... You're" + strcharinfo(0) + ", right? Abidal has told me good things about you."; + mes "Oh yes, right... You're " + strcharinfo(0) + ", right? Abidal has told me good things about you."; next; mes "[Hibba Agip]"; mes "We're lucky to have you, my friend... I hope you're as good as the stories play you up to be."; @@ -10195,7 +10195,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ if ((ep13_1_edq == 3) && (countitem(11012) > 0)) { mes "[Expedition Messenger]"; mes "Welcome, I've been waiting for you."; - mes "You must be" + strcharinfo(0) + ". Nice to meet you."; + mes "You must be " + strcharinfo(0) + ". Nice to meet you."; next; mes "[Expedition Messenger]"; mes "Let me check something quicly. You received the report directly from the commander, didn't you? May I see it?"; @@ -10205,7 +10205,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "........."; next; mes "[Expedition Messenger]"; - mes "Excellent. Thank you. Then we'll go back to the mainland and let the leaders know that you,"+ strcharinfo(0) + ", have departed."; + mes "Excellent. Thank you. Then we'll go back to the mainland and let the leaders know that you, "+ strcharinfo(0) + ", have departed."; next; mes "[Expedition Messenger]"; mes "Guys, it's time to go."; @@ -10255,7 +10255,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "Argh... You..."; next; mes "[Expedition Messenger]"; - mes "*Cough* Oh, thank god!" + strcharinfo(0) + ", please take the report and run!"; + mes "*Cough* Oh, thank god! " + strcharinfo(0) + ", please take the report and run!"; next; mes "[???]"; mes "No... Noooo!"; @@ -10263,7 +10263,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ specialeffect2 EF_SOULBREAKER; specialeffect2 EF_SONICBLOWHIT; mes "[Expedition Messenger]"; - mes "Argh..." + strcharinfo(0) + ", are you alright? The report... The report..."; + mes "Argh... " + strcharinfo(0) + ", are you alright? The report... The report..."; next; delitem 11012,1; //Expedition_Report set ep13_1_edq,4; @@ -10308,7 +10308,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "Argh... You..."; next; mes "[Expedition Messenger]"; - mes "*Cough* Oh, thank god!" + strcharinfo(0) + ", please take the report and run!"; + mes "*Cough* Oh, thank god! " + strcharinfo(0) + ", please take the report and run!"; next; mes "[???]"; mes "No... Noooo!"; @@ -10316,7 +10316,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ specialeffect2 EF_SOULBREAKER; specialeffect2 EF_SONICBLOWHIT; mes "[Expedition Messenger]"; - mes "Argh..." + strcharinfo(0) + ", are you alright? The report... The report..."; + mes "Argh... " + strcharinfo(0) + ", are you alright? The report... The report..."; next; mes "[Expedition Agent]"; mes "We lost the report. The pages are blowing away!"; @@ -10458,7 +10458,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10473,7 +10473,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -10488,7 +10488,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10503,7 +10503,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10518,7 +10518,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; @@ -10528,7 +10528,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10542,7 +10542,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -10556,7 +10556,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10570,7 +10570,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10633,7 +10633,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10648,7 +10648,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 piece of paper that appear to be part of the report."; @@ -10663,7 +10663,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10678,7 +10678,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10693,7 +10693,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; @@ -10703,7 +10703,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10717,7 +10717,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -10731,7 +10731,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10745,7 +10745,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10798,7 +10798,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10813,7 +10813,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -10828,7 +10828,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10843,7 +10843,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10858,7 +10858,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; @@ -10868,7 +10868,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10882,7 +10882,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 piece of paper that appear to be part of the report."; @@ -10896,7 +10896,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -10910,7 +10910,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -10973,7 +10973,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -10988,7 +10988,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -11003,7 +11003,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -11018,7 +11018,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; @@ -11033,7 +11033,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; @@ -11043,7 +11043,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ set .@ep13_search_lotto,rand(1,6); if (.@ep13_search_lotto == 4) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 5 pieces of paper that appear to be part of the report."; @@ -11057,7 +11057,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 2 pieces of paper that appear to be part of the report."; @@ -11071,7 +11071,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else if (.@ep13_search_lotto == 3) { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "Good news! I've found 3 pieces of paper that appear to be part of the report."; @@ -11085,7 +11085,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{ } else { mes "[Expedition Scout]"; - mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report."; + mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report."; next; mes "[Expedition Scout]"; mes "I'm doing my best, but I haven't found any pages yet."; diff --git a/src/map/script.c b/src/map/script.c index b36d86111..d58e3780e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -728,7 +728,7 @@ const char* skip_space(const char* p) } /// Skips a word. -/// A word consists of undercores and/or alfanumeric characters, +/// A word consists of undercores and/or alphanumeric characters, /// and valid variable prefixes/postfixes. static const char* skip_word(const char* p) @@ -771,7 +771,7 @@ int add_word(const char* p) // Check for a word len = skip_word(p) - p; if( len == 0 ) - disp_error_message("script:add_word: invalid word. A word consists of undercores and/or alfanumeric characters, and valid variable prefixes/postfixes.", p); + disp_error_message("script:add_word: invalid word. A word consists of undercores and/or alphanumeric characters, and valid variable prefixes/postfixes.", p); // Duplicate the word word = (char*)aMalloc(len+1); @@ -809,7 +809,7 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom) add_scriptl(func); arg = script->buildin[script->str_data[buildin_callsub_ref].val]; if( *arg == 0 ) - disp_error_message("parse_callfunc: callsub has no arguments, please review it's definition",p); + disp_error_message("parse_callfunc: callsub has no arguments, please review its definition",p); if( *arg != '*' ) ++arg; // count func as argument } else { @@ -1049,7 +1049,7 @@ const char* parse_simpleexpr(const char *p) p=skip_space(p); if(*p==';' || *p==',') - disp_error_message("parse_simpleexpr: unexpected expr end",p); + disp_error_message("parse_simpleexpr: unexpected end of expression",p); if(*p=='('){ if( (i=syntax.curly_count-1) >= 0 && syntax.curly[i].type == TYPE_ARGLIST ) ++syntax.curly[i].count; @@ -1065,7 +1065,7 @@ const char* parse_simpleexpr(const char *p) syntax.curly[i].flag = ARGLIST_NO_PAREN; } if( *p != ')' ) - disp_error_message("parse_simpleexpr: unmatch ')'",p); + disp_error_message("parse_simpleexpr: unmatched ')'",p); ++p; } else if(ISDIGIT(*p) || ((*p=='-' || *p=='+') && ISDIGIT(p[1]))){ char *np; @@ -1091,7 +1091,7 @@ const char* parse_simpleexpr(const char *p) add_scriptb(*p++); } if(!*p) - disp_error_message("parse_simpleexpr: unexpected eof @ string",p); + disp_error_message("parse_simpleexpr: unexpected end of file @ string",p); add_scriptb(0); p++; //'"' } else { @@ -1129,7 +1129,7 @@ const char* parse_simpleexpr(const char *p) p=parse_subexpr(p+1,-1); p=skip_space(p); if( *p != ']' ) - disp_error_message("parse_simpleexpr: unmatch ']'",p); + disp_error_message("parse_simpleexpr: unmatched ']'",p); ++p; add_scriptc(C_FUNC); }else @@ -1330,8 +1330,8 @@ const char* parse_curly_close(const char* p) } // Syntax-related processing -// break, case, continue, default, do, for, function, -// if, switch, while ? will handle this internally. +// break, case, continue, default, do, for, function, +// if, switch, while ? will handle this internally. const char* parse_syntax(const char* p) { const char *p2 = skip_word(p); @@ -1411,14 +1411,14 @@ const char* parse_syntax(const char* p) memcpy(label,p,v); label[v]='\0'; if( !script_get_constant(label, &v) ) - disp_error_message("parse_syntax: 'case' label not integer",p); + disp_error_message("parse_syntax: 'case' label is not an integer",p); p = skip_word(p); } else { //Numeric value if((*p == '-' || *p == '+') && ISDIGIT(p[1])) // pre-skip because '-' can not skip_word p++; p = skip_word(p); if(np != p) - disp_error_message("parse_syntax: 'case' label not integer",np); + disp_error_message("parse_syntax: 'case' label is not an integer",np); } p = skip_space(p); if(*p != ':') @@ -14007,7 +14007,7 @@ BUILDIN(setnpcdisplay) class_ = script->conv_num(st,data); else { - ShowError("script:setnpcdisplay: expected a string or number\n"); + ShowError("script:setnpcdisplay: expected string or number\n"); script_reportdata(data); return false; } -- cgit v1.2.3-60-g2f50