Merge branch 'master' into new_level_refactor

# Conflicts:
#	src/c_dispatch.cpp

src/c_bind.cpp

@@ -70,7 +70,7 @@ const char *KeyNames[NUM_KEYS] =
 	NULL,		NULL,		NULL,		NULL,		"F13",		"F14",		"F15",		"F16",		//60
 	NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		//68
 	"Kana",		NULL,		NULL,		"Abnt_C1",	NULL,		NULL,		NULL,		NULL,		//70
-	NULL,		"Convert",	NULL,		"NoConvert",NULL,		"Yen",		"abnt_c2",	NULL,		//78
+	NULL,		"Convert",	NULL,		"NoConvert",NULL,		"Yen",		"Abnt_C2",	NULL,		//78
 	NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		NULL,		//80
 	NULL,		NULL,		NULL,		NULL,		NULL,		"KP=",		NULL,		NULL,		//88
 	"Circumflex","@",		":",		"_",		"Kanji",	"Stop",		"Ax",		"Unlabeled",//90

src/c_cmds.cpp

@@ -74,6 +74,7 @@ extern bool insave;
 
 CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH)
 CVAR (Bool, sv_unlimited_pickup, false, CVAR_SERVERINFO)
+CVAR (Bool, cl_blockcheats, false, 0)
 
 CCMD (toggleconsole)
 {
@@ -87,6 +88,11 @@ bool CheckCheatmode (bool printmsg)
 		if (printmsg) Printf ("sv_cheats must be true to enable this command.\n");
 		return true;
 	}
