WebSVN – spk – Diff – /GameLauncher/src/LcdCustomScreen.cpp

 #include "LcdCustomScreen.h"
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
+Utils::WString GetEndOfLine(FILE* id, int* line, bool upper)
+{
+	std::string word;
+	char c = fgetc(id);
+	if (c == -1)
+		return L"";
+	while ((c != 13) && (!feof(id)) && (c != '\n'))
+	{
+		word += c;
+		c = fgetc(id);
+	}
+	if (line)
+		++(*line);
+	if (upper)
+		return Utils::WString(word).upper();
+	return Utils::WString(word);
+}
 CLcdCustomScreen::CLcdCustomScreen( CEzLcd *lcd )
+{
 	m_pLcd = lcd;
 	m_iArraySize = 10;
 	m_pHandles = (HANDLE *)malloc(sizeof(HANDLE) * m_iArraySize);
 	m_iCycles = 10;
 	m_bDebug = false;
 	m_pMoveObject = m_pEndMoveObject = NULL;
 	m_pText = m_pEndText = NULL;
 }
 CLcdCustomScreen::~CLcdCustomScreen()
+{
 	Reset ();
 	free ( m_pHandles );
+}
+{
 	m_iArraySize += 5;
 	m_pHandles = (HANDLE *)realloc(m_pHandles, sizeof(HANDLE) * m_iArraySize);
+}
-CyString CLcdCustomScreen::ParseFilename(CyString &filename, CyString &dir)
+Utils::WString CLcdCustomScreen::parseFilename(const Utils::WString &filename, const Utils::WString &dir)
+{
-	CyString f = filename;
+	Utils::WString f = filename;
-	f = f.FindReplace("$progdir", m_sProgDir);
+	f = f.findReplace(L"$progdir", m_sProgDir);
-	f = f.FindReplace("$gamedir", m_sGameDir);
+	f = f.findReplace(L"$gamedir", m_sGameDir);
 	// relative filename
-	if ( !f.IsIn(":") )
+	if ( !f.contains(L":") )
-		f = dir + "/" + f;
+		f = dir + L"/" + f;
-	f = f.FindReplace("/", "\\");
+	f = f.findReplace(L"/", L"\\");
-	f = f.FindReplace("\\\\", "\\");
+	f = f.findReplace(L"\\\\", L"\\");
 	return f;
+}
-bool CLcdCustomScreen::LoadScript ( CyString sDir, CyString sProgDir, const char *filename )
+bool CLcdCustomScreen::loadScript (const Utils::WString &sDir, const Utils::WString& sProgDir, const Utils::WString& filename)
+{
-	m_lDebugLog.Clear();
+	_lDebugLog.clear();
-	m_lVaribles.Clear();
+	_lVaribles.clear();
 	int iCurrentPos = 0;
 	m_iStartPage = m_pLcd->AddNewPage () - 1;
     m_pLcd->ModifyControlsOnPage( m_iStartPage );
 	int iLastX, iLastY;
 	m_bDebug = false;
-	CyString fname = filename;
+	Utils::WString fname = filename;
-	fname = fname.FindReplace("$progdir", sProgDir);
+	fname = fname.findReplace(L"$progdir", sProgDir);
 	// relative path
-	if ( !fname.IsIn(":") )
+	if ( !fname.contains(L":") )
-		fname = sDir + "/" + filename;
+		fname = sDir + L"/" + filename;
-	fname = fname.FindReplace("\\", "/"); // make sure we're using the correct slash
+	fname = fname.findReplace(L"\\", L"/"); // make sure we're using the correct slash
-	fname = fname.FindReplace("//", "/"); // remove any double slashes
+	fname = fname.findReplace(L"//", L"/"); // remove any double slashes
-	CyString dir = fname.GetToken("/", 1, -1);
+	Utils::WString dir = fname.tokens(L"/", 1);
 	m_sScriptDir = dir;
 	m_sProgDir = sProgDir;
 	m_sGameDir = sDir;
-	FILE *id = fopen ( fname.c_str(), "r" );
+	FILE *id = _wfopen ( fname.c_str(), L"r" );
 	if ( id )
+	{
 		int iLine = 0;
 		while ( !feof(id) )
+		{
-			CyString line;
+			Utils::WString line;
-			line = line.GetEndOfLine ( id, &iLine, false );
+			line = GetEndOfLine ( id, &iLine, false );
-			if ( (line.Left (2) == "//") || (line.Empty()) )
+			if ( (line.left (2) == L"//") || (line.empty()) )
 				continue;
-			CyString arg = line.GetToken ( 1, &apos; &apos; ).ToLower();
+			Utils::WString arg = line.token(L&quot; &quot;, 1).lower();
-			if ( arg == "displayfor:" )
+			if ( arg == L"displayfor:" )
+			{
-				m_iCycles = line.GetToken ( 2, &apos; &apos; ).ToInt();
+				m_iCycles = line.token(L&quot; &quot;, 2).toInt();
 				if ( (!m_iCycles) || (m_iCycles < 0) )
-					m_lDebugLog.PushBack ( CyString((long)iLine) + (CyString(": Invalid argument for \"DisplayFor\" (") + line.GetToken ( 2, ' &apos; )) + ")", false );
+					_lDebugLog.pushBack (Utils::WString((long)iLine) + L": Invalid argument for \"DisplayFor\" (" + line.token(L" ";, 2) + L")");
 			}
-			else if ( arg == "debug" )
+			else if ( arg == L"debug" )
 				m_bDebug = true;
-			else if ( arg == "varible:" )
+			else if ( arg == L"varible:" )
+			{
-				if ( line.NumToken ( ' &apos; ) < 2 )
+				if ( line.countToken(L" ";) < 2)
-					m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(&quot;: Missing Argument for \"Varible\""), false );
+					_lDebugLog.pushBack(Utils::WString((long)iLine) + L&quot;: Missing Argument for \"Varible\"");
 				else
-					m_lVaribles.PushBack ( line.GetToken ( 2, ' &apos; ) );
+					_lVaribles.pushBack(line.token(L&quot; ", 2));
+			}
-			else if ( arg == "icon:" )
+			else if ( arg == L"icon:" )
+			{
-				if ( line.NumToken ( ' &apos; ) < 6 )
+				if ( line.countToken(L" ";) < 6)
-					m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(&quot;: Missing Arguments for \"Icon\""), false );
+					_lDebugLog.pushBack(Utils::WString((long)iLine) + L&quot;: Missing Arguments for \"Icon\"");
 				else
+				{
-					CyString sIcon = line.GetToken ( 6, -1, &apos; &apos; );
+					Utils::WString sIcon = line.tokens(L&quot; &quot;, 6);
-					int iSizeX = line.GetToken ( 4, &apos; &apos; ).ToInt();
+					int iSizeX = line.token(L&quot; &quot;, 4).toInt();
-					int iSizeY = line.GetToken ( 5, &apos; &apos; ).ToInt();
+					int iSizeY = line.token(L&quot; &quot;, 5).toInt();
-					HICON hIcon = static_cast<HICON>(LoadImage(0, (LPCTSTR)ParseFilename(sIcon, dir).c_str(), IMAGE_ICON, iSizeX, iSizeY, LR_LOADFROMFILE));
+					HICON hIcon = static_cast<HICON>(LoadImage(0, (LPCTSTR)parseFilename(sIcon, dir).c_str(), IMAGE_ICON, iSizeX, iSizeY, LR_LOADFROMFILE));
 					if ( FAILED (hIcon) )
-						m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(": Unable to open icon file: ") + sIcon, false );
+						_lDebugLog.pushBack (Utils::WString((long)iLine) + L": Unable to open icon file: " + sIcon);
 					else
+					{
 						m_pHandles[iCurrentPos] = m_pLcd->AddIcon(hIcon, iSizeX, iSizeY);
-						int iX = line.GetToken ( 2, ' &apos; ).ToInt ();
+						int iX = line.token(L&quot; ", 2).toInt();
-						int iY = line.GetToken ( 3, ' &apos; ).ToInt ();
+						int iY = line.token (L&quot; ", 3).toInt();
 						m_pLcd->SetOrigin ( m_pHandles[iCurrentPos], iX, iY );
 						iLastX = iX;
 						iLastY = iY;
 						iCurrentPos++;
+					}
+				}
+			}
-			else if ( (arg == "move:") || (arg == "moverepeat:") )
+			else if ( (arg == L"move:") || (arg == L"moverepeat:") )
+			{
-				if ( line.NumToken ( ' &apos; ) < 4 )
+				if ( line.countToken(L" ";) < 4)
-					m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(&quot;: Missing Argument for \"Move\""), false );
+					_lDebugLog.pushBack(Utils::WString((long)iLine) + L&quot;: Missing Argument for \"Move\"");
 				else if ( !iCurrentPos )
-					m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(": No object before move command"), false );
+					_lDebugLog.pushBack(Utils::WString((long)iLine) + L": No object before move command");
 				else
+				{
 					SMoveObject *o = new SMoveObject;
 					o->hObject = m_pHandles[iCurrentPos - 1];
-					if ( arg == "moverepeat:" )
+					if ( arg == L"moverepeat:" )
 						o->bRepeat = true;
 					else
 						o->bRepeat = false;
 					o->iStartX = iLastX;
 					o->iStartY = iLastY;
-					if ( line.GetToken ( 2, ' ' ) == ";-" )
+					if ( line.token(L" ", 2) == L";-")
 						o->iEndX = o->iStartX;
 					else
-						o->iEndX = line.GetToken ( 2, &apos; &apos; ).ToInt();
+						o->iEndX = line.token(L&quot; &quot;, 2).toInt();
-					if ( line.GetToken ( 3, ' ' ) == ";-" )
+					if ( line.token(L" ", 3) == L";-")
 						o->iEndY = o->iStartY;
 					else
-						o->iEndY = line.GetToken ( 3, &apos; &apos; ).ToInt();
+						o->iEndY = line.token(L&quot; &quot;, 3).toInt();
-					o->iTimeRemaining = o->iTotalTime = line.GetToken ( 4, &apos; &apos; ).ToInt();
+					o->iTimeRemaining = o->iTotalTime = line.token(L&quot; &quot;, 4).toInt();
 					AddMoveObject ( o );
+				}
+			}
-			else if ( ((arg.Left(9) == "textsmall") || (arg.Left(10) == "textmedium") || (arg.Left(9) == "textlarge")) && (arg.Right(1) == ":") )
+			else if ( ((arg.left(9) == L"textsmall") || (arg.left(10) == L"textmedium") || (arg.left(9) == L"textlarge")) && (arg.right(1) == L":") )
+			{
-				if ( line.NumToken ( ' &apos; ) < 6 )
+				if ( line.countToken(L" ";) < 6)
-					m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(&quot;: Missing Argument for \"Text\""), false );
+					_lDebugLog.pushBack(Utils::WString((long)iLine) + L&quot;: Missing Argument for \"Text\"");
 				else
+				{
-					CyString align = line.GetToken ( 5, &apos; &apos; ).ToLower();
+					Utils::WString align = line.token(L&quot; &quot;, 5).lower();
 					int iAlign = DT_CENTER;
 					if ( align == "center" )
 						iAlign = DT_CENTER;
 					else if ( align == "left" )
 						iAlign = DT_LEFT;
 					else if ( align == "right" )
 						iAlign = DT_RIGHT;
 					else
-						m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(": Invalid alignment setting \"") + align + "\"", false );
+						_lDebugLog.pushBack(Utils::WString((long)iLine) + L": Invalid alignment setting \"" + align + L"\"");
 					LGTextSize iSize = LG_SMALL;
-					if ( arg.Left(10) == "textmedium" )
+					if ( arg.left(10) == L"textmedium" )
 						iSize = LG_MEDIUM;
-					else if ( arg.Left(9) == "textsmall" )
+					else if ( arg.left(9) == L"textsmall" )
 						iSize = LG_SMALL;
-					else if ( arg.Left(9) == "textlarge" )
+					else if ( arg.left(9) == L"textlarge" )
 						iSize = LG_BIG;
 					bool scroll = false;
-					if ( arg.Right (7) == "Scroll:" )
+					if ( arg.right (7) == L"Scroll:" )
 						scroll = true;
-					int len = line.GetToken ( 4, &apos; &apos; ).ToInt();
+					int len = line.token(L&quot; &quot;, 4).toInt();
-					int x = line.GetToken ( 2, ' &apos; ).ToInt ();
+					int x = line.token(L&quot; ", 2).toInt();
-					int y = line.GetToken ( 3, ' &apos; ).ToInt ();
+					int y = line.token(L&quot; ", 3).toInt();
-					CyString str = line.GetToken ( 6, -1, &apos; &apos; );
+					Utils::WString str = line.tokens(L&quot; &quot;, 6);
 					m_pHandles[iCurrentPos] = m_pLcd->AddText ( (scroll) ? LG_SCROLLING_TEXT : LG_STATIC_TEXT, iSize, iAlign, len );
 					m_pLcd->SetOrigin ( m_pHandles[iCurrentPos], x, y );
 					m_pLcd->SetText ( m_pHandles[iCurrentPos], (LPCTSTR)str.c_str() );
 					SText *text = new SText;
 					AddText ( text );
 					iCurrentPos++;
+				}
+			}
 			else
-				m_lDebugLog.PushBack ( CyString((long)iLine) + CyString(": Invalid Command: ") + arg );
+				_lDebugLog.pushBack(Utils::WString((long)iLine) + L": Invalid Command: " + arg );
 			if ( iCurrentPos >= m_iArraySize )
 				IncreaseArraySize();
+		}
 		m_iCycles = 100;
 	return true;
+}
-void CLcdCustomScreen::SetVarible ( CyString v, int pos )
+void CLcdCustomScreen::setVarible(const Utils::WString &v, size_t pos )
+{
-	if ( pos >= m_lVaribles.Count() )
+	if ( pos >= _lVaribles.size() )
 		return;
-	m_lVaribles.GetAt ( pos )->data = v;
+	_lVaribles[pos]->data = v;
+}
 void CLcdCustomScreen::Reset ()
+{
 	m_pLcd->RemovePage ( m_iStartPage + 1 );
 	m_pLcd->RemovePage ( m_iStartPage );
-	m_lDebugLog.Clear();
+	_lDebugLog.clear();
-	m_lVaribles.Clear();
+	_lVaribles.clear();
 	SMoveObject *o = m_pMoveObject;
 	while ( o )
+	{
 		SMoveObject *next = o->pNext;
 		delete o;
 		o = next;
 	}
 	SText *t = m_pText;
 	while ( t )
+	{
 		SText *next = t->pNext;
 		delete t;
 	if ( m_bDebug )
+	{
 		m_pLcd->ShowPage ( m_iStartPage + 1 );
 	    m_pLcd->ModifyControlsOnPage ( m_iStartPage + 1 );
-		SStringList *str = m_lDebugLog.Head();
+		if (_lDebugLog.empty())
-		for ( int i = 0; i &lt; 5; i++ )
+			m_pLcd->SetText(m_hDebug[0], _T(&quot;No errors found!"));
+		else
+		{
-			if ( !str )
+			size_t max = _lDebugLog.size() > 5 ? 5 : _lDebugLog.size();
-				break;
+			for (size_t i = 0; i < max; i++)
-			m_pLcd->SetText ( m_hDebug[i], (LPCTSTR)str->str.c_str() );
+				m_pLcd->SetText(m_hDebug[i], _lDebugLog[i]->str);
-			str = str->next;
+		}
-		if ( !m_lDebugLog.Head() )
-			m_pLcd->SetText ( m_hDebug[0], _T("No errors found!") );
+	}
 	else
+	{
 		m_pLcd->ShowPage ( m_iStartPage );
 	    m_pLcd->ModifyControlsOnPage ( m_iStartPage );
 		for ( SText *text = m_pText; text; text = text->pNext )
+		{
-			CyString newtext = text->sText;
+			Utils::WString newtext = text->sText;
-			for ( SStringList *v = m_lVaribles.Head(); v; v = v->;next )
+			for(auto itr = _lVaribles.begin(); itr != _lVaribles.end(); itr++)
-				newtext.FindReplace ( CyString("$&quot;) + v->str, v->data );
+				newtext = newtext.findReplace(L"$&quot; + (*itr)->str, (*itr)->data );
-			m_pLcd->SetText ( text->hObject, (LPCTSTR)newtext.c_str() );
+			m_pLcd->SetText ( text->hObject, newtext);
+		}
 		// now do moving objects
 		for ( SMoveObject *o = m_pMoveObject; o; o = o->pNext )
+		{

Subversion Repositories spk

(root)/GameLauncher/src/LcdCustomScreen.cpp – Rev 1 → 242