From 1f3fcd6a589cbee299d37f418af8ee08d10679a3 Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Fri, 19 Nov 2010 14:52:49 +0000
Subject: Fixed compilation problems with new libnds. Note: Resulting binaries
 untested.

---
 source/gui.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'source/gui.c')

diff --git a/source/gui.c b/source/gui.c
index 3579f69..46ae67a 100644
--- a/source/gui.c
+++ b/source/gui.c
@@ -259,7 +259,9 @@ int GUI_Menu(const char *opts[])
 	    }
 	    else if (key & KEY_TOUCH)
 	    {
-		touchPosition tp=touchReadXY();
+		touchPosition tp;
+		
+		touchRead(&tp);
 
 		if (tp.px>=x && tp.px<(w+w) && tp.py>=y && tp.py<(y+h))
 		{
@@ -421,9 +423,11 @@ void GUI_Config(void)
 	}
 	else if (key & KEY_TOUCH)
 	{
-	    touchPosition tp = touchReadXY();
+	    touchPosition tp;
 	    int nsel;
 
+	    touchRead(&tp);
+
 	    nsel = (tp.py-18)/14;
 
 	    if (nsel>=0 && nsel<DS81_NUM_CONFIG_ITEMS)
@@ -532,7 +536,7 @@ int GUI_FileSelect(char pwd[], char selected_file[], const char *filter)
 
 	    while (((key=keysHeld()) & KEY_TOUCH) && diff == 0)
 	    {
-		tp = touchReadXY();
+		touchRead(&tp);
 		diff = tp.py - drag_start;
 		swiWaitForVBlank();
 	    }
@@ -579,7 +583,7 @@ int GUI_FileSelect(char pwd[], char selected_file[], const char *filter)
 	    {
 		touchPosition tp;
 
-		tp = touchReadXY();
+		touchRead(&tp);
 
 	    	if (tp.py >= FSEL_LIST_Y && tp.py <= (FSEL_LIST_Y+FSEL_LIST_H))
 		{
-- 
cgit v1.2.3