Advertisement
Guest User

Untitled

a guest
Sep 20th, 2019
95
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.10 KB | None | 0 0
  1. Index: source/simulation2/helpers/Selection.cpp
  2. ===================================================================
  3. --- source/simulation2/helpers/Selection.cpp    (revision 22941)
  4. +++ source/simulation2/helpers/Selection.cpp    (working copy)
  5. @@ -19,11 +19,10 @@
  6.  
  7.  #include "Selection.h"
  8.  
  9.  #include "graphics/Camera.h"
  10.  #include "ps/CLogger.h"
  11. -#include "ps/Profiler2.h"
  12.  #include "simulation2/components/ICmpIdentity.h"
  13.  #include "simulation2/components/ICmpOwnership.h"
  14.  #include "simulation2/components/ICmpRangeManager.h"
  15.  #include "simulation2/components/ICmpTemplateManager.h"
  16.  #include "simulation2/components/ICmpSelectable.h"
  17. Index: source/simulation2/helpers/Selection.h
  18. ===================================================================
  19. --- source/simulation2/helpers/Selection.h  (revision 22941)
  20. +++ source/simulation2/helpers/Selection.h  (working copy)
  21. @@ -16,10 +16,11 @@
  22.   */
  23.  
  24.  #ifndef INCLUDED_SELECTION
  25.  #define INCLUDED_SELECTION
  26.  
  27. +#include "ps/Profiler2.h"
  28.  #include "simulation2/components/ICmpObstruction.h"
  29.  #include "simulation2/helpers/Player.h"
  30.  #include "simulation2/Simulation2.h"
  31.  #include "simulation2/system/Entity.h"
  32.  
  33. Index: source/simulation2/scripting/JSInterface_Simulation.cpp
  34. ===================================================================
  35. --- source/simulation2/scripting/JSInterface_Simulation.cpp (revision 22941)
  36. +++ source/simulation2/scripting/JSInterface_Simulation.cpp (working copy)
  37. @@ -115,11 +115,11 @@ std::vector<entity_id_t> JSI_Simulation:
  38.  std::vector<entity_id_t> JSI_Simulation::PickNonGaiaEntitiesOnScreen(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
  39.  {
  40.     return EntitySelection::PickNonGaiaEntitiesInRect(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), 0, 0, g_xres, g_yres, false);
  41.  }
  42.  
  43. -std::vector<entity_id_t> JSI_Simulation::GetEntitiesWithStaticObstructionOnScreen(ScriptInterface::CxPrivate* pCxPrivate)
  44. +std::vector<entity_id_t> JSI_Simulation::GetEntitiesWithStaticObstructionOnScreen(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
  45.  {
  46.     struct StaticObstructionFilter
  47.     {
  48.         bool operator()(IComponent* cmp)
  49.         {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement