Changeset 2503 for code/branches/presentation
- Timestamp:
- Dec 17, 2008, 10:51:07 AM (16 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation/src/orxonox/objects/pickup/BaseItem.cc
r2500 r2503 3 3 4 4 5 #include "OrxonoxStableHeaders.h" 5 6 #include "BaseItem.h" 6 7 #include "core/CoreIncludes.h" -
code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.cc
r2500 r2503 1 #include "OrxonoxStableHeaders.h" 1 2 #include "PickupSpawner.h" 2 3 #include "BaseItem.h" … … 110 111 SUPER(PickupSpawner, changedActivity); 111 112 112 for (std::set<WorldEntity*>:: iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it)113 for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it) 113 114 (*it)->setVisible(this->isActive()); 114 115 } -
code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc
r2500 r2503 1 #include "OrxonoxStableHeaders.h" 1 2 #include "BaseItem.h" 2 3 #include "ShipEquipment.h" … … 27 28 COUT(3) << "SWAP?" << endl; 28 29 //Abfrage- irgendne ifschleife... 29 if((checkSlot(item)->dropped(player))==true) ;30 if((checkSlot(item)->dropped(player))==true) 30 31 { 31 32 Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) ); -
code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc
r2500 r2503 1 #include "OrxonoxStableHeaders.h" 1 2 #include "Turbo.h" 2 3 -
code/branches/presentation/visual_studio/vc8/orxonox.vcproj
r2495 r2503 683 683 </File> 684 684 </Filter> 685 <Filter 686 Name="pickup" 687 > 688 <File 689 RelativePath="..\..\src\orxonox\objects\pickup\BaseItem.cc" 690 > 691 </File> 692 <File 693 RelativePath="..\..\src\orxonox\objects\pickup\PickupSpawner.cc" 694 > 695 </File> 696 <File 697 RelativePath="..\..\src\orxonox\objects\pickup\ShipEquipment.cc" 698 > 699 </File> 700 <File 701 RelativePath="..\..\src\orxonox\objects\pickup\Turbo.cc" 702 > 703 </File> 704 </Filter> 685 705 </Filter> 686 706 <Filter … … 1360 1380 <File 1361 1381 RelativePath="..\..\src\orxonox\objects\items\MultiStateEngine.h" 1382 > 1383 </File> 1384 </Filter> 1385 <Filter 1386 Name="pickup" 1387 > 1388 <File 1389 RelativePath="..\..\src\orxonox\objects\pickup\BaseItem.h" 1390 > 1391 </File> 1392 <File 1393 RelativePath="..\..\src\orxonox\objects\pickup\PickupSpawner.h" 1394 > 1395 </File> 1396 <File 1397 RelativePath="..\..\src\orxonox\objects\pickup\ShipEquipment.h" 1398 > 1399 </File> 1400 <File 1401 RelativePath="..\..\src\orxonox\objects\pickup\ShipEquipmentClasses.h" 1402 > 1403 </File> 1404 <File 1405 RelativePath="..\..\src\orxonox\objects\pickup\ShipItem.h" 1406 > 1407 </File> 1408 <File 1409 RelativePath="..\..\src\orxonox\objects\pickup\Turbo.h" 1410 > 1411 </File> 1412 <File 1413 RelativePath="..\..\src\orxonox\objects\pickup\Usable.h" 1362 1414 > 1363 1415 </File>
Note: See TracChangeset
for help on using the changeset viewer.