fix #4929: creg

rts/Sim/Misc/LosHandler.cpp

@@ -15,40 +15,27 @@
 #include "System/TimeProfiler.h"
 
 
-CR_BIND(SLosInstance, (0, 0, int2(), 0.f, 0))
-CR_BIND(ILosType, (0, LOS_TYPE_LOS))
-CR_BIND(ILosType::DelayedInstance, )
 CR_BIND(CLosHandler, )
 
-
-//CR_REG_METADATA(ILosType,(
-	//FIXME
-//))
-CR_REG_METADATA(SLosInstance, (
-	CR_IGNORED(squares),
-	CR_MEMBER(radius),
-	CR_MEMBER(refCount),
-	CR_MEMBER(allyteam),
-	CR_MEMBER(basePos),
-	CR_MEMBER(hashNum),
-	CR_MEMBER(baseHeight),
-	CR_MEMBER(toBeDeleted),
-	CR_MEMBER(needsRecalc)
-))
-CR_REG_METADATA_SUB(ILosType, DelayedInstance, (
-	CR_MEMBER(instance),
-	CR_MEMBER(timeoutTime)))
-
-
+// ILosTypes aren't creg'ed cause they repopulate themselves in case of loading a saved game
 CR_REG_METADATA(CLosHandler,(
-	CR_MEMBER(los),
-	CR_MEMBER(airLos),
-	CR_MEMBER(radar),
-	CR_MEMBER(sonar),
-	CR_MEMBER(commonJammer),
-	CR_MEMBER(commonSonarJammer),
-	CR_MEMBER(seismic),
-	CR_MEMBER(radarErrorSizes)
+	CR_IGNORED(autoLinkEvents),
+	CR_IGNORED(autoLinkedEvents),
+	CR_IGNORED(name),
+	CR_IGNORED(order),
+	CR_IGNORED(synced_),
+
+	CR_IGNORED(los),
+	CR_IGNORED(airLos),
+	CR_IGNORED(radar),
+	CR_IGNORED(sonar),
+	CR_IGNORED(seismic),
+	CR_IGNORED(commonJammer),
+	CR_IGNORED(commonSonarJammer),
+	CR_MEMBER(baseRadarErrorSize),
+	CR_MEMBER(baseRadarErrorMult),
+	CR_MEMBER(radarErrorSizes),
+	CR_IGNORED(losTypes)
 ))
 
 
@@ -178,7 +165,7 @@ void ILosType::MoveUnit(CUnit* unit)
 	};
 
 	// unchanged?
-	SLosInstance* uli = reinterpret_cast<SLosInstance*>(unit->los[type]);
+	SLosInstance* uli = unit->los[type];
 	if (IS_FITTING_INSTANCE(uli)) {
 		return;
 	}
@@ -213,9 +200,9 @@ void ILosType::MoveUnit(CUnit* unit)
 void ILosType::RemoveUnit(CUnit* unit, bool delayed)
 {
 	if (delayed) {
-		DelayedFreeInstance(reinterpret_cast<SLosInstance*>(unit->los[type]));
+		DelayedFreeInstance(unit->los[type]);
 	} else {
-		UnrefInstance(reinterpret_cast<SLosInstance*>(unit->los[type]));
+		UnrefInstance(unit->los[type]);
 	}
 	unit->los[type] = nullptr;
 }

rts/Sim/Misc/LosHandler.h

