merge

code/nel/src/3d/driver/opengl/driver_opengl_states.cpp

@@ -179,12 +179,8 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	// Cull order
 	_CullMode = CCW;
 	glCullFace(GL_BACK);
-
-
 }
 
-
-
 // ***************************************************************************
 void			CDriverGLStates::enableBlend(uint enable)
 {

code/nel/src/3d/driver/opengl/unix_event_emitter.cpp

@@ -178,10 +178,37 @@ TKey getKeyFromKeycode (uint keycode)
 	case 0x31: return KeyAPOSTROPHE;
 	case 0x33: return KeyBACKSLASH;
 	case 0x5e: return KeyOEM_102;
-	case 0x3a: return KeyCOMMA;
+//	case 0x3a: return KeyCOMMA;
 	case 0x3b: return KeyPERIOD;
 	case 0x3c: return KeySLASH;
 	case 0x3d: return KeyPARAGRAPH;
+	// for non-standard keyboards, maps to QWERTY keys
+	case 0x18: return KeyQ;
+	case 0x19: return KeyW;
+	case 0x1a: return KeyE;
+	case 0x1b: return KeyR;
+	case 0x1c: return KeyT;
+	case 0x1d: return KeyY;
+	case 0x1e: return KeyU;
+	case 0x1f: return KeyI;
+	case 0x20: return KeyO;
+	case 0x21: return KeyP;
+	case 0x26: return KeyQ;
+	case 0x27: return KeyS;
+	case 0x28: return KeyD;
+	case 0x29: return KeyF;
+	case 0x2a: return KeyG;
+	case 0x2b: return KeyH;
+	case 0x2c: return KeyJ;
+	case 0x2d: return KeyK;
+	case 0x2e: return KeyL;
+	case 0x34: return KeyZ;
+	case 0x35: return KeyX;
+	case 0x36: return KeyC;
+	case 0x37: return KeyV;
+	case 0x38: return KeyB;
+	case 0x39: return KeyN;
+	case 0x3a: return KeyM;
 #endif
 	default:
 //	nlwarning("missing keycode 0x%x %d '%c'", keycode, keycode, keycode);

code/nel/src/misc/displayer.cpp

@@ -230,7 +230,7 @@ void CStdDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mess
 			printf ("%s", str.c_str());
 
 		if (!args.CallstackAndLog.empty())
-			printf (args.CallstackAndLog.c_str());
+			printf ("%s", args.CallstackAndLog.c_str());
 
 		fflush(stdout);
 	}

code/ryzom/client/src/CMakeLists.txt

@@ -44,22 +44,22 @@ if(APPLE)
   SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
   SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
 
-  ADD_EXECUTABLE(client MACOSX_BUNDLE ${SRC})
+  ADD_EXECUTABLE(ryzom_client MACOSX_BUNDLE ${SRC})
 
   # TODO: in release mode, cmake could copy all the dylibs into the .app
   # bundle for redistribution... should some part of cpack handle that?
-  # ADD_CUSTOM_COMMAND(TARGET client POST_BUILD
+  # ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD
   #   # make frameworks directory in app bundle
   #   COMMAND ${CMAKE_COMMAND} -E make_directory
-  #     ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks
+  #     ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks
   #   # copy framework into app bundle
   #   COMMAND ${CMAKE_COMMAND} -E copy ${SOME_LIBRARY} 
-  #     ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks
+  #     ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks
   #   # ...
   #   # install_name_tool the lib pathes
 
 ELSE(APPLE)
