Changed: Minor changes

code/ryzom/server/src/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 # Supporting modules and libraries.
 # Need servershare for build packed collision tool
 # Need aishare for build wmap tool

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

@@ -4821,9 +4821,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
-			if( itemPtr != NULL )
+			if ( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
+				if ( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem += itemPtr->getStackSize();
 				}
@@ -4841,9 +4841,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
-			if( itemPtr != NULL )
+			if ( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
+				if ( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem -= inventory->deleteStackItem(i, quantity);
 					if(numberItem == 0)
@@ -5053,6 +5053,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 			CSheetId creatureSheetId(command_args[2]);
 			CCreature *creature = CreatureManager.getCreature(target);
+
 			if (creature == NULL || creatureSheetId == CSheetId::Unknown || creatureSheetId != creature->getType())
 			{
 				if (send_url)
@@ -5686,7 +5687,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			{
 
 				CEntityBase *entityBase = PlayerManager.getCharacterByName (CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), value));
-				if (entityBase == 0)
+				if (entityBase == NULL)
 				{
 					// try to find the bot name
 					vector<TAIAlias> aliases;
@@ -5711,7 +5712,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 					}
 
 				}
-				if (entityBase != 0)
+				if (entityBase != NULL)
 				{
 					x = entityBase->getState().X + sint32 (cos (entityBase->getState ().Heading) * 2000);
 					y = entityBase->getState().Y + sint32 (sin (entityBase->getState ().Heading) * 2000);

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

@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -3129,7 +3144,6 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
 	nlassert(node != NULL);
 	_NAME = node;
 
-
 	// branch init
 	
 }

code/ryzom/server/src/entities_game_service/database_plr.h

@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef INCLUDED_DATABASE_PLR_H
@@ -941,8 +956,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setIS_INVISIBLE(CCDBSynchronised &dbGroup, bool value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _IS_INVISIBLE, value, forceSending);
 		}
 
@@ -1300,6 +1313,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _DODGE;
 		}
+
 		TBRICK_TICK_RANGE &getBRICK_TICK_RANGE()
 		{
 			return _BRICK_TICK_RANGE;
@@ -3457,8 +3471,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -4560,8 +4572,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -4577,10 +4587,8 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _MONEY;
 		}
-	
 	};
 
-
 	private:
 		ICDBStructNode	*_BranchNode;
 
@@ -4602,11 +4610,8 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 			return _BranchNode;
 		}
 
-		
 		void setMONEY(CCDBSynchronised &dbGroup, uint64 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY, value, forceSending);
 		}
 
@@ -6000,8 +6005,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 	
 		void setMONEY_SHEET(CCDBSynchronised &dbGroup, NLMISC::CSheetId value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _MONEY_SHEET, value, forceSending);
 		}
 
@@ -8859,7 +8862,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		ICDBStructNode	*_DESPAWN;
 		ICDBStructNode	*_NAME;
 
-
 	public:
 		void init(ICDBStructNode *parent, uint index);
 
@@ -9050,8 +9052,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 
 		void setNAME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
 		{
-			
-
 			_setProp(dbGroup, _NAME, value, forceSending);
 		}
 
@@ -9067,7 +9067,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _NAME;
 		}
-	
 	};
 		
 

code/ryzom/server/src/entities_game_service/guild_manager/guild_member_module.cpp

@@ -559,7 +559,8 @@ void CGuildMemberModule::kickMember( uint16 index,uint8 session )const
 	}
 	// if the user is online reset its guild id
 	CGuildMemberModule * module = NULL;
-	if ( member->getReferencingModule( module ) )
+
+	if (member->getReferencingModule(module))
 	{
 		module->clearOnlineGuildProperties();
 	}

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

@@ -236,6 +236,7 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			MISLOG("user:%s cbClientGroupAbandonMission : Invalid team", userId.toString().c_str());
 			return;
 		}
+
 		if ( team->getLeader() != userId )
 		{
 			CCharacter::sendDynamicSystemMessage( user->getEntityRowId(), "REQ_LEADER_TO_ABANDON_MISSION" );

code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp

@@ -1074,8 +1074,8 @@ class CMissionActionRecvNamedItem : public IMissionAction
 							break;
 						}
 					}
