Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 31, 2015, 5:31:23 PM (9 years ago)
Author:
landauf
Message:

replaced tabs with spaces. no changes in code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc

    r10078 r10215  
    5656        //initialize sound
    5757        if (GameMode::isMaster())
    58                 {
    59                         defScoreSound_ = new WorldSound(this->getContext());
    60                         defScoreSound_->setVolume(1.0f);
    61                         defBatSound_ = new WorldSound(this->getContext());
    62                         defBatSound_->setVolume(0.4f);
    63                         defBoundarySound_ = new WorldSound(this->getContext());
    64                         defBoundarySound_->setVolume(0.5f);
    65                 }
    66                 else
    67                 {
    68                         defScoreSound_ = 0;
    69                         defBatSound_ = 0;
    70                         defBoundarySound_ = 0;
    71                 }
     58        {
     59            defScoreSound_ = new WorldSound(this->getContext());
     60            defScoreSound_->setVolume(1.0f);
     61            defBatSound_ = new WorldSound(this->getContext());
     62            defBatSound_->setVolume(0.4f);
     63            defBoundarySound_ = new WorldSound(this->getContext());
     64            defBoundarySound_->setVolume(0.5f);
     65        }
     66        else
     67        {
     68            defScoreSound_ = 0;
     69            defBatSound_ = 0;
     70            defBoundarySound_ = 0;
     71        }
    7272
    7373        setPosition(Vector3(0,0,0));
     
    120120            if(figureVelocity.z < 0 && figurePosition.x > platformPosition.x-width_/2 && figurePosition.x < platformPosition.x+width_/2 && figurePosition.z > platformPosition.z-height_/2*tolerance && figurePosition.z < platformPosition.z+height_/2)
    121121            {
    122                 touchFigure();
     122                touchFigure();
    123123            }
    124124        }
Note: See TracChangeset for help on using the changeset viewer.