Merge branch 'atys' into develop-atys

ryzom/client/src/interface_v3/group_map.cpp

@@ -2751,6 +2751,8 @@ CGroupMap::CLandMarkButton *CGroupMap::createArkPointButton(const CArkPoint &poi
 	lmb->setParamsOnLeftClick(point.LeftClickParam);
 	lmb->setActionOnRightClick(point.RightClickAction);
 	lmb->setParamsOnRightClick(point.RightClickParam);
+	lmb->setActionOnOver(point.OverClickAction);
+	lmb->setParamsOnOver(point.OverClickParam);
 	lmb->setColor(point.Color);
 	lmb->setColorOver(point.Color);
 	lmb->setColorPushed(point.Color);

ryzom/client/src/interface_v3/group_map.h

@@ -95,6 +95,8 @@ public:
 	std::string			LeftClickParam;
 	std::string			RightClickAction;
 	std::string			RightClickParam;
+	std::string			OverClickAction;
+	std::string			OverClickParam;
 
 public:
 	CArkPoint()

ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp

@@ -4341,7 +4341,7 @@ int CLuaIHMRyzom::addLandMark(CLuaState &ls)
 {
 	const char* funcName = "addLandMark";
 	CLuaIHM::checkArgMin(ls, funcName, 4);
-	CLuaIHM::checkArgMax(ls, funcName, 9);
+	CLuaIHM::checkArgMax(ls, funcName, 11);
 	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER); // x
 	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TNUMBER); // y
 	CLuaIHM::checkArgType(ls, funcName, 3, LUA_TSTRING); // title
@@ -4350,6 +4350,9 @@ int CLuaIHMRyzom::addLandMark(CLuaState &ls)
 	CLuaIHM::checkArgType(ls, funcName, 6, LUA_TSTRING); // left click param
 	CLuaIHM::checkArgType(ls, funcName, 7, LUA_TSTRING); // right click action
 	CLuaIHM::checkArgType(ls, funcName, 8, LUA_TSTRING); // right click params
+	CLuaIHM::checkArgType(ls, funcName, 9, LUA_TSTRING); // over click action
+	CLuaIHM::checkArgType(ls, funcName, 10, LUA_TSTRING); // over click params
+	// 11 : Color
 
 	CArkPoint point;
 	point.x = (sint32)(ls.toNumber(1)*1000.f);
@@ -4360,10 +4363,12 @@ int CLuaIHMRyzom::addLandMark(CLuaState &ls)
 	point.LeftClickParam = ls.toString(6);
 	point.RightClickAction = ls.toString(7);
 	point.RightClickParam = ls.toString(8);
+	point.OverClickAction = ls.toString(9);
+	point.OverClickParam = ls.toString(10);
 
 	point.Color = CRGBA(255,255,255,255);
 
-	if (ls.getTop() >= 9)
+	if (ls.getTop() >= 11)
 		CLuaIHM::pop(ls, point.Color);
 
 	CGroupMap *pMap = dynamic_cast<CGroupMap*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:actual_map"));

ryzom/client/src/interface_v3/lua_ihm_ryzom.h

@@ -234,6 +234,7 @@ private:
 	static bool	isDynStringAvailable(sint32 dynStringId);
 	static bool	isFullyPatched();
 	static std::string getSheetType(const std::string &sheet);
+	static std::string getSheetShape(const std::string &sheet);
 	static std::string getSheetFamily(const std::string &sheet);
 	static std::string getSheetName(uint32 sheetId);
 	static sint32 getFameIndex(const std::string &factionName);