From 649cb7ee7b207eaaab3e128d09f6a523e328a1c1 Mon Sep 17 00:00:00 2001
From: vts <vts@wildfiregames.com>
Date: Sat, 3 Mar 2012 21:42:23 +0000
Subject: [PATCH] Added PickFriendlyEntitiesOnScreen function to the JS side
 for #1187.

This was SVN commit r11230.
---
 source/gui/scripting/ScriptFunctions.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp
index 473eca0417..88f96c052c 100644
--- a/source/gui/scripting/ScriptFunctions.cpp
+++ b/source/gui/scripting/ScriptFunctions.cpp
@@ -136,6 +136,11 @@ std::vector<entity_id_t> PickFriendlyEntitiesInRect(void* UNUSED(cbdata), int x0
 	return EntitySelection::PickEntitiesInRect(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), x0, y0, x1, y1, player, false);
 }
 
+std::vector<entity_id_t> PickFriendlyEntitiesOnScreen(void* cbdata, int player)
+{
+	return PickFriendlyEntitiesInRect(cbdata, 0, 0, g_xres, g_yres, player);
+}
+
 std::vector<entity_id_t> PickSimilarFriendlyEntities(void* UNUSED(cbdata), std::string templateName, bool includeOffScreen, bool matchRank)
 {
 	return EntitySelection::PickSimilarEntities(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), templateName, g_Game->GetPlayerID(), includeOffScreen, matchRank, false);
@@ -564,6 +569,7 @@ void GuiScriptingInit(ScriptInterface& scriptInterface)
 	// Entity picking
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, int, &PickEntitiesAtPoint>("PickEntitiesAtPoint");
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, int, int, int, int, &PickFriendlyEntitiesInRect>("PickFriendlyEntitiesInRect");
+	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, &PickFriendlyEntitiesOnScreen>("PickFriendlyEntitiesOnScreen");
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, std::string, bool, bool, &PickSimilarFriendlyEntities>("PickSimilarFriendlyEntities");
 	scriptInterface.RegisterFunction<CFixedVector3D, int, int, &GetTerrainAtPoint>("GetTerrainAtPoint");