From be28eb850af17c6c168d7947396ed2f110b9b2b6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Sun, 9 Nov 2008 19:26:50 +0000
Subject: [PATCH] fixed void OSDCLASS::addFixed so that it actually uses the
 u16 x and u16 y values that it receives. Win32 - fixed so that fps and
 framecounter display in different places

---
 desmume/src/GPU_osd.cpp      | 2 +-
 desmume/src/windows/main.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp
index b204476bc..c31437223 100644
--- a/desmume/src/GPU_osd.cpp
+++ b/desmume/src/GPU_osd.cpp
@@ -142,7 +142,7 @@ void OSDCLASS::addFixed(u16 x, u16 y, const char *fmt, ...)
 
 	if (strcmp(msg, old_msg) == 0) return;
 
-	render51.PrintString<DesmumeFont>(1,0,0,render51.MakeColor(128,0,0),msg,&screenshell);
+	render51.PrintString<DesmumeFont>(1,x,y,render51.MakeColor(128,0,0),msg,&screenshell);
 
 	needUpdate = true;
 }
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 371f124eb..b745d8d82 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -714,7 +714,7 @@ DWORD WINAPI run( LPVOID lpParameter)
                {
 				   input->process();
 
-				 if (FpsDisplay) osd->addFixed(10, 10, "%02d Fps", fps);
+				 if (FpsDisplay) osd->addFixed(0, 5, "%02d Fps", fps);
 				 osd->update();
 				   Display();
 				   osd->clear();
@@ -796,7 +796,7 @@ DWORD WINAPI run( LPVOID lpParameter)
 					SPU_Pause(1);
 			   }
 			   frameCounter++;
-			   if (frameCounterDisplay) osd->addFixed(200, 30, "%d",frameCounter);
+			   if (frameCounterDisplay) osd->addFixed(0, 25, "%d",frameCounter);
 
 			   CheckMessages();
           }