+	else if (cl_blockcheats)
+	{
+		if (printmsg) Printf ("cl_blockcheats is turned on and disabled this command.\n");
+		return true;
+	}
 	else
 	{
 		return false;

src/c_console.cpp

@@ -629,7 +629,7 @@ void C_DeinitConsole ()
 	while (cmd != NULL)
 	{
 		GameAtExit *next = cmd->Next;
-		AddCommandString (cmd->Command.LockBuffer());
+		AddCommandString (cmd->Command);
 		delete cmd;
 		cmd = next;
 	}
@@ -1559,17 +1559,9 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
 			{
 				// Work with a copy of command to avoid side effects caused by
 				// exception raised during execution, like with 'error' CCMD.
-				// It's problematic to maintain FString's lock symmetry.
+				FString copy = buffer.Text;
-				static TArray<char> command;
-				const size_t length = buffer.Text.Len();
-
-				command.Resize(unsigned(length + 1));
-				memcpy(&command[0], buffer.Text.GetChars(), length);
-				command[length] = '\0';
-
 				buffer.SetString("");
-
+				AddCommandString(copy);
-				AddCommandString(&command[0]);
 			}
 			TabbedLast = false;
 			TabbedList = false;

src/c_dispatch.cpp

@@ -60,38 +60,119 @@
 
 // TYPES -------------------------------------------------------------------
 
-class DWaitingCommand : public DThinker
+class UnsafeExecutionScope
 {
-	DECLARE_CLASS (DWaitingCommand, DThinker)
+	const bool wasEnabled;
+
 public:
-	DWaitingCommand (const char *cmd, int tics, bool unsafe);
+	explicit UnsafeExecutionScope(const bool enable = true)
-	~DWaitingCommand ();
+		: wasEnabled(UnsafeExecutionContext)
-	void Serialize(FSerializer &arc);
+	{
-	void Tick ();
+		UnsafeExecutionContext = enable;
+	}
 
-private:
+	~UnsafeExecutionScope()
-	DWaitingCommand ();
+	{
+		UnsafeExecutionContext = wasEnabled;
+	}
+};
 
-	char *Command;
+class FDelayedCommand
+{
+protected:
+	virtual bool Tick() = 0;
+
+	friend class FDelayedCommandQueue;
+};
+
+class FWaitingCommand : public FDelayedCommand
+{
+public:
+	FWaitingCommand(const char *cmd, int tics, bool unsafe)
+		: Command(cmd), TicsLeft(tics+1), IsUnsafe(unsafe)
+	{}
+
+	bool Tick() override
+	{
+		if (--TicsLeft == 0)
+		{
+			UnsafeExecutionScope scope(IsUnsafe);
+			AddCommandString(Command);
+			return true;
+		}
+		return false;
+	}
+
+	FString Command;
 	int TicsLeft;
 	bool IsUnsafe;
 };
 
-class DStoredCommand : public DThinker
+class FStoredCommand : public FDelayedCommand
 {
-	DECLARE_CLASS (DStoredCommand, DThinker)
 public:
-	DStoredCommand (FConsoleCommand *com, const char *cmd);
+	FStoredCommand(FConsoleCommand *com, const char *cmd)
-	~DStoredCommand ();
+		: Command(com), Text(cmd)
-	void Tick ();
+	{}
+
+	bool Tick() override
+	{
+		if (Text.IsNotEmpty() && Command != nullptr)
+		{
+			FCommandLine args(Text);
+			Command->Run(args, players[consoleplayer].mo, 0);
+		}
+		return true;
+	}
 
 private:
-	DStoredCommand ();
 
 	FConsoleCommand *Command;
-	char *Text;
+	FString Text;
 };
 
+class FDelayedCommandQueue
+{
+	TDeletingArray<FDelayedCommand *> delayedCommands;
+public:
+	void Run()
+	{
+		for (unsigned i = 0; i < delayedCommands.Size(); i++)
+		{
+			if (delayedCommands[i]->Tick())
+			{
+				delete delayedCommands[i];
+				delayedCommands.Delete(i);
+				i--;
+			}
+		}
+	}
+
+	void Clear()
+	{
+		delayedCommands.DeleteAndClear();
+	}
+
+	void AddCommand(FDelayedCommand * cmd)
+	{
+		delayedCommands.Push(cmd);
+	}
+};
+
+static FDelayedCommandQueue delayedCommandQueue;
+
+void C_RunDelayedCommands()
+{
+	delayedCommandQueue.Run();
+}
+
+void C_ClearDelayedCommands()
+{
+	delayedCommandQueue.Clear();
+}
+
+
+
 struct FActionMap
 {
 	FButtonStatus	*Button;
@@ -128,22 +209,6 @@ FButtonStatus Button_Mlook, Button_Klook, Button_Use, Button_AltAttack,
 
 bool ParsingKeyConf, UnsafeExecutionContext;
 
-class UnsafeExecutionScope
-{
-	const bool wasEnabled;
-
-public:
-	explicit UnsafeExecutionScope(const bool enable = true)
-	: wasEnabled(UnsafeExecutionContext)
-	{
-		UnsafeExecutionContext = enable;
-	}
-
-	~UnsafeExecutionScope()
-	{
-		UnsafeExecutionContext = wasEnabled;
-	}
-};
 
 // To add new actions, go to the console and type "key <action name>".
 // This will give you the key value to use in the first column. Then
@@ -206,79 +271,6 @@ static const char *KeyConfCommands[] =
 
 // CODE --------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DWaitingCommand, false, false)
-
-void DWaitingCommand::Serialize(FSerializer &arc)
-{
-	Super::Serialize (arc);
-	arc("command", Command)
-		("ticsleft", TicsLeft)
-		("unsafe", IsUnsafe);
-}
-
-DWaitingCommand::DWaitingCommand ()
-{
-	Command = NULL;
-	TicsLeft = 1;
-	IsUnsafe = false;
-}
-
-DWaitingCommand::DWaitingCommand (const char *cmd, int tics, bool unsafe)
-{
-	Command = copystring (cmd);
-	TicsLeft = tics+1;
-	IsUnsafe = unsafe;
-}
-
-DWaitingCommand::~DWaitingCommand ()
-{
-	if (Command != NULL)
-	{
-		delete[] Command;
-	}
-}
-
-void DWaitingCommand::Tick ()
-{
-	if (--TicsLeft == 0)
-	{
-		UnsafeExecutionScope scope(IsUnsafe);
-		AddCommandString (Command);
-		Destroy ();
-	}
-}
-
-IMPLEMENT_CLASS(DStoredCommand, false, false)
-
-DStoredCommand::DStoredCommand ()
-{
-	Text = NULL;
-	Destroy ();
-}
-
-DStoredCommand::DStoredCommand (FConsoleCommand *command, const char *args)
-{
-	Command = command;
-	Text = copystring (args);
-}		
-
-DStoredCommand::~DStoredCommand ()
-{
-	if (Text != NULL)
-	{
-		delete[] Text;
-	}
-}
-
-void DStoredCommand::Tick ()
-{
-	if (Text != NULL && Command != NULL)
-	{
-		FCommandLine args (Text);
-		Command->Run (args, players[consoleplayer].mo, 0);
-	}
-	Destroy ();
-}
 
 static int ListActionCommands (const char *pattern)
 {
@@ -657,7 +649,8 @@ void C_DoCommand (const char *cmd, int keynum)
 			}
 			else
 			{
-				currentUILevel->CreateThinker<DStoredCommand> (com, beg);
+				auto cmd = new FStoredCommand(com, beg);
+				delayedCommandQueue.AddCommand(cmd);
 			}
 		}
 	}
@@ -697,8 +690,12 @@ DEFINE_ACTION_FUNCTION(DOptionMenuItemCommand, DoCommand)
 	return 0;
 }
 
-void AddCommandString (char *cmd, int keynum)
+void AddCommandString (const char *text, int keynum)
 {
+	// Operate on a local copy instead of messing around with the data that's being passed in here.
+	TArray<char> buffer(strlen(text) + 1, true);
+	memcpy(buffer.Data(), text, buffer.Size());
+	char *cmd = buffer.Data();
 	char *brkpt;
 	int more;
 
@@ -753,7 +750,8 @@ void AddCommandString (char *cmd, int keynum)
 						  // Note that deferred commands lose track of which key
 						  // (if any) they were pressed from.
 							*brkpt = ';';
-							currentUILevel->CreateThinker<DWaitingCommand> (brkpt, tics, UnsafeExecutionContext);
+							auto cmd = new FWaitingCommand(brkpt, tics, UnsafeExecutionContext);
+							delayedCommandQueue.AddCommand(cmd);
 						}
 						return;
 					}