-  ADD_EXECUTABLE(client ${SRC})
+  ADD_EXECUTABLE(ryzom_client ${SRC})
 ENDIF(APPLE)
 
 INCLUDE_DIRECTORIES(
@@ -70,10 +70,10 @@ INCLUDE_DIRECTORIES(
 			${CURL_INCLUDE_DIRS} 
 			${CMAKE_CURRENT_SOURCE_DIR})
 
-TARGET_LINK_LIBRARIES(client 	${PLATFORM_LINKFLAGS} 
+TARGET_LINK_LIBRARIES(ryzom_client 	${PLATFORM_LINKFLAGS} 
 				${LIBXML2_LIBRARIES} 
 				${NELMISC_LIBRARY} 
-				game_share 
+				ryzom_gameshare 
 				${NELNET_LIBRARY} 
 				${NELLIGO_LIBRARY} 
 				${NELGEORGES_LIBRARY} 
@@ -82,18 +82,17 @@ TARGET_LINK_LIBRARIES(client 	${PLATFORM_LINKFLAGS}
 				${CURL_LIBRARIES} 
 				${NELSOUND_LIBRARY} 
 				${NELSNDDRV_LIBRARY}
-				client_sheets 
+				ryzom_clientsheets 
 				${NELPACS_LIBRARY} 
 				${LIBWWW_LIBRARY} 
-				${Boost_LIBRARIES} 
+				ryzom_sevenzip
-				seven_zip
 				luabind # TODO: find luabind and expat cleanly using a find script
 				expat)
 				
 IF(NOT WITH_COCOA)
-	TARGET_LINK_LIBRARIES(client ${X11_LIBRARIES})
+	TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
 ENDIF(NOT WITH_COCOA)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications)
+INSTALL(TARGETS ryzom_client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications)

code/ryzom/client/src/character_cl.cpp

@@ -2291,6 +2291,8 @@ void CCharacterCL::endAnimTransition()
 			dir(front());
 			*/
 			break;
+		default:
+			break;
 		}
 		// Change the current mode.
 		if ( _ModeWanted != MBEHAV::UNKNOWN_MODE )
@@ -2658,6 +2660,8 @@ KeyChosen:
 		else
 			nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnMoveRight '%s' is not valid.",    _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnMoveRight).c_str());
 		break;
+	default:
+		break;
 	}
 
 	// On Rotation/About Face
@@ -2684,6 +2688,8 @@ KeyChosen:
 		else
 			nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnRightRotation '%s' is not valid.",    _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnRightRotation).c_str());
 		break;
+	default:
+		break;
 	}
 
 	// Max Loop
@@ -2729,6 +2735,8 @@ KeyChosen:
 		else
 			nlwarning("CH::setAnim:%d: automaton '%s': state '%s': OnBigBendRight '%s' is not valid.",    _Slot, _CurrentAutomaton.c_str(), CAnimationState::getAnimationStateName(curAnimState.MoveState).c_str(), CAnimationState::getAnimationStateName(curAnimState.OnBigBendRight).c_str());
 		break;
+	default:
+		break;
 	}
 
 	// If the animation change according to a high speed and speed high enough or oo.
@@ -3084,6 +3092,7 @@ KeyChosen:
 								case MAGICFX::CastLoop:  afs = &_CurrentAttack->AttackLoopFX; break;
 								case MAGICFX::CastEnd:   afs = &_CurrentAttack->AttackEndFX; break;
 								case MAGICFX::CastFail:  afs = &_CurrentAttack->AttackFailFX; break;
+								default: break;
 							}
 							playCastFX(afs, _CurrentAttackInfo.Intensity);
 						}
@@ -3444,6 +3453,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
 		case OnMoveRight:
 			setAnim(_CurrentState->OnMoveRight);
 			return;
+		default:
+			break;
 		}
 
 		// ON ROTATION
@@ -3458,6 +3469,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
 		case OnRotRight:
 			setAnim(CAnimationStateSheet::Idle);
 			return;
+		default:
+			break;
 		}
 
 		// ON BAD HEADING
@@ -3475,6 +3488,8 @@ ADD_METHOD(void CCharacterCL::updateAnimationState())
 		case OnBendRight:
 			setAnim(_CurrentState->MoveState);
 			return;
+		default:
+			break;
 		}
 
 		// \todo GUIGUI : changer de place cette partie je pense.
@@ -3640,6 +3655,8 @@ void CCharacterCL::beginCast(const MBEHAV::CBehaviour &behaviour)
 	case MBEHAV::CAST_STUN:
 		setAnim(CAnimationStateSheet::StunCastInit);
 		break;
+	default:
+		break;
 	}
 }// beginCast //
 
