X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f37c24e0782515bc3361571442b7aa570103eae5..b640fa17f3359e2766232e5dae3922de28236bde:/demos/forty/scorefil.cpp

diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp
index ef98e7761b..9d60a32cd6 100644
--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -6,16 +6,9 @@
 // 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__
-#pragma implementation
-#pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -27,11 +20,6 @@
 #include "wx/wx.h"
 #endif
 
-#ifdef __WXGTK__
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
 #include "wx/textfile.h"
 #include "wx/config.h"
 #include "wx/fileconf.h"
@@ -40,68 +28,33 @@
 
 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);
-		}
-	}
-#endif
-
-	m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""),
+    m_config = new wxConfig(appName, wxT("wxWidgets"), appName, wxEmptyString,
                                 wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 
 ScoreFile::~ScoreFile()
 {
-	delete m_config;
-#ifdef __WXGTK__
-	// ensure score file has rw-rw-rw permissions
-	// (wxFileConfig sets them to rw-------)
-	chmod(m_configFilename, 0666);
-#endif
+    delete m_config;
 }
 
 
 void ScoreFile::GetPlayerList( wxArrayString &list )
 {
-	m_config->SetPath(_T("/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(wxT("/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 );
+        }
+    }
 }
 
 
@@ -113,73 +66,73 @@ long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
     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;
+    {
+        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(_T("/General"));
-	m_config->Read(_T("LastPlayer"), &result);
-	return result;
+    wxString result;
+    m_config->SetPath(wxT("/General"));
+    m_config->Read(wxT("LastPlayer"), &result);
+    return result;
 }
 
 void ScoreFile::ReadPlayersScore(
-						const wxString& 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(_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"),
+    long check = 0;
+    long myWins = 0, myGames = 0, myScore = 0;
+
+    games = wins = score = 0;
+
+    m_config->SetPath(wxT("/Players"));
+    m_config->SetPath(player);
+    if (m_config->Read(wxT("Score"), &myScore, 0L) &&
+        m_config->Read(wxT("Games"), &myGames, 0L) &&
+        m_config->Read(wxT("Wins"),  &myWins, 0L) &&
+        m_config->Read(wxT("Check"), &check, 0L))
+    {
+        if (check != CalcCheck(player, myGames, myWins, myScore))
+        {
+            wxMessageBox(wxT("Score file corrupted"), wxT("Warning"),
                                      wxOK | wxICON_EXCLAMATION);
-		}
-		else
-		{
-			games = myGames;
-			wins = myWins;
-			score = myScore;
-		}
-	}
-	WritePlayersScore(player, wins, games, score);
+        }
+        else
+        {
+            games = myGames;
+            wins = myWins;
+            score = myScore;
+        }
+    }
+    WritePlayersScore(player, wins, games, score);
 }
 
 
 void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
 {
-    if (player)
-	{
-		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));
-	}
+    if (!player.empty())
+    {
+        m_config->SetPath(wxT("/General"));
+        m_config->Write(wxT("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
+
+        m_config->SetPath(wxT("/Players"));
+        m_config->SetPath(player);
+        m_config->Write(wxT("Score"), (long)score);
+        m_config->Write(wxT("Games"), (long)games);
+        m_config->Write(wxT("Wins"), (long)wins);
+        m_config->Write(wxT("Check"), CalcCheck(player, games, wins, score));
+    }
 }