Merge

code/ryzom/common/src/game_share/entity_types.h

@@ -81,7 +81,8 @@ const uint32 NB_FAKE_DISC_PROPERTIES_UPDATED_PER_CYCLE=2;
 typedef uint16	TProperty;
 typedef uint8	TPropIndex;
 
-const uint32 NB_PROPERTIES = 256; //number of TProperty elements (if you change this, change the ids of special properties in the Front-end Service!)
+// KAE: Commented because not used
+//const uint32 NB_PROPERTIES = 256; //number of TProperty elements (if you change this, change the ids of special properties in the Front-end Service!)
 
 
 /// Main type for positions/distances. Unit: millimeter

code/ryzom/common/src/game_share/ryzom_entity_id.h

@@ -30,12 +30,17 @@ namespace RYZOMID
 	{
 		// warning: respect separation with creature /object, it's used in front-end vision prioritizer
 		// creature part (include player)
-		player = 0,
+		creature_begin = 0,
-		npc,				//1
+			player = creature_begin,
-		creature,			//2
+			bot_ai_begin,
-		mount,				//3
+				npc = bot_begin,	//1
-		pack_animal,		//4
+				creature,			//2
-		flora,				//5
+				mount,				//3
+				pack_animal,		//4
+				flora,				//5
+			bot_ai_end = flora,
+		creature_end = bot_end,
+
 		// objects part
 		object,				// 6
 		building,			// 7

code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp

@@ -845,9 +845,9 @@ void CGameItemManager::buildNpcSpecificItems()
 //-----------------------------------------------
 // createItem :
 //-----------------------------------------------
-NLMISC_COMMAND(createItem,"create a new item","<sheet id><quality><owner id>")
+NLMISC_COMMAND(createItem,"create a new item","<sheet id><quality>")
 {
-	if( args.size() < 3 )
+	if( args.size() < 2 )
 	{
 		return false;
 	}
@@ -859,9 +859,9 @@ NLMISC_COMMAND(createItem,"create a new item","<sheet id><quality><owner id>")
 	uint16 quality;
 	NLMISC::fromString(args[1], quality);
 
-	uint32 ownerIdTmp;
+	//uint32 ownerIdTmp;
-	NLMISC::fromString(args[2], ownerIdTmp);
+	//NLMISC::fromString(args[2], ownerIdTmp);
-	CEntityId ownerId(RYZOMID::object,ownerIdTmp);	
+	//CEntityId ownerId(RYZOMID::object,ownerIdTmp);	
 
 //	CGameItemPtr item = GameItemManager.createItem( sheetId, quality, ownerId, -1, true,true );
 	CGameItemPtr item = GameItemManager.createItem( sheetId, quality, true, true );

code/ryzom/server/src/entities_game_service/player_manager/character.cpp

@@ -16324,13 +16324,7 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
 	}
 
 	CEntityId targetId = getTarget();
-	if ( targetId.getType() != RYZOMID::npc &&
+	if (targetId.getType() > creature_end)
-		 targetId.getType() != RYZOMID::player &&
-		 targetId.getType() != RYZOMID::creature &&
-		 targetId.getType() != RYZOMID::mount &&
-		 targetId.getType() != RYZOMID::pack_animal &&
-		 targetId.getType() != RYZOMID::flora
-		)
 		targetId = CEntityId::Unknown;
 
 	TDataSetRow targetRow = TheDataset.getDataSetRow( targetId );

code/ryzom/server/src/frontend_service/distance_prioritizer.cpp

@@ -915,7 +915,7 @@ inline void		CDistancePrioritizer::serialSlotHeader( CClientHost& client, CEntit
 				timestampDelta = 15;
 			timestampDelta |= 0x10; // 'timestampIsThere bit': first bit is bit 5 (high to low order)
 		}
-		else if ( seenEntityId.getType() >= RYZOMID::object )
+		else if ( seenEntityId.getType() > RYZOMID::creature_end )
 		{
 			// For non-players/non-bots types (e.g. bags), set the timestamp delta if entity is being spawned to the client
 			//if ( _VisualPropertyTreeRoot->B->B->getSHEETnode()->BranchHasPayload ) // assumes this is done after arbitrateDiscreetProperties() // CHANGED BEN

code/ryzom/server/src/frontend_service/distance_prioritizer.h

@@ -227,7 +227,7 @@ public:
 			{
 				outbox.serialBitAndLog( BranchHasPayload );
 				if ( a() ) a()->fillDiscreetProperties( outbox );
-				if ( a() ) b()->fillDiscreetProperties( outbox );
+				if ( b() ) b()->fillDiscreetProperties( outbox );
 			}
 		}
 		else

code/ryzom/server/src/gpm_service/world_entity.cpp

@@ -161,7 +161,7 @@ void	CWorldEntity::init( const CEntityId& id, const TDataSetRow &index )
 	{
 		_Type = Trigger;
 	}
-	else if ( (id.getType() >= RYZOMID::npc ) || ( id.getType() <= RYZOMID::flora)  )
+	else if ((id.getType() >= RYZOMID::bot_ai_begin) && (id.getType() <= RYZOMID::bot_ai_end))
 	{
 		_Type = AI;
 	}

code/web/public_php/setup/install.php

@@ -143,6 +143,7 @@ include('header.php');
 			$config = str_replace("%nelSetupPassword%", addslashes($_POST["nelSetupPassword"]), $config);
 			$config = str_replace("%domainDatabase%", addslashes($_POST["domainDatabase"]), $config);
 			$config = str_replace("%nelDomainName%", addslashes($_POST["nelDomainName"]), $config);
+			$config = str_replace("%nelSetupVersion%", addslashes($NEL_SETUP_VERSION), $config);
 			$cryptKeyLength = 16;
 			$cryptKey = str_replace("=", "", base64_encode(mcrypt_create_iv(ceil(0.75 * $cryptKeyLength), MCRYPT_DEV_URANDOM)));
 			$cryptKeyIMAP = str_replace("=", "", base64_encode(mcrypt_create_iv(ceil(0.75 * $cryptKeyLength), MCRYPT_DEV_URANDOM)));