Merge branch 'development' into FrameMan-Breakdown

Author: MaximDude

CHANGELOG.md

@@ -32,20 +32,28 @@ Valid editor names are: `ActorEditor`, `GibEditor`, `SceneEditor`, `AreaEditor`
 - Upgraded to new, modern FMOD audio library. ([Issue #72](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/72))  
 Sounds now play in 3D space, so they pan to the left and right, and attenuate automatically based on the player's viewpoint.
 
-- `Sound`s have been renamed to `SoundContainer`s, and are able to handle multiple sounds playing at once. INI definitions have changed accordingly.  
+- `Sounds` have been renamed to `SoundContainers`, and are able to handle multiple sounds playing at once. INI definitions have changed accordingly.  
 They must be added using `... = SoundContainer`, and individual sounds for them must be added using `AddSound = ContentFile...`.
 
 - Various lua bindings around audio have been upgraded, changed or fixed, giving modders a lot more control over sounds. See documentation for more details.
 
 - Centered the loading splash screen image when `DisableLoadingScreen` is true.
 
-- `Box:WithinBox` lua bindings have been renamed.  
+- `Box:WithinBox` lua bindings have been renamed: 
 `Box:WithinBox` is now `Box:IsWithinBox`.  
 `Box:WithinBoxX` is now `Box:IsWithinBoxX`.  
 `Box:WithinBoxY` is now `Box:IsWithinBoxY`.
 
 - Made `AHuman` show both weapon ammo states when 2 one-handed weapons are equipped.
 
+- Added support for multiple lines in item descriptions ([Issue#58](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/58)). This is done as follows:
+	```
+	Description = MultiLineText
+		AddLine = First line of text
+		AddLine = Second line of text
+		...
+	```
+
 ### Fixed
 
 - Fixed LuaBind being all sorts of messed up. All lua bindings now work properly like they were before updating to the v141 toolset.

Managers/LuaMan.cpp

@@ -543,6 +543,7 @@ int LuaMan::Create()
             .def(tostring(const_self))
             .property("ClassName", &Entity::GetClassName)
             .property("PresetName", &Entity::GetPresetName, &Entity::SetPresetName)
+            .property("Description", &Entity::GetDescription, &Entity::SetDescription)
             .def("GetModuleAndPresetName", &Entity::GetModuleAndPresetName)
             .property("IsOriginalPreset", &Entity::IsOriginalPreset)
             .property("ModuleID", &Entity::GetModuleID)

System/Entity.cpp

@@ -75,7 +75,18 @@ namespace RTE {
 			// Indicate where this was read from
 			m_DefinedInModule = reader.GetReadModuleID();
 		} else if (propName == "Description") {
-			reader >> m_PresetDescription;
+			std::string descriptionValue = reader.ReadPropValue();
+			if (descriptionValue == "MultiLineText") {
+				m_PresetDescription.clear();
+				while (reader.NextProperty() && reader.ReadPropName() == "AddLine") {
+					m_PresetDescription += reader.ReadPropValue() + "\n\n";
+				}
+				if (!m_PresetDescription.empty()) {
+					m_PresetDescription.resize(m_PresetDescription.size() - 2);
+				}
+			} else {
+				m_PresetDescription = descriptionValue;
+			}
 		} else if (propName == "RandomWeight") {
 			reader >> m_RandomWeight;
 			m_RandomWeight = Limit(m_RandomWeight, 100, 0);