From 7ca46bb93a4597f0c970a197f279643fbc3a9f46 Mon Sep 17 00:00:00 2001
From: Kyzentun Keeslala <kyzentun@gmail.com>
Date: Fri, 16 Sep 2016 18:02:08 -0600
Subject: [PATCH] Added PlayerOptions:FromString.

---
 Docs/Changelog_sm5.txt | 14 ++++++++++++++
 src/PlayerOptions.cpp  |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 191c4a7ff6..72a9619faf 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -4,6 +4,20 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2016/09/16
+----------
+* [PlayerOptions] Added FromString function for applying a mod string the way
+  ApplyLameCommand does in oitg. [kyzentun]
+
+================================================================================
+StepMania 5.0.12 | 20160905
+--------------------------------------------------------------------------------
+
+2016/08/28
+----------
+* [Gameplay] Added oitg_zoom_mode_actor() for compatibility with oitg's
+  SetZoom bug. [kyzentun]
+
 2016/06/28
 ----------
 * [Gameplay] Moved pause menu logic to a script in _fallback.  Added
diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp
index 80f764a3a2..1195b3fb06 100644
--- a/src/PlayerOptions.cpp
+++ b/src/PlayerOptions.cpp
@@ -1456,6 +1456,12 @@ public:
 		return 1;
 	}
 
+	static int FromString(T* p, lua_State* L)
+	{
+		p->FromString(SArg(1));
+		COMMON_RETURN_SELF;
+	}
+
 	LunaPlayerOptions()
 	{
 		ADD_METHOD( IsEasierForSongAndSteps );
@@ -1560,6 +1566,8 @@ public:
 		ADD_METHOD( UsingReverse );
 		ADD_METHOD( GetReversePercentForColumn );
 		ADD_METHOD( GetStepAttacks );
+
+		ADD_METHOD(FromString);
 	}
 };