@@ -1478,8 +1476,7 @@ void FConsoleAlias::Run (FCommandLine &args, AActor *who, int key)
 	}
 
 	bRunning = true;
-	AddCommandString (mycommand.LockBuffer(), key);
+	AddCommandString (mycommand, key);
-	mycommand.UnlockBuffer();
 	bRunning = false;
 	if (m_Command[index].IsEmpty())
 	{ // The alias is unchanged, so put the command back so it can be used again.
@@ -1555,8 +1552,7 @@ void FExecList::ExecCommands() const
 {
 	for (unsigned i = 0; i < Commands.Size(); ++i)
 	{
-		AddCommandString(Commands[i].LockBuffer());
+		AddCommandString(Commands[i]);
-		Commands[i].UnlockBuffer();
 	}
 }
 

src/c_dispatch.h

@@ -77,7 +77,10 @@ FExecList *C_ParseCmdLineParams(FExecList *exec);
 // and semicolon-separated commands. This function may modify the source
 // string, but the string will be restored to its original state before
 // returning. Therefore, commands passed must not be in read-only memory.
-void AddCommandString (char *text, int keynum=0);
+void AddCommandString (const char *text, int keynum=0);
+
+void C_RunDelayedCommands();
+void C_ClearDelayedCommands();
 
 // Process a single console command. Does not handle wait.
 void C_DoCommand (const char *cmd, int keynum=0);

src/d_main.cpp

@@ -2579,7 +2579,7 @@ void D_DoomMain (void)
 		// [RH] Run any saved commands from the command line or autoexec.cfg now.
 		gamestate = GS_FULLCONSOLE;
 		Net_NewMakeTic ();
-		DThinker::RunThinkers ();
+		C_RunDelayedCommands();
 		gamestate = GS_STARTUP;
 
 		if (!restart)
@@ -2646,7 +2646,7 @@ void D_DoomMain (void)
 							G_InitNew(startmap, false);
 							if (StoredWarp.IsNotEmpty())
 							{
-								AddCommandString(StoredWarp.LockBuffer());
+								AddCommandString(StoredWarp);
 								StoredWarp = NULL;
 							}
 						}

src/g_game.cpp

@@ -1021,9 +1021,8 @@ void G_Ticker ()
 
 	if (ToggleFullscreen)
 	{
-		static char toggle_fullscreen[] = "toggle fullscreen";
 		ToggleFullscreen = false;
-		AddCommandString (toggle_fullscreen);
+		AddCommandString ("toggle fullscreen");
 	}
 
 	// do things to change the game state
@@ -1173,6 +1172,7 @@ void G_Ticker ()
 
 	// [ZZ] also tick the UI part of the events
 	E_UiTick();
+	C_RunDelayedCommands();
 
 	// do main actions
 	switch (gamestate)
@@ -2058,12 +2058,12 @@ static void PutSaveWads (FSerializer &arc)
 	name = Wads.GetWadName (Wads.GetIwadNum());
 	arc.AddString("Game WAD", name);
 
-		// Name of wad the map resides in
+	// Name of wad the map resides in
 	if (Wads.GetLumpFile (level.lumpnum) > Wads.GetIwadNum())
-		{
+	{
 		name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum));
 		arc.AddString("Map WAD", name);
-		}
+	}
 }
 
 static void PutSaveComment (FSerializer &arc)
@@ -2079,7 +2079,7 @@ static void PutSaveComment (FSerializer &arc)
 
 	arc.AddString("Creation Time", comment);
 
-		// Get level name
+	// Get level name
 	//strcpy (comment, level.level_name);
 	comment.Format("%s - %s\n", level.MapName.GetChars(), level.LevelName.GetChars());
 

src/g_inventory/a_weapons.cpp

@@ -748,8 +748,7 @@ void P_PlaybackKeyConfWeapons(FWeaponSlots *slots)
 	PlayingKeyConf = slots;
 	for (unsigned int i = 0; i < KeyConfWeapons.Size(); ++i)
 	{
-		FString cmd(KeyConfWeapons[i]);
+		AddCommandString(KeyConfWeapons[i]);
-		AddCommandString(cmd.LockBuffer());
 	}
 	PlayingKeyConf = nullptr;
 }

src/sound/oalsound.cpp

@@ -2202,8 +2202,7 @@ void OpenALSoundRenderer::UpdateSounds()
 		if(connected == ALC_FALSE)
 		{
 			Printf("Sound device disconnected; restarting...\n");
-			static char snd_reset[] = "snd_reset";
+			AddCommandString("snd_reset");
-			AddCommandString(snd_reset);
 			return;
 		}
 	}