[Orxonox-commit 6562] r11202 - code/branches/presentationFS16/src/modules/hover

[fvultier at orxonox.net]

Author: fvultier
Date: 2016-05-26 15:28:46 +0200 (Thu, 26 May 2016)
New Revision: 11202

Modified:
   code/branches/presentationFS16/src/modules/hover/HoverOrigin.h
Log:
fixed some weird merge conflict

Modified: code/branches/presentationFS16/src/modules/hover/HoverOrigin.h
===================================================================
--- code/branches/presentationFS16/src/modules/hover/HoverOrigin.h	2016-05-26 13:19:53 UTC (rev 11201)
+++ code/branches/presentationFS16/src/modules/hover/HoverOrigin.h	2016-05-26 13:28:46 UTC (rev 11202)
@@ -65,10 +65,10 @@
             inline int getCellHeight() const
                 { 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