Changeset 8487
- Timestamp:
- May 16, 2011, 1:39:51 PM (14 years ago)
- Location:
- code/branches/dockingsystem2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua
r8434 r8487 10 10 11 11 function P.onShow() 12 orxonox.CommandExecutor:execute("pause") 12 13 P.update() 13 orxonox.CommandExecutor:execute("pause")14 14 end 15 15 -
code/branches/dockingsystem2/data/levels/docking.oxw
r8434 r8487 37 37 38 38 <Dock> 39 <animation> 40 <MoveToDockingTarget target="destroyer" position="10,150,40" /> 41 </animation> 39 42 <effects> 40 43 <DockToShip target="destroyer" /> … … 46 49 </events> 47 50 <attached> 48 <DistanceTrigger position="0,0,0" distance=" 50" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />51 <DistanceTrigger position="0,0,0" distance="30" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" /> 49 52 <Billboard material="Examples/Flare" colour="1.0, 0, 0" /> 50 53 </attached> -
code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc
r8257 r8487 52 52 COUT(4) << "Invoking DockingEffects on player: " << player << " ." << std::endl; 53 53 54 for (std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++) { 55 switch(event) { 54 for (std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++) 55 { 56 switch(event) 57 { 56 58 case docking::DOCKING: 57 59 check &= (*effect)->docking(player); 58 break;59 case docking::ATTACH:60 check &= (*effect)->attach(player);61 60 break; 62 61 case docking::RELEASE: -
code/branches/dockingsystem2/src/modules/docking/DockingEffect.h
r8257 r8487 52 52 enum event { 53 53 DOCKING, 54 ATTACH,55 54 RELEASE 56 55 }; … … 72 71 virtual ~DockingEffect(); 73 72 74 virtual bool docking(PlayerInfo* player) = 0; //!< Called when docking starts 75 virtual bool attach(PlayerInfo* player) = 0; //!< Called after docking animation 73 virtual bool docking(PlayerInfo* player) = 0; //!< Called when player docked 76 74 virtual bool release(PlayerInfo* player) = 0; //!< Called when player wants to undock 77 75
Note: See TracChangeset
for help on using the changeset viewer.