@@ -3746,6 +3763,8 @@ void CCharacterCL::endCast(const MBEHAV::CBehaviour &behaviour, const MBEHAV::CB
 				case MBEHAV::CAST_MIX_LINK:
 					setAnim(CAnimationStateSheet::MixedCastLink);
 					break;
+				default:
+					break;
 				}
 			}
 			break;
@@ -4443,9 +4462,10 @@ bool CCharacterCL::isCurrentBehaviourAttackEnd() const
 		case MBEHAV::POWERFUL_ATTACK:
 		case MBEHAV::AREA_ATTACK:
 			return true;
-	}
+		default:
 			return false;
 	}
+}
 
 
 // ***************************************************************************
@@ -4627,6 +4647,8 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc)	// virtual
 			case RANGE_ATTACK:
 				combatAnimState= CAnimationStateSheet::Attack1;
 				break;
+			default:
+				break;
 			}
 		}
 	}
@@ -9151,6 +9173,8 @@ void CCharacterCL::CWornItem::startAttackFX(NL3D::USkeleton skeleton, uint inten
 						else
 							stickPoint = "box_arme_gauche";
 					break;
+					default:
+					break;
 				}
 			}
 			if (stickPoint)

code/ryzom/client/src/client_sheets/CMakeLists.txt

@@ -5,26 +5,23 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H})
 
 
 IF(NOT WIN32)
-  ADD_LIBRARY(client_sheets SHARED ${SRC})
+  ADD_LIBRARY(ryzom_clientsheets SHARED ${SRC})
 ELSE(NOT WIN32)
-  ADD_LIBRARY(client_sheets STATIC ${SRC})
+  ADD_LIBRARY(ryzom_clientsheets STATIC ${SRC})
 ENDIF(NOT WIN32)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(client_sheets game_share ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare ${NELMISC_LIBRARY})
