Merge branch 'master' into new_level_refactor

# Conflicts:
#	src/p_user.cpp

src/g_level.cpp

@@ -490,7 +490,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
 		for (i = 0; i < MAXPLAYERS; ++i)
 		{
 			if (playeringame[i])
-				players[i].SetLogText ("Find help");
+				players[i].SetLogText ("$TXT_FINDHELP");
 		}
 	}
 

src/g_statusbar/sbarinfo_commands.cpp

@@ -923,7 +923,7 @@ class CommandDrawString : public SBarInfoCommand
 					break;
 				}
 				case LOGTEXT:
-					str = statusBar->CPlayer->LogText;
+					str = GStrings(statusBar->CPlayer->LogText);
 					break;
 				default:
 					break;

src/g_statusbar/shared_sbar.cpp

@@ -55,6 +55,7 @@
 #include "vm.h"
 #include "p_acs.h"
 #include "sbarinfo.h"
+#include "gstrings.h"
 #include "events.h"
 #include "g_game.h"
 
@@ -1046,7 +1047,7 @@ void DBaseStatusBar::DrawLog ()
 		hudheight = SCREENHEIGHT / scale;
 
 		int linelen = hudwidth<640? Scale(hudwidth,9,10)-40 : 560;
-		auto lines = V_BreakLines (SmallFont, linelen, CPlayer->LogText);
+		auto lines = V_BreakLines (SmallFont, linelen, GStrings(CPlayer->LogText));
 		int height = 20;
 
 		for (unsigned i = 0; i < lines.Size(); i++) height += SmallFont->GetHeight () + 1;

src/gamedata/a_keys.cpp

@@ -555,7 +555,7 @@ int P_GetMapColorForKey (AActor * key)
 			foundlock = pair->Key;
 		}
 	}
-	return 0;
+	return rgb;
 }
 
 

src/p_user.cpp

@@ -91,6 +91,7 @@
 #include "events.h"
 #include "g_game.h"
 #include "v_video.h"
+#include "gstrings.h"
 
 static FRandom pr_skullpop ("SkullPop");
 
@@ -403,7 +404,7 @@ void player_t::SetLogText (const char *text)
 	{
 		// Print log text to console
 		AddToConsole(-1, TEXTCOLOR_GOLD);
-		AddToConsole(-1, LogText);
+		AddToConsole(-1, GStrings(LogText));
 		AddToConsole(-1, "\n");
 	}
 }