X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FHud.cc;h=9e40a601a859f15f9a89a4243a008b0879bb3559;hb=b714ba98cb92a1be42acba91d44fe5bfb0783a3b;hp=1fdf39bcd0075874027fc9c129b6ad00f5486ede;hpb=987971a961454d97082c6448fdc0bbeb540281bb;p=chaz%2Fyoink

diff --git a/src/Hud.cc b/src/Hud.cc
index 1fdf39b..9e40a60 100644
--- a/src/Hud.cc
+++ b/src/Hud.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- 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 <Moof/Core.hh>
 #include <Moof/OpenGL.hh>
@@ -33,7 +16,8 @@
 #include "Hud.hh"
 
 
-ProgressBar::ProgressBar(const Tilemap& tilemap, Tilemap::Index index) :
+ProgressBar::ProgressBar(const Mf::Texture& tilemap,
+						 Mf::Texture::TileIndex index) :
 	mProgress(0.0),
 	mTilemap(tilemap)
 {
@@ -120,11 +104,12 @@ void ProgressBar::draw(Mf::Scalar alpha) const
 
 Hud::Hud(GameState& state) :
 	mState(state),
-	mBar1(Tilemap("StatusBars"), 0),
-	mBar2(Tilemap("StatusBars"), 2),
+	mBar1(Mf::Texture("StatusBars"), 0),
+	mBar2(Mf::Texture("StatusBars"), 2),
 	mFont("Font")
 {
-	ASSERT(Mf::video && "no current video context from which to get dimensions");
+	ASSERT(Mf::video &&
+		   "no current video context from which to get dimensions");
 	resize(Mf::video->getWidth(), Mf::video->getHeight());
 }
 
@@ -201,6 +186,3 @@ bool Hud::handleEvent(const Mf::Event& event)
 	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-