-SET_TARGET_PROPERTIES(client_sheets PROPERTIES VERSION ${NL_VERSION})
+SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(client_sheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h")
+  SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h")
   SET_SOURCE_FILES_PROPERTIES(stdpch.cpp PROPERTIES COMPILE_FLAGS "/Ycstdpch.h")
-  SET_TARGET_PROPERTIES(client_sheets
+  SET_TARGET_PROPERTIES(ryzom_clientsheets
 		PROJECT_LABEL "Library: Client Sheets"
 		DEBUG_POSTFIX "_d"
 		RELEASE_POSTFIX "_r"
-		LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
+		LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt"
-		LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
 ENDIF(WIN32)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
-
-INSTALL(TARGETS client_sheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

code/ryzom/client/src/continent_manager.cpp

@@ -397,6 +397,7 @@ void CContinentManager::select(const CVectorD &pos, NLMISC::IProgressCallback &p
 		CContinent *pCont = it->second;
 		nlinfo("Looking into %s", pCont->SheetName.c_str());
 		if (pCont->Zone.VPoints.size() > 0) // Patch because some continent have not been done yet
+		{
 			if (pCont->Zone.contains(fPos))
 			{
 				// load the continent selected.
@@ -414,6 +415,7 @@ void CContinentManager::select(const CVectorD &pos, NLMISC::IProgressCallback &p
 				}
 				*/
 			}
+		}
 		it++;
 	}
 

code/ryzom/client/src/entity_cl.h

@@ -233,7 +233,7 @@ public:
 	void sheetId(const NLMISC::CSheetId &id) {_SheetId = id;}
 
 	/// Return the persistent NPC alias of entity (0 if N/A).
-	const uint32 npcAlias() const {return _NPCAlias; }
+	uint32 npcAlias() const {return _NPCAlias; }
 	/// Set the persistent NPC alias of the entity.	
 	void npcAlias(uint32 alias) {_NPCAlias = alias; }
 
@@ -411,7 +411,7 @@ public:
 
 
 	/// Return the entity current behaviour.
-	const MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
+	MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
 
 	/**
 	 * Show or Hide the entity.

code/ryzom/client/src/init.cpp

@@ -152,7 +152,7 @@ extern CContinentManager ContinentMngr;
 ucstring				TipsOfTheDay;
 uint					TipsOfTheDayIndex;
 
-// includes pour les register class qui suivent (grrrr !!!!)
+// includes for following register classes
 #include "entities.h"
 #include "character_cl.h"
 #include "player_cl.h"
@@ -578,7 +578,6 @@ void checkDriverDepth ()
 	}
 }
 
-
 void addSearchPaths(IProgressCallback &progress)
 {
 	// Add search path of UI addon. Allow only a subset of files.
@@ -744,7 +743,6 @@ void prelogInit()
 
 		CLoginProgressPostThread::getInstance().init(ClientCfg.ConfigFile);
 
-
 		// tmp for patcher debug
 		extern void tmpFlagMainlandPatchCategories(NLMISC::CConfigFile &cf);
 		extern void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf);
@@ -790,7 +788,6 @@ void prelogInit()
 
 		FPU_CHECKER_ONCE
 
-
 		switch (getCurrentColorDepth())
 		{
 			case 16: CustomMouse.setColorDepth(CCustomMouse::ColorDepth16); break;
@@ -801,7 +798,6 @@ void prelogInit()
 			break;
 		}
 
-
 		// Check driver version
 		checkDriverVersion();
 
@@ -835,8 +831,6 @@ void prelogInit()
 		}
 		Driver = UDriver::createDriver ((uint)LoadIcon (HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON)), direct3D);
 
-
-
 #else // NL_OS_WINDOWS
 		Driver = UDriver::createDriver ();
 #endif // NL_OS_WINDOWS

code/ryzom/client/src/input.cpp

@@ -33,6 +33,7 @@
 // Misc
 #include "nel/misc/mouse_device.h"
 #include "nel/misc/mouse_smoother.h"
+#include "nel/misc/system_utils.h"
 // Game Share
 
 

code/ryzom/client/src/interface_v3/action_handler_item.cpp

@@ -167,7 +167,7 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 // ********************************************************************************************
 void CInterfaceItemEdition::CItemEditionWindow::update()
 {
-	if(_CurrItemSheet && (ItemSheet != _CurrItemSheet->getSheetId()))
+	if(_CurrItemSheet && ((sint32)ItemSheet != _CurrItemSheet->getSheetId()))
 	{
 		end();
 	}

code/ryzom/client/src/interface_v3/chat_filter.h

@@ -81,7 +81,7 @@ private:
 	virtual void chatWindowRemoved(CChatWindow *cw);
 	//
 	// copy not supported
-	CChatInputFilter(const CChatInputFilter &/* other */) { nlassert(0); }
+	CChatInputFilter(const CChatInputFilter &/* other */):NLMISC::CRefCount() { nlassert(0); }
 	CChatInputFilter &operator=(const CChatInputFilter &/* other */) { nlassert(0); return *this; }
 
 };
@@ -157,7 +157,7 @@ private:
 	void chatWindowRemoved(CChatWindow *cw);
 	void msgEntered(const ucstring &msg, CChatWindow *chatWindow);
 	// copy not supported
-	CChatTargetFilter(const CChatTargetFilter &/* other */) { nlassert(0); }
+	CChatTargetFilter(const CChatTargetFilter &/* other */):NLMISC::CRefCount() { nlassert(0); }
 	CChatTargetFilter& operator=(const CChatTargetFilter &/* other */) { nlassert(0); return *this; }
 };
 

code/ryzom/client/src/interface_v3/group_compas.cpp

@@ -230,7 +230,7 @@ void CGroupCompas::draw()
 	//
 	const NLMISC::CVectorD &userPosD = UserEntity->pos();
 	NLMISC::CVector userPos((float) userPosD.x, (float) userPosD.y, (float) userPosD.z);
-	NLMISC::CVector2f targetPos;
+	NLMISC::CVector2f targetPos(0.f, 0.f);
 	// if a position tracker is provided, use it
 	CCompassTarget displayedTarget = _Target;
 
@@ -807,7 +807,7 @@ void CGroupCompasMenu::setActive (bool state)
 				uint nbUserLandMarks = std::min( uint(currCont->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks() );
 				for(k = 0; k < nbUserLandMarks; ++k)
 				{
-					if (currCont->UserLandMarks[k].Type >= 0 && currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount)
+					if (currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount)
 					{
 						CCompassTarget ct;
 						ct.setType(CCompassTarget::UserLandMark);

code/ryzom/client/src/interface_v3/group_map.cpp

@@ -634,6 +634,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 		case EGSPD::CPeople::Matis: loadLandmarkInfo(cur, "home_matis", _HomeLMOptions); break;
 		case EGSPD::CPeople::Zorai: loadLandmarkInfo(cur, "home_zorai", _HomeLMOptions); break;
 		case EGSPD::CPeople::Tryker: loadLandmarkInfo(cur, "home_tryker", _HomeLMOptions); break;
+		default: break;
 	}
 	loadLandmarkInfo(cur, "respawn", _RespawnLMOptions);
 	// animal landmark

code/ryzom/client/src/interface_v3/lua_helper.h

@@ -354,7 +354,7 @@ private:
 
 private:
 	// this object isn't intended to be copied
-	CLuaState(const CLuaState &/* other */) { nlassert(0); }
+	CLuaState(const CLuaState &/* other */):NLMISC::CRefCount() { nlassert(0); }
 	CLuaState &operator=(const CLuaState &/* other */) { nlassert(0); return *this; }
 
 	void				executeScriptInternal(const std::string &code, const std::string &dbgSrc, int numRet = 0);

code/ryzom/client/src/interface_v3/macrocmd_key.cpp

@@ -611,16 +611,19 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 		// Get ith param (params are nameOfParam=argumentOfAction strings separated by |)
 		// except for the last real param (which can then contains | chars) if it is the last param
 
-		if ((curStr.find('|') == string::npos) ||
+		string::size_type pos = curStr.find('|');
-			((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1)))
+
+		if ((pos == string::npos) ||
+			(((noParam == nbRealParam-1) && (rP.Type != CBaseAction::CParameter::Hidden)) && (i == (pBA->Parameters.size()-1))))
 		{
 			sTmp = curStr;
 			curStr = "";
 		}
 		else
 		{
-			sTmp = curStr.substr(0,curStr.find('|'));
+			
-			curStr = curStr.substr(curStr.find('|')+1,curStr.size());
+			sTmp = curStr.substr(0, pos);
+			curStr = curStr.substr(pos+1, curStr.size());
 		}
 
 		// Remove 'name='

code/ryzom/client/src/interface_v3/people_interraction.cpp

@@ -289,13 +289,17 @@ void CChatStdInput::registerListeningWindow(CChatWindow *cw)
 	Universe.addListeningWindow(cw);
 }
 
+
 //===========================================================================================================
-CPeopleInterraction::CPeopleInterraction() : SystemInfo(NULL),
+CPeopleInterraction::CPeopleInterraction() : Region(NULL),
+											 Universe(NULL),
+											 TeamChat(NULL),
 											 GuildChat(NULL),
-											 CurrPartyChatID(0),
+											 SystemInfo(NULL),
 											 TellWindow(NULL),
 											 DebugInfo(NULL),
-											 YuboChat(NULL)
+											 YuboChat(NULL),
+											 CurrPartyChatID(0)
 {
 	for(uint i=0;i<CChatGroup::MaxDynChanPerPlayer;i++)
 	{

code/ryzom/client/src/login_progress_post_thread.cpp

@@ -192,7 +192,7 @@ public:
 					}
 					if (newStep)
 					{
-						if (loginStep.Step == LoginStep_Stop)
+						if (loginStep.Step == (uint)LoginStep_Stop)
 						{
 							break;
 						}

code/ryzom/client/src/misc.cpp

@@ -56,10 +56,6 @@
 #include "nel/georges/u_form_elm.h"
 #include "nel/georges/u_form_loader.h"
 
-#ifndef NL_OS_WINDOWS
-	#include <X11/Xlib.h>
-#endif
-
 ///////////
 // USING //
 ///////////

code/ryzom/client/src/property_decoder.h

@@ -53,7 +53,7 @@ private:
 	class CEntityEntry
 	{
 	public:
-		CEntityEntry() : EntryUsed(false), PosIsRelative(false), AssociationBits(0) {}
+		CEntityEntry() : AssociationBits(0), EntryUsed(false), PosIsRelative(false), PosIsInterior(false) {}
 		CLFECOMMON::TSheetId							Sheet;
 		uint16											AssociationBits;
 		bool											EntryUsed;

code/ryzom/client/src/r2/instance.h

@@ -241,7 +241,7 @@ private:
 	// For editor : Create this object from the CObjectTable it materialize in the editor
 	CInstance(const CObjectTable *objectTable, CLuaState &ls);
 	// copy not supported
-	CInstance(const CInstance &/* other */) { nlassert(0); }
+	CInstance(const CInstance &/* other */):NLMISC::CRefCount() { nlassert(0); }
 	CInstance &operator = (const CInstance &/* other */) { nlassert(0); return *this; }
 	//
 	void executeHandler(const CLuaString &name, int numArgs);

code/ryzom/client/src/rosace.cpp

@@ -245,6 +245,8 @@ void CRosacePage::update(float x, float y, TMode mode)
 	case NbRosaceMode:
 		nlwarning("Rosace Mode reached.");
 		break;
+	default:
+		break;
 	}
 }// update //
 

code/ryzom/client/src/seven_zip/CMakeLists.txt

@@ -6,21 +6,28 @@ LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
 
 ADD_EXECUTABLE(7zDec ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY})
 
-ADD_LIBRARY(seven_zip STATIC ${LIB_SRC})
+IF(NOT WIN32)
-TARGET_LINK_LIBRARIES(seven_zip ${PLATFORM_LINKFLAGS})
+  ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC})
+ELSE(NOT WIN32)
+  ADD_LIBRARY(ryzom_sevenzip STATIC ${LIB_SRC})
+ENDIF(NOT WIN32)
+
+TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS})
+SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(seven_zip 
 		PROJECT_LABEL "Library: Seven Zip"
 		DEBUG_POSTFIX "_d"
 		RELEASE_POSTFIX "_r"
-		LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
+		LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt"
-		LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
 ENDIF(WIN32)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_SZ_ONE_DIRECTORY)
+ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY)
+
+INSTALL(TARGETS ryzom_sevenzip LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
 
 INSTALL(TARGETS 7zDec RUNTIME DESTINATION bin COMPONENT client)

code/ryzom/common/src/game_share/CMakeLists.txt

@@ -8,16 +8,16 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
 LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
 
 IF(WIN32)
-  ADD_LIBRARY(game_share STATIC ${SRC})
+  ADD_LIBRARY(ryzom_gameshare STATIC ${SRC})
 ELSE(WIN32)
-  ADD_LIBRARY(game_share SHARED ${SRC})
+  ADD_LIBRARY(ryzom_gameshare SHARED ${SRC})
 ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(game_share 
+TARGET_LINK_LIBRARIES(ryzom_gameshare
   ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}
   ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
-SET_TARGET_PROPERTIES(game_share PROPERTIES VERSION ${NL_VERSION})
+SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)
 #  SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
@@ -26,10 +26,10 @@ IF(WIN32)
 		PROJECT_LABEL "Library: Game Share"
 		DEBUG_POSTFIX "_d"
 		RELEASE_POSTFIX "_r"
-		LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
+		LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt")
-		LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
 ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS game_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+INSTALL(TARGETS ryzom_gameshare LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+

code/ryzom/common/src/game_share/bg_downloader_msg.cpp

@@ -24,7 +24,7 @@
 namespace BGDownloader
 {
 
-extern const char *DownloaderMutexName = "RyzomBgDownloader";
+const char *DownloaderMutexName = "RyzomBgDownloader";
 
 ucstring getWrittenSize(uint32 nSize)
 {

code/ryzom/common/src/game_share/crypt.cpp

@@ -403,45 +403,45 @@ static unsigned char PC2[] = {		/* permuted choice table 2 */
 
 static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
 					/* S[1]			*/
-	14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+	{14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
 	  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
 	  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-	15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
+	 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13},
 					/* S[2]			*/
-	15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+	{15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
 	  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
 	  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-	13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
+	 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9},
 					/* S[3]			*/
-	10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+	{10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
 	 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
 	 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-	 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
+	  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12},
 					/* S[4]			*/
-	 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+	{ 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
 	 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
 	 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-	 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
+	  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14},
 					/* S[5]			*/
-	 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+	{ 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
 	 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
 	  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-	11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
+	 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3},
 					/* S[6]			*/
-	12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+	{12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
 	 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
 	  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-	 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
+	  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13},
 					/* S[7]			*/
-	 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+	{ 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
  	 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
 	  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-	 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
+	  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12},
 					/* S[8]			*/
-	13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+	{13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
 	  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
 	  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-	 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
+	  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11}
 };
 
 static unsigned char P32Tr[] = {	/* 32-bit permutation function */

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

@@ -80,7 +80,7 @@ namespace R2
 	public:
 		virtual ~IServerEditionModule(){}
 		virtual void createSessionWithoutSu(uint32 charId, NLMISC::CEntityId clientEid) = 0;
-		virtual TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const = 0;
+		virtual TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const = 0;
 		virtual CScenario* getScenarioById(TSessionId sessionId) const = 0;
 		// getEditing position (use AdminModule::getPosition for having a position in editing and animation mode)
 		virtual	bool getPosition(TSessionId sessionId, double& x, double& y, double& orient, uint8& season, uint32 locationIndex = 0) = 0;

code/ryzom/common/src/game_share/mirror.cpp

@@ -30,12 +30,13 @@ using namespace NLMISC;
 using namespace NLNET;
 using namespace std;
 
-
+#ifdef NL_OS_WINDOWS
 #    ifdef FAST_MIRROR
 #        pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****")
 #    else
 #    	 pragma message(NL_LOC_MSG "Not using FAST_MIRROR")
 #    endif
+#endif // NL_OS_WINDOWS
 
 
 const string MirrorVersion = string("1.10-")+string(ListRowSizeString); // ADDED: Unidirectional Mode (don't wait for delta)
@@ -841,8 +842,10 @@ void				CMirror::releaseTrackers( NLNET::CMessage& msgin )
 	for ( istfar=smidsToFindAndRemove.begin(); istfar!=smidsToFindAndRemove.end(); ++istfar )
 	{
 		if ( (*istfar) != InvalidSMId )
+		{
 			MIRROR_INFO( "MIRROR: Need to remove tracker with smid %d", (*istfar) );
 		}
+	}
 #endif
 
 	// Browse datasets

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

@@ -1208,7 +1208,7 @@ public:
 protected:
 
 	/// Default constructor
-	CMirrorPropValueList() : _PtFront(NULL), _Container(NULL), _PropLocation() {}
+	CMirrorPropValueList() : _Container(NULL), _PtFront(NULL), _PropLocation() {}
 
 	TSharedListRow		allocateNewCell();
 

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

@@ -318,7 +318,7 @@ namespace MBEHAV
 		}
 
 		/// Cons cast into behaviour enum
-		operator const EBehaviour () const
+		operator EBehaviour () const
 		{
 			return (EBehaviour)Behaviour8;
 		}

code/ryzom/common/src/game_share/server_edition_module.cpp

@@ -2572,7 +2572,7 @@ TUserRole CServerEditionModule::getRoleByCharId(TCharId charId) const
 }
 
 
-TPioneersSessionsAllowed * const CServerEditionModule::getSessionAllowedForChar(TCharId charId) const
+TPioneersSessionsAllowed * CServerEditionModule::getSessionAllowedForChar(TCharId charId) const
 {
 	TPioneersSessionsAlloweds::const_iterator found = _PioneersSessionsAllowed.find(charId);
 	if (found == _PioneersSessionsAllowed.end()) return NULL;

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

@@ -474,7 +474,7 @@ namespace R2
 		TUserRole getRoleByCharId(TCharId charId) const;
 
 		// get the session that is about to be joined by a client, or NULL if not found
-		TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const;
+		TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const;
 		// get the scenario use by the user
 
 		CScenario*  getScenarioByCharId(TCharId charId) const;

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

@@ -34,7 +34,7 @@ public:
 	operator std::string() const { return std::string(_Value); }
 	bool operator ! () const { return _Value == NULL; }
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
-	const char operator * ()  const { nlassert(_Value); return *_Value; }
+	char operator * ()  const { nlassert(_Value); return *_Value; }
 	/// NB : This remove previous owned pointer with xmlFree
 	CXMLAutoPtr &operator = (const char *other)
 	{