Merge lp:~armagetronad-sty-0.3/armagetronad/armagetronad-sty-help-compat into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Luke-Jr]

[Luke-Jr (luke-jr)]

No objections, I'd almost assume?

[Manuel Moos (z-man)]

Nope, but what is it for? Porting old sty config files over to trunk?

review: Approve

=== modified file 'language/english_base.txt'
--- language/english_base.txt	2009-03-11 07:40:40 +0000
+++ language/english_base.txt	2009-03-13 03:41:39 +0000
@@ -2427,6 +2427,7 @@
 rtfm_announcement \2 wants \3 to know about /help \1.\n
 
 help_introductory_blurb_help Message that is displayed before the list of help topics if someone uses /help without arguments
+help_message_help       Deprecated alias for HELP_INTRODUCTORY_BLURB
 
 help_topics_list_start  Say /help TOPIC to get help on the following topics.\n
 help_topic_not_found    Help topic \1 not found. Try /help with no arguments to see a list of available topics.\n
 
=== modified file 'src/engine/ePlayer.cpp'
--- src/engine/ePlayer.cpp	2009-03-11 07:40:40 +0000
+++ src/engine/ePlayer.cpp	2009-03-13 03:41:39 +0000
@@ -3441,6 +3441,9 @@
 static tString se_helpIntroductoryBlurb;
 static tConfItemLine se_helpIntroductoryBlurbConf("HELP_INTRODUCTORY_BLURB",se_helpIntroductoryBlurb);
 
+// Sty compatibility
+static tConfItemLine se_helpStyCompat("HELP_MESSAGE",se_helpIntroductoryBlurb);
+
 static void se_Help( ePlayerNetID * sender, ePlayerNetID * receiver, std::istream & s ) {
     std::ws(s);
     tColoredString reply;