SAO: re-add old ActiveObjectTypes for a future migration layer

nerzhul · nerzhul · commit c58d49977da5 · 2015-02-17T11:37:55.000+01:00
diff --git a/src/activeobject.h b/src/activeobject.h
@@ -27,6 +27,11 @@ enum ActiveObjectType {
 	ACTIVEOBJECT_TYPE_INVALID = 0,
 	ACTIVEOBJECT_TYPE_TEST = 1,
 	ACTIVEOBJECT_TYPE_ITEM = 2,
+	// Compat layer, migrating objects from 0.3 to 0.4+
+	ACTIVEOBJECT_TYPE_RAT = 3,
+	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+	ACTIVEOBJECT_TYPE_FIREFLY = 5,
+	ACTIVEOBJECT_TYPE_MOBV2 = 6,
 	ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
 	ACTIVEOBJECT_TYPE_PLAYER = 100,
diff --git a/src/clientobject.cpp b/src/clientobject.cpp
@@ -39,14 +39,13 @@ ClientActiveObject::~ClientActiveObject()
 	removeFromScene(true);
 }
 
-ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef,
-		ClientEnvironment *env)
+ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
+		IGameDef *gamedef, ClientEnvironment *env)
 {
 	// Find factory function
 	std::map<u16, Factory>::iterator n;
 	n = m_types.find(type);
-	if(n == m_types.end())
-	{
+	if(n == m_types.end()) {
 		// If factory is not found, just return.
 		dstream<<"WARNING: ClientActiveObject: No factory for type="
 				<<(int)type<<std::endl;
diff --git a/src/clientobject.h b/src/clientobject.h
@@ -86,7 +86,7 @@ class ClientActiveObject : public ActiveObject
 	virtual void initialize(const std::string &data){}
 
 	// Create a certain type of ClientActiveObject
-	static ClientActiveObject* create(u8 type, IGameDef *gamedef,
+	static ClientActiveObject* create(ActiveObjectType type, IGameDef *gamedef,
 			ClientEnvironment *env);
 
 	// If returns true, punch will not be sent to the server
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -1700,7 +1700,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 		StaticObject &s_obj = *i;
 		// Create an active object from the data
 		ServerActiveObject *obj = ServerActiveObject::create
-				(s_obj.type, this, 0, s_obj.pos, s_obj.data);
+				((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data);
 		// If couldn't create object, store static data back.
 		if(obj==NULL)
 		{
@@ -2488,7 +2488,7 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type,
 		const std::string &init_data)
 {
 	ClientActiveObject* obj =
-			ClientActiveObject::create(type, m_gamedef, this);
+			ClientActiveObject::create((ActiveObjectType) type, m_gamedef, this);
 	if(obj == NULL)
 	{
 		infostream<<"ClientEnvironment::addActiveObject(): "
diff --git a/src/serverobject.cpp b/src/serverobject.cpp
@@ -38,15 +38,14 @@ ServerActiveObject::~ServerActiveObject()
 {
 }
 
-ServerActiveObject* ServerActiveObject::create(u8 type,
+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
 		ServerEnvironment *env, u16 id, v3f pos,
 		const std::string &data)
 {
 	// Find factory function
 	std::map<u16, Factory>::iterator n;
 	n = m_types.find(type);
-	if(n == m_types.end())
-	{
+	if(n == m_types.end()) {
 		// If factory is not found, just return.
 		dstream<<"WARNING: ServerActiveObject: No factory for type="
 				<<type<<std::endl;
diff --git a/src/serverobject.h b/src/serverobject.h
@@ -71,7 +71,7 @@ class ServerActiveObject : public ActiveObject
 	{ return true; }
 	
 	// Create a certain type of ServerActiveObject
-	static ServerActiveObject* create(u8 type,
+	static ServerActiveObject* create(ActiveObjectType type,
 			ServerEnvironment *env, u16 id, v3f pos,
 			const std::string &data);
 	

Original file line number	Diff line number	Diff line change
`@@ -1700,7 +1700,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)`
`1700`	`1700`	`StaticObject &s_obj = *i;`
`1701`	`1701`	`// Create an active object from the data`
`1702`	`1702`	`ServerActiveObject *obj = ServerActiveObject::create`
`1703`		`- (s_obj.type, this, 0, s_obj.pos, s_obj.data);`
	`1703`	`+ ((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data);`
`1704`	`1704`	`// If couldn't create object, store static data back.`
`1705`	`1705`	`if(obj==NULL)`
`1706`	`1706`	`{`
`@@ -2488,7 +2488,7 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type,`
`2488`	`2488`	`const std::string &init_data)`
`2489`	`2489`	`{`
`2490`	`2490`	`ClientActiveObject* obj =`
`2491`		`- ClientActiveObject::create(type, m_gamedef, this);`
	`2491`	`+ ClientActiveObject::create((ActiveObjectType) type, m_gamedef, this);`
`2492`	`2492`	`if(obj == NULL)`
`2493`	`2493`	`{`
`2494`	`2494`	`infostream<<"ClientEnvironment::addActiveObject(): "`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,14 @@ ServerActiveObject::~ServerActiveObject()`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`-ServerActiveObject* ServerActiveObject::create(u8 type,`
	`41`	`+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,`
`42`	`42`	`ServerEnvironment *env, u16 id, v3f pos,`
`43`	`43`	`const std::string &data)`
`44`	`44`	`{`
`45`	`45`	`// Find factory function`
`46`	`46`	`std::map<u16, Factory>::iterator n;`
`47`	`47`	`n = m_types.find(type);`
`48`		`- if(n == m_types.end())`
`49`		`- {`
	`48`	`+ if(n == m_types.end()) {`
`50`	`49`	`// If factory is not found, just return.`
`51`	`50`	`dstream<<"WARNING: ServerActiveObject: No factory for type="`
`52`	`51`	`<<type<<std::endl;`