From d7196715793d2f63c928cc234296c96670268594 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Tue, 20 Apr 2010 02:16:06 +0000
Subject: [PATCH] - Added levelname to drawstring.

SVN r2292 (trunk)
---
 src/g_shared/sbarinfo_commands.cpp | 45 ++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/g_shared/sbarinfo_commands.cpp b/src/g_shared/sbarinfo_commands.cpp
index ebc6dad466..71444a8118 100644
--- a/src/g_shared/sbarinfo_commands.cpp
+++ b/src/g_shared/sbarinfo_commands.cpp
@@ -514,7 +514,8 @@ class CommandDrawString : public SBarInfoCommand
 {
 	public:
 		CommandDrawString(SBarInfo *script) : SBarInfoCommand(script),
-			shadow(false), spacing(0), font(NULL), translation(CR_UNTRANSLATED)
+			shadow(false), spacing(0), font(NULL), translation(CR_UNTRANSLATED),
+			value(CONSTANT), valueArg(0)
 		{
 		}
 
@@ -531,8 +532,22 @@ class CommandDrawString : public SBarInfoCommand
 			sc.MustGetToken(',');
 			translation = GetTranslation(sc);
 			sc.MustGetToken(',');
-			sc.MustGetToken(TK_StringConst);
-			str = sc.String;
+			if(sc.CheckToken(TK_Identifier))
+			{
+				if(sc.Compare("levelname"))
+				{
+					value = LEVELNAME;
+					valueArg = -1;
+				}
+				else
+					sc.ScriptError("Unknown string '%s'.", sc.String);
+			}
+			else
+			{
+				value = CONSTANT;
+				sc.MustGetToken(TK_StringConst);
+				str = sc.String;
+			}
 			sc.MustGetToken(',');
 			GetCoordinates(sc, fullScreenOffsets, x, y);
 			if(sc.CheckToken(',')) //spacing
@@ -547,13 +562,37 @@ class CommandDrawString : public SBarInfoCommand
 			else //monospaced, so just multiplay the character size
 				x -= static_cast<int> ((font->GetCharWidth((int) script->spacingCharacter) + spacing) * str.Len());
 		}
+		void	Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged)
+		{
+			switch(value)
+			{
+				case LEVELNAME:
+					if(level.lumpnum != valueArg)
+					{
+						valueArg = level.lumpnum;
+						str = level.LevelName;
+					}
+					break;
+				default:
+					break;
+			}
+		}
 	protected:
+		enum ValueType
+		{
+			LEVELNAME,
+
+			CONSTANT
+		};
+
 		bool				shadow;
 		int					spacing;
 		FFont				*font;
 		EColorRange			translation;
 		SBarInfoCoordinate	x;
 		SBarInfoCoordinate	y;
+		ValueType			value;
+		int					valueArg;
 		FString				str;
 };