Changeset 11202 for code/branches

Timestamp:

May 26, 2016, 3:28:46 PM (8 years ago)

Author:

fvultier

Message:

fixed some weird merge conflict

File:

• code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified) (1 diff)

code/branches/presentationFS16/src/modules/hover/HoverOrigin.h

@@ -66 +66 @@
                 { return this->cellHeight_; }
 
-            inline void setWallTickness(int wallTickness)
-                { this->wallTickness_ = wallTickness; }
-            inline int getWallTickness() const
-                { return this->wallTickness_; }
+            inline void setWallThickness(int wallThickness)
+                { this->wallThickness_ = wallThickness; }
+            inline int getWallThickness() const
+                { return this->wallThickness_; }
 
             //pickup template set and get for destroy hover pickup