From d265a7fde35d0b5040f79d490d137deaff57f0b7 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Sat, 12 Jul 2003 03:12:36 +0000
Subject: Fixed some win32 things

---
 lib/font.cc    | 8 ++++----
 lib/texture.cc | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/font.cc b/lib/font.cc
index efdd9bd..014abde 100644
--- a/lib/font.cc
+++ b/lib/font.cc
@@ -244,7 +244,7 @@ void mogltk::font::putentry(Uint16 entry, ColorP c) {
     cx += sizes[entry] + wspace;
 }
 
-void mogltk::font::putchar(char ch, ColorP c) {
+void mogltk::font::drawchar(char ch, ColorP c) {
     Uint16 * p;
     int i;
 
@@ -256,7 +256,7 @@ void mogltk::font::putchar(char ch, ColorP c) {
     }
 }
 
-int mogltk::font::getchar(char ch) const {
+int mogltk::font::findchar(char ch) const {
     Uint16 * p;
     int i;
 
@@ -289,7 +289,7 @@ int mogltk::font::printf(const ugly_string & m, va_list ap) {
 	if (*p == '\n') {
 	    newline();
 	} else {
-	    putchar(*p, textcolor);
+	    drawchar(*p, textcolor);
 	}
     }
     
@@ -338,7 +338,7 @@ int mogltk::font::singletextsize(const String & s) const {
     int r = 0;
     
     for (i = 0; i < s.strlen(); i++) {
-	r += sizes[getchar(s[i])];
+	r += sizes[findchar(s[i])];
     }
     
     return r;
diff --git a/lib/texture.cc b/lib/texture.cc
index 43c8ac3..d7cfa7c 100644
--- a/lib/texture.cc
+++ b/lib/texture.cc
@@ -264,7 +264,7 @@ void mogltk::texture::Taint(void) {
 
 SDL_Surface * mogltk::texture::LoadNTEX(Handle * h) throw (GeneralException) {
     SDL_Surface * r;
-    char buffer[4];
+    char buffer[5];
     Uint16 height, width;
     
     h->read(buffer, 4);
-- 
cgit v1.2.3