Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 25, 2009, 11:07:09 PM (15 years ago)
Author:
rgrieder
Message:

Merged pickup2 into pickup3.

Location:
code/branches/pickup3
Files:
3 edited
10 copied

Legend:

Unmodified
Added
Removed

  • code/branches/pickup3

  • code/branches/pickup3/src/modules/CMakeLists.txt

    r5929 r6419  
    2929ADD_SUBDIRECTORY(objects)
    3030ADD_SUBDIRECTORY(overlays)
     31ADD_SUBDIRECTORY(pickup)
    3132ADD_SUBDIRECTORY(pong)
    3233ADD_SUBDIRECTORY(questsystem)

  • code/branches/pickup3/src/modules/pickup/DroppedItem.cc

    r6405 r6419  
    9797        droppedItem->attach(billboard);
    9898
    99         COUT(3) << "Created DroppedItem for '" << item->getPickupIdentifier() << "' at (" << position.x << "," << position.y << "," << position.z << ")." << std::endl;
     99        COUT(3) << "Created DroppedItem for '" << item->getPickupIdentifier() << "' at (" << position.x << ',' << position.y << ',' << position.z << ")." << std::endl;
    100100
    101101        return droppedItem;

  • code/branches/pickup3/src/modules/pickup/PickupSpawner.cc

    r6405 r6419  
    128128        //  & load the GUI itself too, along with some empty windows
    129129        //   = even less delays
    130 //         GUIManager::getInstance().showGUI("PickupInventory");
    131 //         GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
     130//         GUIManager::showGUI("PickupInventory");
     131//         GUIManager::hideGUI("PickupInventory");
    132132//         PickupInventory::getSingleton();
    133133    }

  • code/branches/pickup3/src/modules/weapons/projectiles/Projectile.cc

    r6417 r6419  
    124124
    125125            float dmg = this->damage_;
    126             if (this->owner_)
    127                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
     126            //TODO: Remove.
     127//             if (this->owner_)
     128//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
    128129
    129130            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
Note: See TracChangeset for help on using the changeset viewer.