summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--data/graphics/CMakeLists.txt1
-rw-r--r--data/help/header.txt2
-rw-r--r--src/gui/updatewindow.cpp11
6 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 712f5d6b..f8ac27f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2007-02-16 Rogier Polak <rogier.l.a.polak@gmail.com>
+2007-02-17 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * data/help/header.txt, NEWS, README: Updated release date.
+ * data/graphics/sprites/Makefile.am,
+ data/graphics/sprites/CMakeLists.txt, data/graphics/CMakeLists.txt:
+ Excluded sprites directory from installed files.
+
+2007-02-16 Rogier Polak <rogier.l.a.polak@gmail.com>
* src/gui/updatewindow.cpp: Fixed the update bug (hopefully), by
modifying the usage of the synchronisation between threads. Added a
diff --git a/NEWS b/NEWS
index 422f5eaa..5281cf78 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-0.0.22.2 (15 February 2007)
+0.0.22.2 (17 February 2007)
- Updated to work with Guichan 0.6.1
- Changed to new default server (server.themanaworld.org)
- Changed custom mouse cursor
diff --git a/README b/README
index 43ad9d75..2d6f07b1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA WORLD
==============
- Version: 0.0.22.2 Date: 15/02/2007
+ Version: 0.0.22.2 Date: 17/02/2007
Development team:
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 0fa9a7be..9a916db3 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,4 +1,3 @@
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(sprites)
ADD_SUBDIRECTORY(tiles)
diff --git a/data/help/header.txt b/data/help/header.txt
index ff94abe4..7311c111 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
##1 T H E M A N A W O R L D
##1 ==========================================
- ##2Version:##6 0.0.22.2 ##2Date:##315 February 2007
+ ##2Version:##6 0.0.22.2 ##2Date:##317 February 2007
##2 Website: http://themanaworld.org
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 45211b3e..24084fe4 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -331,7 +331,6 @@ int UpdaterWindow::downloadThread(void *ptr)
if (!uw->mStoreInMemory)
{
-
// Don't check resources2.txt checksum
if (uw->mDownloadStatus == UPDATE_RESOURCES)
{
@@ -348,7 +347,7 @@ int UpdaterWindow::downloadThread(void *ptr)
uw->mCurrentFile.c_str(),
adler, uw->mCurrentChecksum);
attempts++;
- continue; //Bail out her to avoid the renaming
+ continue; // Bail out here to avoid the renaming
}
}
fclose(outfile);
@@ -362,7 +361,8 @@ int UpdaterWindow::downloadThread(void *ptr)
::remove(newName.c_str());
::rename(outFilename.c_str(), newName.c_str());
- //Check if we can open it and no errors were encountered during renaming
+ // Check if we can open it and no errors were encountered
+ // during renaming
newfile = fopen(newName.c_str(), "rb");
if (newfile)
{
@@ -372,7 +372,8 @@ int UpdaterWindow::downloadThread(void *ptr)
}
else
{
- uw->mDownloadComplete = true; // it's stored in memory, we're done
+ // It's stored in memory, we're done
+ uw->mDownloadComplete = true;
}
}
attempts++;
@@ -434,7 +435,7 @@ void UpdaterWindow::logic()
mCurrentFile = "resources2.txt";
mStoreInMemory = false;
mDownloadStatus = UPDATE_LIST;
- download(); //download() changes mDownloadComplete to false
+ download(); // download() changes mDownloadComplete to false
}
break;
case UPDATE_LIST: