Switch to Oberon00's LuaBind 0.9.1 fork

Source/Entities/Attachable.h

@@ -10,6 +10,7 @@ namespace RTE {
 	/// An articulated, detachable part of an Actor's body.
 	class Attachable : public MOSRotating {
 		friend class MOSRotating;
+		friend struct EntityLuaBindings;
 
 	public:
 		EntityAllocation(Attachable);

Source/Entities/LimbPath.h

@@ -17,6 +17,7 @@ namespace RTE {
 	/// A set of Vector:s making up a motion path for a AtomGroup's limb. The
 	/// path is continuous.
 	class LimbPath : public Entity {
+		friend struct EntityLuaBindings;
 
 		/// Public member variable, method and friend function declarations
 	public:

Source/Entities/SceneObject.h

@@ -15,6 +15,7 @@ namespace RTE {
 	/// The base class shared by Both TerrainObject:s and MovableObject:s, ie
 	/// anything that can be places in a scene.
 	class SceneObject : public Entity {
+		friend struct EntityLuaBindings;
 
 		/// Public member variable, method and friend function declarations
 	public:
@@ -285,6 +286,7 @@ namespace RTE {
 
 		// Member variables
 		static Entity::ClassInfo m_sClass;
+
 		// Absolute position of the center of this in the scene, in pixels
 		Vector m_Pos;
 		// How much this SceneObject costs to purchase, in oz's of gold.

Source/Entities/SoundContainer.h

@@ -12,6 +12,7 @@ namespace RTE {
 
 	/// A container for sounds that represent a specific sound effect.
 	class SoundContainer : public Entity {
+		friend struct EntityLuaBindings;
 
 	public:
 		EntityAllocation(SoundContainer);

Source/Lua/LuaBindingsActivities.cpp

@@ -18,6 +18,7 @@ LuaBindingRegisterFunctionDefinitionForType(ActivityLuaBindings, Activity) {
 	    .property("HumanCount", &Activity::GetHumanCount)
 	    .property("TeamCount", &Activity::GetTeamCount)
 	    .property("Difficulty", &Activity::GetDifficulty, &Activity::SetDifficulty)
+	    .property("CraftsOrbitAtTheEdge", &Activity::GetCraftOrbitAtTheEdge, &Activity::SetCraftOrbitAtTheEdge)
 
 	    .def("DeactivatePlayer", &Activity::DeactivatePlayer)
 	    .def("PlayerActive", &Activity::PlayerActive)
@@ -118,7 +119,6 @@ LuaBindingRegisterFunctionDefinitionForType(ActivityLuaBindings, GameActivity) {
 	    .property("CPUTeam", &GameActivity::GetCPUTeam, &GameActivity::SetCPUTeam)
 	    .property("DeliveryDelay", &GameActivity::GetDeliveryDelay, &GameActivity::SetDeliveryDelay)
 	    .property("BuyMenuEnabled", &GameActivity::GetBuyMenuEnabled, &GameActivity::SetBuyMenuEnabled)
-	    .property("CraftsOrbitAtTheEdge", &GameActivity::GetCraftOrbitAtTheEdge, &GameActivity::SetCraftOrbitAtTheEdge)
 
 	    //.def_readwrite("ActorCursor", &GameActivity::m_ActorCursor)
 	    .def_readwrite("CursorTimer", &GameActivity::m_CursorTimer)

Source/Lua/LuaBindingsEntities.cpp

@@ -2,6 +2,7 @@
 
 #include "LuaBindingRegisterDefinitions.h"
 
+#include "MovableObject.h"
 #include "PieSlice.h"
 #include "SoundSet.h"
 
@@ -537,11 +538,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Arm) {
 LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Attachable) {
 	return ConcreteTypeLuaClassDefinition(Attachable, MOSRotating)
 
-	    .property("ParentOffset", &Attachable::GetParentOffset, &Attachable::SetParentOffset)
 	    .property("JointStrength", &Attachable::GetJointStrength, &Attachable::SetJointStrength)
 	    .property("JointStiffness", &Attachable::GetJointStiffness, &Attachable::SetJointStiffness)
-	    .property("JointOffset", &Attachable::GetJointOffset, &Attachable::SetJointOffset)
-	    .property("JointPos", &Attachable::GetJointPos)
 	    .property("DeleteWhenRemovedFromParent", &Attachable::GetDeleteWhenRemovedFromParent, &Attachable::SetDeleteWhenRemovedFromParent)
 	    .property("GibWhenRemovedFromParent", &Attachable::GetGibWhenRemovedFromParent, &Attachable::SetGibWhenRemovedFromParent)
 	    .property("ApplyTransferredForcesAtOffset", &Attachable::GetApplyTransferredForcesAtOffset, &Attachable::SetApplyTransferredForcesAtOffset)
@@ -559,6 +557,10 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Attachable) {
 	    .property("InheritsVelWhenDetached", &Attachable::InheritsVelocityWhenDetached, &Attachable::SetInheritsVelocityWhenDetached)
 	    .property("InheritsAngularVelWhenDetached", &Attachable::InheritsAngularVelocityWhenDetached, &Attachable::SetInheritsAngularVelocityWhenDetached)
 
+	    .def_readwrite("ParentOffset", &Attachable::m_ParentOffset)
+	    .def_readwrite("JointOffset", &Attachable::m_JointOffset)
+	    .def_readwrite("JointPos", &Attachable::m_JointPos)
+
 	    .def("IsAttached", &Attachable::IsAttached)
 	    .def("IsAttachedTo", &Attachable::IsAttachedTo)
 
@@ -739,12 +741,13 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Leg) {
 LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, LimbPath) {
 	return luabind::class_<LimbPath>("LimbPath")
 
-	    .property("StartOffset", &LimbPath::GetStartOffset, &LimbPath::SetStartOffset)
 	    .property("SegmentCount", &LimbPath::GetSegCount)
 	    .property("BaseTravelSpeedMultiplier", &LimbPath::GetBaseTravelSpeedMultiplier, &LimbPath::SetBaseTravelSpeedMultiplier)
 	    .property("TravelSpeed", &LimbPath::GetTravelSpeed, &LimbPath::SetTravelSpeed)
 	    .property("PushForce", &LimbPath::GetPushForce, &LimbPath::SetPushForce)
 
+	    .def_readwrite("StartOffset", &LimbPath::m_Start)
+
 	    .def("GetSegment", &LimbPath::GetSegment);
 }
 
@@ -864,8 +867,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MOSRotating) {
 	    .property("IndividualRadius", &MOSRotating::GetIndividualRadius)
 	    .property("IndividualDiameter", &MOSRotating::GetIndividualDiameter)
 	    .property("IndividualMass", &MOSRotating::GetIndividualMass)
-	    .property("RecoilForce", &MOSRotating::GetRecoilForce)
-	    .property("RecoilOffset", &MOSRotating::GetRecoilOffset)
 	    .property("TravelImpulse", &MOSRotating::GetTravelImpulse, &MOSRotating::SetTravelImpulse)
 	    .property("GibWoundLimit", (int(MOSRotating::*)() const) & MOSRotating::GetGibWoundLimit, &MOSRotating::SetGibWoundLimit)
 	    .property("GibSound", &MOSRotating::GetGibSound, &LuaAdaptersPropertyOwnershipSafetyFaker::MOSRotatingSetGibSound)
@@ -876,6 +877,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MOSRotating) {
 	    .property("WoundCount", (int(MOSRotating::*)() const) & MOSRotating::GetWoundCount)
 	    .property("OrientToVel", &MOSRotating::GetOrientToVel, &MOSRotating::SetOrientToVel)
 
+	    .def_readwrite("RecoilForce", &MOSRotating::m_RecoilForce)
+	    .def_readwrite("RecoilOffset", &MOSRotating::m_RecoilOffset)
 	    .def_readonly("Attachables", &MOSRotating::m_Attachables, luabind::return_stl_iterator)
 	    .def_readonly("Wounds", &MOSRotating::m_Wounds, luabind::return_stl_iterator)
 	    .def_readonly("Gibs", &MOSRotating::m_Gibs, luabind::return_stl_iterator)
@@ -919,10 +922,9 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MOSRotating) {
 LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	return AbstractTypeLuaClassDefinition(MovableObject, SceneObject)
 
+
 	    .property("Material", &MovableObject::GetMaterial)
 	    .property("Mass", &MovableObject::GetMass, &MovableObject::SetMass)
-	    .property("Pos", &MovableObject::GetPos, &MovableObject::SetPos)
-	    .property("Vel", &MovableObject::GetVel, &MovableObject::SetVel)
 	    .property("PrevPos", &MovableObject::GetPrevPos)
 	    .property("PrevVel", &MovableObject::GetPrevVel)
 	    .property("DistanceTravelled", &MovableObject::GetDistanceTravelled)
@@ -969,6 +971,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	    .property("SimUpdatesBetweenScriptedUpdates", &MovableObject::GetSimUpdatesBetweenScriptedUpdates, &MovableObject::SetSimUpdatesBetweenScriptedUpdates)
 	    .property("PostEffectEnabled", &MovableObject::GetPostEffectEnabled, &MovableObject::SetPostEffectEnabled)
 
+	    .def_readwrite("Vel", &MovableObject::m_Vel)
+
 	    .def("GetParent", (MOSRotating * (MovableObject::*)()) & MovableObject::GetParent)
 	    .def("GetParent", (const MOSRotating* (MovableObject::*)() const) & MovableObject::GetParent)
 	    .def("GetRootParent", (MovableObject * (MovableObject::*)()) & MovableObject::GetRootParent)
@@ -1259,7 +1263,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, StaticSceneLayer)
 LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, SceneObject) {
 	return AbstractTypeLuaClassDefinition(SceneObject, Entity)
 
-	    .property("Pos", &SceneObject::GetPos, &SceneObject::SetPos)
 	    .property("HFlipped", &SceneObject::IsHFlipped, &SceneObject::SetHFlipped)
 	    .property("RotAngle", &SceneObject::GetRotAngle, &SceneObject::SetRotAngle)
 	    .property("Team", &SceneObject::GetTeam, &SceneObject::SetTeam)
@@ -1268,6 +1271,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, SceneObject) {
 
 	    .property("BuyableMode", &LuaAdaptersSceneObject::GetBuyableMode)
 
+	    .def_readwrite("Pos", &SceneObject::m_Pos)
+
 	    .def("IsOnScenePoint", &SceneObject::IsOnScenePoint)
 	    .def("GetGoldValue", &SceneObject::GetGoldValueOld)
 	    .def("GetGoldValue", &SceneObject::GetGoldValue)
@@ -1305,6 +1310,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, SoundContainer) {
 
 	    .def(luabind::constructor<>())
 
+	    .def_readwrite("Pos", &SoundContainer::m_Pos)
+
 	    .property("SoundOverlapMode", &SoundContainer::GetSoundOverlapMode, &SoundContainer::SetSoundOverlapMode)
 	    .property("BusRouting", &SoundContainer::GetBusRouting, &SoundContainer::SetBusRouting)
 	    .property("Immobile", &SoundContainer::IsImmobile, &SoundContainer::SetImmobile)
@@ -1314,7 +1321,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, SoundContainer) {
 	    .property("Loops", &SoundContainer::GetLoopSetting, &SoundContainer::SetLoopSetting)
 	    .property("Priority", &SoundContainer::GetPriority, &SoundContainer::SetPriority)
 	    .property("AffectedByGlobalPitch", &SoundContainer::IsAffectedByGlobalPitch, &SoundContainer::SetAffectedByGlobalPitch)
-	    .property("Pos", &SoundContainer::GetPosition, &SoundContainer::SetPosition)
 	    .property("Volume", &SoundContainer::GetVolume, &SoundContainer::SetVolume)
 	    .property("Pitch", &SoundContainer::GetPitch, &SoundContainer::SetPitch)
 	    .property("Paused", &SoundContainer::IsPaused, &SoundContainer::SetPaused)

Source/Managers/ActivityMan.cpp

@@ -25,8 +25,8 @@
 
 #include "MusicMan.h"
 
-#include "zip.h"
-#include "unzip.h"
+#include "minizip/zip.h"
+#include "minizip/unzip.h"
 
 #include "tracy/Tracy.hpp"
 

Source/Menus/SaveLoadMenuGUI.cpp

@@ -21,8 +21,8 @@
 
 #include <execution>
 
-#include "zip.h"
-#include "unzip.h"
+#include "minizip/zip.h"
+#include "minizip/unzip.h"
 
 using namespace RTE;
 

Source/System/System.cpp

@@ -1,7 +1,7 @@
 #include "System.h"
 
 #include "RTETools.h"
-#include "unzip.h"
+#include "minizip/unzip.h"
 
 #include "RTEError.h"