summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/gui/connection.h3
-rw-r--r--src/main.cpp2
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9eca68ad..26cbf9cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-13 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * data/maps/new_1-1.tmx.gz, data/maps/new_3-1.tmx.gz,
+ data/maps/new_7-1.tmx.gz: Made the three desert maps use the fringe
+ layer for objects. Reveals bug with objects disappearing at the bottom
+ and still some draw order problems.
+
2005-10-24 Ferreira Yohann <Bertram@cegetel.net>
* src/main.cpp: Add version displaying at startup.
@@ -108,7 +115,7 @@
2005-10-15 Björn Steinbrink <B.Steinbrink@gmx.de>
* src/engine.cpp: Moved some variables into the conditional block
- wehere they are used.
+ where they are used.
* src/being.cpp: A few changes that make the code look nicer.
* src/openglgraphics.cpp, src/resources/image.cpp,
src/resources/image.h: Some small cleanups.
diff --git a/src/gui/connection.h b/src/gui/connection.h
index baf8e1d8..bde1e174 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -39,7 +39,8 @@ class ProgressBar;
*
* \ingroup Interface
*/
-class ConnectionDialog : public Window, public gcn::ActionListener {
+class ConnectionDialog : public Window, public gcn::ActionListener
+{
public:
/**
* Constructor
diff --git a/src/main.cpp b/src/main.cpp
index cd425bbd..e28c843b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -309,7 +309,7 @@ void exit_engine()
// Shutdown libxml
xmlCleanupParser();
-
+
// Shutdown sound
sound.close();