Ticket #1163: 1163.5.diff
File 1163.5.diff, 2.9 KB (added by , 9 years ago) |
---|
-
source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 48 48 #include "simulation2/components/ICmpSelectable.h" 49 49 #include "simulation2/components/ICmpTemplateManager.h" 50 50 #include "simulation2/components/ICmpVisual.h" 51 #include "simulation2/components/ICmpObstruction.h" 51 52 #include "simulation2/helpers/Selection.h" 52 53 #include "ps/XML/XMLWriter.h" 53 54 … … 61 62 } 62 63 } 63 64 65 // Helpers for object constraints 66 bool CanPlaceObjectEntityHelper(entity_id_t ent) 67 { 68 CmpPtr<ICmpObstruction> cmpObstruction(*g_Game->GetSimulation2(), ent); 69 if (cmpObstruction) 70 { 71 ICmpObstruction::EFoundationCheck result = cmpObstruction->CheckFoundation("default"); 72 if (result != ICmpObstruction::FOUNDATION_CHECK_SUCCESS) 73 return false; 74 } 75 return true; 76 } 77 78 void CheckObstructionAndUpdateVisual(entity_id_t id) 79 { 80 // Check build Constraint 81 CmpPtr<ICmpVisual> cmpVisual(*g_Game->GetSimulation2(), id); 82 if (cmpVisual) 83 { 84 if (!CanPlaceObjectEntityHelper(id)) 85 cmpVisual->SetShadingColour(fixed::FromDouble(1.4), fixed::FromDouble(0.4), fixed::FromDouble(0.4), fixed::FromDouble(1)); 86 else 87 cmpVisual->SetShadingColour(fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1)); 88 } 89 } 90 64 91 QUERYHANDLER(GetObjectsList) 65 92 { 66 93 std::vector<sObjectsListItem> objects; … … 473 500 posFinal = posFixed + dir; 474 501 } 475 502 cmpPosition->JumpTo(posFinal.X, posFinal.Z); 503 504 // Check build Constraint 505 CheckObstructionAndUpdateVisual(id); 476 506 } 477 507 } 478 508 … … 543 573 CmpPtr<ICmpOwnership> cmpOwnership(*g_Game->GetSimulation2(), g_PreviewEntityID); 544 574 if (cmpOwnership) 545 575 cmpOwnership->SetOwner((player_id_t)msg->settings->player); 576 577 // Check build Constraint 578 CheckObstructionAndUpdateVisual(g_PreviewEntityID); 546 579 } 547 580 } 548 581 … … 599 632 if (cmpVisual) 600 633 { 601 634 cmpVisual->SetActorSeed(m_ActorSeed); 635 CheckObstructionAndUpdateVisual(m_EntityID); 602 636 // TODO: variation/selection strings 603 637 } 604 638 } … … 736 770 ObjectPositionMap::iterator it; 737 771 for (it = map.begin(); it != map.end(); ++it) 738 772 { 739 CmpPtr<ICmpPosition> cmpPosition(*g_Game->GetSimulation2(), (entity_id_t)it->first); 773 entity_id_t id = (entity_id_t)it->first; 774 CmpPtr<ICmpPosition> cmpPosition(*g_Game->GetSimulation2(), id); 740 775 if (!cmpPosition) 741 776 return; 742 777 … … 743 778 // Set 2D position, ignoring height 744 779 CVector3D pos = it->second; 745 780 cmpPosition->JumpTo(entity_pos_t::FromFloat(pos.X), entity_pos_t::FromFloat(pos.Z)); 781 782 // Check build Constraint 783 CheckObstructionAndUpdateVisual(id); 746 784 } 747 785 }