-					
 				}
+
 				if( fail )
 				{
 					CMissionTemplate * templ = CMissionManager::getInstance()->getTemplate( instance->getTemplateId() );
@@ -1274,7 +1274,6 @@ class CMissionActionDestroyItem :
 		// If the "guild" parameter is not set, we destroy the items for the users
 		if (!_Guild)
 		{
-
 			for ( uint i = 0; i < entities.size(); i++ )
 			{
 				CCharacter * user = PlayerManager.getChar( entities[i] );
@@ -1303,7 +1302,6 @@ class CMissionActionDestroyItem :
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_DESTROY_ITEM", params);
 				}
 			}
-
 		}
 		// We destroy the item in the guild
 		else
@@ -1909,7 +1907,6 @@ class CMissionActionRecvMoney : public IMissionAction
 		// If the guild parameter is not set we just divide the money and give it to each entity
 		if (!_Guild)
 		{
-
 			uint amount = _Amount / (uint)entities.size();
 			if ( amount == 0 || _Amount % entities.size() )
 				amount++;
@@ -1924,7 +1921,6 @@ class CMissionActionRecvMoney : public IMissionAction
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_RECV_MONEY",params);
 				}
 			}
-
 		}
 		// Else we give the money to the guild
 		else
@@ -2026,7 +2022,6 @@ class CMissionActionRecvFame : public IMissionAction
 		// If there is no "guild" parameter we give the fame to every user
 		if (!_Guild)
 		{
-
 			for ( uint i = 0; i < entities.size(); i++ )
 			{
 				CEntityId eid = TheDataset.getEntityId(entities[i]);
@@ -2037,12 +2032,10 @@ class CMissionActionRecvFame : public IMissionAction
 				if (character)
 					character->sendEventForMissionAvailabilityCheck();
 			}
-
 		}
 		// Else we just give it to the guild
 		else
 		{
-
 			if (entities.size() == 0)
 				return;
 
@@ -2072,7 +2065,6 @@ class CMissionActionRecvFame : public IMissionAction
 				if (character)
 					character->sendEventForMissionAvailabilityCheck();
 			}
-
 		}
 
 	};

code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp

@@ -170,7 +170,6 @@ uint32 IMissionStepTemplate::sendStepText(CCharacter * user,const std::vector<ui
 			params = _AdditionalParams;
 			textPtr = &_OverridenText;
 		}
-
 	}
 
 	if( !textPtr )

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

@@ -653,6 +653,8 @@ void CCharacterVersionAdapter::adaptToVersion11(CCharacter &character) const
 			mission = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName( "ZORAI_NEWB_WELCOME_SHENG_WO_1" );
 			CAIAliasTranslator::getInstance()->getNPCAliasesFromName("welcomer_sheng_wo_1", bots);
 			break;
+		default:
+			break;
 		}
 	}
 	// other give him a rite intro mission

code/ryzom/server/src/input_output_service/chat_manager.cpp

@@ -151,9 +151,11 @@ bool CChatManager::checkClient( const TDataSetRow& id )
 void CChatManager::addClient( const TDataSetRow& id )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: addClient : adding client %s:%x into chat manager and universe group.",
 			TheDataset.getEntityId(id).toString().c_str(),
 			id.getIndex());
+	}
 
 	if(id.getIndex() == 0xffffff)
 	{
@@ -197,10 +199,11 @@ void CChatManager::addClient( const TDataSetRow& id )
 void CChatManager::removeClient( const TDataSetRow& id )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: removeClient : removing the client %s:%x from chat manager !",
 			TheDataset.getEntityId(id).toString().c_str(),
 			id.getIndex());
-
+	}
 
 	TClientInfoCont::iterator itCl = _Clients.find( id );
 	if( itCl != _Clients.end() )
@@ -302,8 +305,10 @@ void CChatManager::addGroup( TGroupId gId, CChatGroup::TGroupType gType, const s
 void CChatManager::removeGroup( TGroupId gId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: removeGroup : removing group %s",
 			gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -338,10 +343,12 @@ void CChatManager::removeGroup( TGroupId gId )
 void CChatManager::addToGroup( TGroupId gId, const TDataSetRow &charId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: addtoGroup : adding player %s:%x to group %s",
 		TheDataset.getEntityId(charId).toString().c_str(),
 		charId.getIndex(),
 		gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -396,10 +403,12 @@ void CChatManager::addToGroup( TGroupId gId, const TDataSetRow &charId )
 void CChatManager::removeFromGroup( TGroupId gId, const TDataSetRow &charId )
 {
 	if (VerboseChatManagement)
+	{
 		nldebug("IOSCM: removeFromGroup : removing player %s:%x from group %s",
 			TheDataset.getEntityId(charId).toString().c_str(),
 			charId.getIndex(),
 			gId.toString().c_str());
+	}
 
 	map< TGroupId, CChatGroup >::iterator itGrp = _Groups.find( gId );
 	if( itGrp != _Groups.end() )
@@ -599,7 +608,7 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 //					}
 //				}
 
-				TGroupId grpId = CEntityId(RYZOMID::chatGroup,0);
+				TGroupId grpId = CEntityId(RYZOMID::chatGroup, 0);
 
 				_Log.displayNL("'%s' (%s) : \t\"%s\"", senderName.c_str(), groupNames[itCl->second->getChatMode()], ucstr.toString().c_str() );
 				_DestUsers.push_back(grpId);

code/ryzom/server/src/shard_unifier_service/nel_database_mapping.cpp

@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -303,7 +318,7 @@ namespace RSMGR
 		}
 		else if (cmd == NOPE::cc_instance_count)
 		{
-			return _ObjectCache.size();
+			return (uint32)_ObjectCache.size();
 		}
 
 		// default return value
@@ -321,7 +336,7 @@ namespace RSMGR
 		TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
 		for (; first != last; ++first)
 		{
-			nbReleased += first->second.size();
+			nbReleased += (uint32)first->second.size();
 		}
 
 		nlinfo("	There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);
@@ -781,7 +796,7 @@ namespace RSMGR
 		}
 		else if (cmd == NOPE::cc_instance_count)
 		{
-			return _ObjectCache.size();
+			return (uint32)_ObjectCache.size();
 		}
 
 		// default return value
@@ -799,7 +814,7 @@ namespace RSMGR
 		TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
 		for (; first != last; ++first)
 		{
-			nbReleased += first->second.size();
+			nbReleased += (uint32)first->second.size();
 		}
 
 		nlinfo("	There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);

code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h

@@ -1,3 +1,18 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
@@ -661,7 +676,6 @@ namespace RSMGR
 					setPersistentState(NOPE::os_dirty);
 
 				_DomainId = value;
-
 			}
 
 		}

code/ryzom/tools/client/CMakeLists.txt

@@ -1,10 +1,9 @@
-
 IF(WITH_RYZOM_CLIENT)
-  ADD_SUBDIRECTORY( client_patcher )
+  ADD_SUBDIRECTORY(client_patcher)
 
-  IF( WITH_QT )
+  IF(WITH_QT)
-    ADD_SUBDIRECTORY( client_config_qt )
+    ADD_SUBDIRECTORY(client_config_qt)
-  ENDIF( WITH_QT )
+  ENDIF()
-ENDIF(WITH_RYZOM_CLIENT)
+ENDIF()
 
-ADD_SUBDIRECTORY( r2_islands_textures )
+ADD_SUBDIRECTORY(r2_islands_textures)

code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp

@@ -1540,7 +1540,6 @@ void CScreenshotIslands::buildIslandsTextures()
 							CIFile proxFS(proxFileName.c_str());
 							proxBitmap.load(proxFS);
 
-							
 							// resize proximity bitmap
 							CBitmap tempBitmap;
 							int newWidth = islandBitmap.getWidth();

code/ryzom/tools/leveldesign/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 ADD_SUBDIRECTORY(uni_conv)
 ADD_SUBDIRECTORY(csv_transform)
 ADD_SUBDIRECTORY(icon_search)

code/ryzom/tools/server/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 IF(WITH_LIGO)
   ADD_SUBDIRECTORY(ai_build_wmap)
 ENDIF(WITH_LIGO)