X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3dd4a589f4c8378c6a46bfceb4c87316360ca2..d841895246c188d722bae08e9f37c7270bc56ea8:/demos/forty/scorefil.cpp?ds=sidebyside

diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp
index 8282a9fb66..be8c709546 100644
--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -6,9 +6,7 @@
 // Created:     21/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1993-1998 Chris Breeze
-// Licence:   	wxWindows licence
-//---------------------------------------------------------------------------
-// Last modified: 14th May 1998 - ported to wxWindows 2.0
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -38,146 +36,146 @@
 
 #include "scorefil.h"
 
-
-ScoreFile::ScoreFile(const char* appName)
+ScoreFile::ScoreFile(const wxString& appName)
 {
 #if 0
-	wxString filename;
-	m_configFilename << "/usr/local/share/" << appName << ".scores";
-	if (access(m_configFilename, F_OK) == 0)
-	{
-		if (access(m_configFilename, R_OK | W_OK) != 0)
-		{
-			// file is not r/w - use local file instead
-			m_configFilename = wxFileConfig::GetLocalFileName(appName);
-		}
-	}
-	else
-	{
-		int fd = creat(m_configFilename, 0666);
-
-		if (fd < 0)
-		{
-			// failed to create file - use local file instead
-			m_configFilename = wxFileConfig::GetLocalFileName(appName);
-		}
-		else
-		{
-			// ensure created file has rw-rw-rw permissions
-			close(fd);
-		}
-	}
+    wxString filename;
+    m_configFilename << "/usr/local/share/" << appName << ".scores";
+    if (access(m_configFilename, F_OK) == 0)
+    {
+        if (access(m_configFilename, R_OK | W_OK) != 0)
+        {
+            // file is not r/w - use local file instead
+            m_configFilename = wxFileConfig::GetLocalFileName(appName);
+        }
+    }
+    else
+    {
+        int fd = creat(m_configFilename, 0666);
+
+        if (fd < 0)
+        {
+            // failed to create file - use local file instead
+            m_configFilename = wxFileConfig::GetLocalFileName(appName);
+        }
+        else
+        {
+            // ensure created file has rw-rw-rw permissions
+            close(fd);
+        }
+    }
 #endif
 
-	m_config = new wxConfig(appName, "wxWindows", appName, "", wxCONFIG_USE_LOCAL_FILE);  // only local
+    m_config = new wxConfig(appName, _T("wxWidgets"), appName, wxEmptyString,
+                                wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 
 ScoreFile::~ScoreFile()
 {
-	delete m_config;
+    delete m_config;
 #ifdef __WXGTK__
-	// ensure score file has rw-rw-rw permissions
-	// (wxFileConfig sets them to rw-------)
-	chmod(m_configFilename, 0666);
+    // ensure score file has rw-rw-rw permissions
+    // (wxFileConfig sets them to rw-------)
+    chmod(m_configFilename, 0666);
 #endif
 }
 
 
 void ScoreFile::GetPlayerList( wxArrayString &list )
 {
-	m_config->SetPath("/Players");
-	int length = m_config->GetNumberOfGroups();
-
-	if (length <= 0) return;
-
-	wxString player;
-	long index, i = 0;
-	if (m_config->GetFirstGroup(player, index))
-	{
-	     list.Add( player );
-	     i++;
-		while (m_config->GetNextGroup(player, index))
-		{
-	          list.Add( player );
-		  i++;
-		}
-	}
+    m_config->SetPath(_T("/Players"));
+    int length = m_config->GetNumberOfGroups();
+
+    if (length <= 0) return;
+
+    wxString player;
+    long index;
+    if (m_config->GetFirstGroup(player, index))
+    {
+         list.Add( player );
+        while (m_config->GetNextGroup(player, index))
+        {
+              list.Add( player );
+        }
+    }
 }
 
 
 // Calculate an encrypted check number to prevent tampering with
 // score file
-long ScoreFile::CalcCheck(const char* name, int p1, int p2, int p3)
+long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
 {
     long check = 0;
-    while (*name)
-	{
-		check = (check << 1) ^ (long)*name++;
-		check = ((check >> 23) ^ check) & 0xFFFFFF;
-	}
-	check = (check << 1) ^ (long)p1;
-	check = ((check >> 23) ^ check) & 0xFFFFFF;
-	check = (check << 1) ^ (long)p2;
-	check = ((check >> 23) ^ check) & 0xFFFFFF;
-	check = (check << 1) ^ (long)p3;
-	check = ((check >> 23) ^ check) & 0xFFFFFF;
+    size_t i, max = name.length();
+
+    for(i = 0; i < max; ++i )
+    {
+        check = (check << 1) ^ (long)name[i];
+        check = ((check >> 23) ^ check) & 0xFFFFFF;
+    }
+    check = (check << 1) ^ (long)p1;
+    check = ((check >> 23) ^ check) & 0xFFFFFF;
+    check = (check << 1) ^ (long)p2;
+    check = ((check >> 23) ^ check) & 0xFFFFFF;
+    check = (check << 1) ^ (long)p3;
+    check = ((check >> 23) ^ check) & 0xFFFFFF;
     return check;
 }
 
 wxString ScoreFile::GetPreviousPlayer() const
 {
-	wxString result;
-	m_config->SetPath("/General");
-	m_config->Read("LastPlayer", &result);
-	return result;
+    wxString result;
+    m_config->SetPath(_T("/General"));
+    m_config->Read(_T("LastPlayer"), &result);
+    return result;
 }
 
 void ScoreFile::ReadPlayersScore(
-						const char* player,
-						int& wins,
-						int& games,
-						int& score)
+                        const wxString& player,
+                        int& wins,
+                        int& games,
+                        int& score)
 {
-	long check = 0;
-	long myWins = 0, myGames = 0, myScore = 0;
-
-	games = wins = score = 0;
-
-	m_config->SetPath("/Players");
-	m_config->SetPath(player);
-	if (m_config->Read("Score", &myScore, 0L) &&
-		m_config->Read("Games", &myGames, 0L) &&
-		m_config->Read("Wins",  &myWins, 0L) &&
-		m_config->Read("Check", &check, 0L))
-	{
-	    if (check != CalcCheck(player, myGames, myWins, myScore))
-		{
-			wxMessageBox("Score file corrupted", "Warning",
-						wxOK | wxICON_EXCLAMATION);
-		}
-		else
-		{
-			games = myGames;
-			wins = myWins;
-			score = myScore;
-		}
-	}
-	WritePlayersScore(player, wins, games, score);
+    long check = 0;
+    long myWins = 0, myGames = 0, myScore = 0;
+
+    games = wins = score = 0;
+
+    m_config->SetPath(_T("/Players"));
+    m_config->SetPath(player);
+    if (m_config->Read(_T("Score"), &myScore, 0L) &&
+        m_config->Read(_T("Games"), &myGames, 0L) &&
+        m_config->Read(_T("Wins"),  &myWins, 0L) &&
+        m_config->Read(_T("Check"), &check, 0L))
+    {
+        if (check != CalcCheck(player, myGames, myWins, myScore))
+        {
+            wxMessageBox(_T("Score file corrupted"), _T("Warning"),
+                                     wxOK | wxICON_EXCLAMATION);
+        }
+        else
+        {
+            games = myGames;
+            wins = myWins;
+            score = myScore;
+        }
+    }
+    WritePlayersScore(player, wins, games, score);
 }
 
 
-void ScoreFile::WritePlayersScore(const char* player, int wins, int games, int score)
+void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
 {
     if (player)
-	{
-		m_config->SetPath("/General");
-		m_config->Write("LastPlayer", wxString(player)); // Without wxString tmp, thinks it's bool in VC++
-
-		m_config->SetPath("/Players");
-		m_config->SetPath(player);
-		m_config->Write("Score", (long)score);
-		m_config->Write("Games", (long)games);
-		m_config->Write("Wins", (long)wins);
-		m_config->Write("Check", CalcCheck(player, games, wins, score));
-	}
+    {
+        m_config->SetPath(_T("/General"));
+        m_config->Write(_T("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
+
+        m_config->SetPath(_T("/Players"));
+        m_config->SetPath(player);
+        m_config->Write(_T("Score"), (long)score);
+        m_config->Write(_T("Games"), (long)games);
+        m_config->Write(_T("Wins"), (long)wins);
+        m_config->Write(_T("Check"), CalcCheck(player, games, wins, score));
+    }
 }