sockets documentation and cleanup

[chaz/yoink] / src / TilemapFont.cc

diff --git a/src/TilemapFont.cc b/src/TilemapFont.cc
index 60f070c6b384202de2b2962dce709eb6319c8788..14cfa2c28d0605956354b0aec21edec38649a9e4 100644 (file)
--- a/src/TilemapFont.cc
+++ b/src/TilemapFont.cc
@@ -1,44 +1,27 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
-#include "TilemapFont.hh"
 #include <iostream>
 
+#include "TilemapFont.hh"
+
 
 TilemapFont::TilemapFont() :
-       dc::tilemap("Font")
-{}
+       Mf::Texture("Font") {}
 
 
-void TilemapFont::getTileCoords(char symbol, dc::scalar coords[8],
-               dc::tilemap::orientation what)
+void TilemapFont::getTileCoords(char symbol, Mf::Scalar coords[8],
+               Mf::Texture::Orientation what)
 {
-       unsigned index = 0;
+       Mf::Texture::TileIndex index = 0;
 
        if (symbol >= ' ' && symbol <= '_')
        {
@@ -53,9 +36,6 @@ void TilemapFont::getTileCoords(char symbol, dc::scalar coords[8],
                index = 0;
        }
 
-       dc::tilemap::getTileCoords(index, coords, what);
+       Mf::Texture::getTileCoords(index, coords, what);
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-