Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11202


Ignore:
Timestamp:
May 26, 2016, 3:28:46 PM (9 years ago)
Author:
fvultier
Message:

fixed some weird merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentationFS16/src/modules/hover/HoverOrigin.h

    r11199 r11202  
    6666                { return this->cellHeight_; }
    6767
    68             inline void setWallTickness(int wallTickness)
    69                 { this->wallTickness_ = wallTickness; }
    70             inline int getWallTickness() const
    71                 { return this->wallTickness_; }
     68            inline void setWallThickness(int wallThickness)
     69                { this->wallThickness_ = wallThickness; }
     70            inline int getWallThickness() const
     71                { return this->wallThickness_; }
    7272
    7373            //pickup template set and get for destroy hover pickup
Note: See TracChangeset for help on using the changeset viewer.