Changeset 9667 for code/trunk/src/modules/overlays/OverlayText.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/overlays/OverlayText.cc
r7401 r9667 41 41 namespace orxonox 42 42 { 43 CreateFactory(OverlayText);43 RegisterClass(OverlayText); 44 44 45 45 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left == (int)OverlayText::Left); … … 47 47 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText::Right); 48 48 49 OverlayText::OverlayText( BaseObject* creator)50 : OrxonoxOverlay(c reator)49 OverlayText::OverlayText(Context* context) 50 : OrxonoxOverlay(context) 51 51 { 52 52 RegisterObject(OverlayText);
Note: See TracChangeset
for help on using the changeset viewer.