Junk

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

@@ -42,7 +42,6 @@ extern bool					Render;
 extern bool					WantProfiling;			// Do we want a CPU profile?
 extern bool					WantProfilingVBLock;			// Do we want a VBLock profile?
 extern bool					PACSBorders;
-extern bool					ARKPACSBorders;
 extern bool					DebugClusters;
 extern bool					SoundBox;
 extern uint8				ShowInfos;
@@ -93,21 +92,6 @@ REGISTER_ACTION_HANDLER (CAHDisplayInfos, "display_infos");
 *																										  *
 ***********************************************************************************************************/
 
-// ------------------------------------------------------------------------------------------------
-class CAHToggleARKPACSBorders : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
-	{
-		if (!getParam(Params, "on").empty())
-			ARKPACSBorders = true;
-		else if (!getParam(Params, "off").empty())
-			ARKPACSBorders = false;
-		else ARKPACSBorders = !ARKPACSBorders;
-
-	}
-};
-REGISTER_ACTION_HANDLER (CAHToggleARKPACSBorders, "ark_pacs_borders");
-
 #if !FINAL_VERSION
 // ------------------------------------------------------------------------------------------------
 class CAHProfile : public IActionHandler

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

@@ -4010,33 +4010,11 @@ class CAHWorldMapRightClick : public IActionHandler
 
 		if (gm->isIsland())
 		{
-			if (gm->getArkPowoMode() == "editor")
-				menu = gm->getArkPowoMapMenu();
-			else
 			menu = "ui:interface:map_menu_island";
 		}
 		else
 		{
-<<<<<<< HEAD
 			CAHManager::getInstance()->runActionHandler("active_menu", pCaller, "menu=ui:interface:map_menu_island");
-=======
-			if (menu.empty())
-				menu = "ui:interface:map_menu";
-
-			// update menu with closest landmarks
-			NLMISC::CVector2f pos(NLMISC::CVector2f::Null);
-			CCtrlButton *button = dynamic_cast<CCtrlButton *>(pCaller);
-			if (button)
-				gm->getLandmarkPosition(button, pos);
-
-			if(pos == NLMISC::CVector2f::Null)
-			{
-				pos = gm->getRightClickLastPos();
-				gm->mapToWorld(pos, pos);
-			}
-
-			gm->updateClosestLandMarkMenu(menu, pos);
->>>>>>> origin/develop
 		}
 
 		CAHManager::getInstance()->runActionHandler("active_menu", pCaller, "menu=" + menu);

code/ryzom/client/src/main_loop.cpp

@@ -275,7 +275,6 @@ CTimedFXManager::TDebugDisplayMode	ShowTimedFXMode = CTimedFXManager::NoText;
 
 // DEBUG
 bool				PACSBorders = false;
-bool				ARKPACSBorders = false;
 bool				DebugClusters = false;
 CVector				LastDebugClusterCameraThirdPersonStart= CVector::Null;
 CVector				LastDebugClusterCameraThirdPersonEnd= CVector::Null;
@@ -1800,12 +1799,6 @@ bool mainLoop()
 						displayPACSPrimitive();
 					}
 
-					// Display PACS borders only (for ARK).
-					if (ARKPACSBorders)
-					{
-						displayPACSPrimitive();
-					}
-
 					// display Sound box
 					if (SoundBox)
 					{

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

@@ -560,11 +560,6 @@ NLMISC_COMMAND(addMission,"Add mission to character","<character_id> <Mission gi
 	return true;
 }
 
-
-
-/// Commands used by ARK
-
-
 CInventoryPtr getInventory(CCharacter *c, const string &inv)
 {
 	CInventoryPtr inventoryPtr = NULL;