@@ -36,8 +36,6 @@
  */
 struct SLosInstance
 {
-	CR_DECLARE_STRUCT(SLosInstance)
-
 	SLosInstance(int radius, int allyteam, int2 basePos, float baseHeight, int hashNum)
 		: allyteam(allyteam)
 		, radius(radius)
@@ -84,9 +82,6 @@ struct SLosInstance
  */
 class ILosType
 {
-	CR_DECLARE_STRUCT(ILosType)
-	CR_DECLARE_SUB(DelayedInstance)
-
 public:
 	// the Interface
 	int2 PosToSquare(const float3 pos) const { return int2( Round(pos.x * invDiv), Round(pos.z * invDiv) ); }
@@ -154,7 +149,6 @@ class ILosType
 
 private:
 	struct DelayedInstance {
-		CR_DECLARE_STRUCT(DelayedInstance)
 		SLosInstance* instance;
 		int timeoutTime;
 	};
@@ -174,7 +168,7 @@ class ILosType
  * so hills obstruct view (see CLosAlgorithm). The second is circular: air LOS
  * is not influenced by terrain.
  */
-class CLosHandler : public boost::noncopyable, public CEventClient
+class CLosHandler : public CEventClient
 {
 	CR_DECLARE_STRUCT(CLosHandler)
 	CLosHandler();

rts/Sim/Misc/LosMap.cpp

@@ -14,20 +14,6 @@
 
 
 
-CR_BIND(CLosMap, (int2(), false, nullptr))
-CR_REG_METADATA(CLosMap, (
-	CR_MEMBER(size),
-	CR_MEMBER(map),
-	CR_MEMBER(sendReadmapEvents)//,
-	//CR_MEMBER(heightmap)
-))
-
-
-
-
-
-
-
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 /// CLosTables precalc helper
@@ -476,7 +462,6 @@ void CLosMap::CastLos(std::vector<int>* squares, float* maxAng, const int2 pos,
 void CLosMap::UnsafeLosAdd(int2 pos, int radius, float losHeight, std::vector<int>& squares)
 {
 	const size_t area = Square((2*radius)+1);
-
 	const LosTable& table = CLosTables::GetForLosSize(radius);
 	size_t neededSpace = squares.size() + 1;
 	for (const LosLine& line: table) {

rts/Sim/Misc/LosMap.h

@@ -16,8 +16,6 @@ struct SLosInstance;
 /// map containing counts of how many units have Line Of Sight (LOS) to each square
 class CLosMap
 {
-	CR_DECLARE_STRUCT(CLosMap)
-
 public:
 	CLosMap(int2 size_, bool sendReadmapEvents_, const float* heightmap_)
 	: size(size_)

rts/Sim/Units/Unit.cpp

@@ -2385,7 +2385,7 @@ CR_REG_METADATA(CUnit, (
 	CR_MEMBER(category),
 
 	CR_MEMBER(quads),
-	//CR_MEMBER(los),
+	CR_IGNORED(los),
 
 	CR_MEMBER(mapSquare),
 

rts/Sim/Units/Unit.h

@@ -29,6 +29,8 @@ struct LocalModelPiece;
 struct UnitDef;
 struct UnitTrackStruct;
 struct UnitLoadParams;
+struct SLosInstance;
+
 
 namespace icon {
 	class CIconData;
@@ -273,7 +275,7 @@ class CUnit : public CSolidObject
 	CUnitScript* script;
 
 	/// which squares the unit can currently observe
-	std::vector<void*> los;
+	std::vector<SLosInstance*> los;
 
 	/// indicate the los/radar status the allyteam has on this unit
 	std::vector<unsigned short> losStatus;

rts/System/EventClient.h

@@ -74,38 +74,29 @@ class CEventClient
 			return (GetFullRead() || (GetReadAllyTeam() == allyTeam));
 		}
 
-	public:
-		friend class CEventHandler;
+	protected:
+		CEventClient(const std::string& name, int order, bool synced);
+		virtual ~CEventClient();
 
-		typedef void (*eventFuncPtr)();
+	protected:
+		const std::string name;
+		const int         order;
+		const bool        synced_;
+		      bool        autoLinkEvents;
 
+	protected:
+		friend class CEventHandler;
 		std::map<std::string, bool> autoLinkedEvents;
 
 		template <class T>
 		void RegisterLinkedEvents(T* foo) {
-			// old way needed gcc's pmf extension to cast member functions
-			//autoLinkedEvents[#eventname]  = (reinterpret_cast<eventFuncPtr>(&T::eventname) != reinterpret_cast<eventFuncPtr>(&CEventClient::eventname));
-
-			// new way, works everywhere
 			#define SETUP_EVENT(eventname, props) \
 				autoLinkedEvents[#eventname] = (typeid(&T::eventname) != typeid(&CEventClient::eventname));
 
 				#include "Events.def"
 			#undef SETUP_EVENT
 		}
 
-	private:
-		const std::string name;
-		const int         order;
-		const bool        synced_;
-
-	protected:
-		      bool        autoLinkEvents;
-
-	protected:
-		CEventClient(const std::string& name, int order, bool synced);
-		virtual ~CEventClient();
-
 	public:
 		/**
 		 * @name Synced_events