From: Mathnerd314 <man.is.allan@gmail.com>
Date: Mon, 25 Jan 2010 23:35:02 +0000 (+0000)
Subject: Use supertux2 on Windows, zeekling squish animation fix.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=bb83166e903f0bfc44b8fab7026cb36c3884022d;p=supertux.git

Use supertux2 on Windows, zeekling squish animation fix.

SVN-Revision: 6273
---

diff --git a/data/images/creatures/zeekling/zeekling.sprite b/data/images/creatures/zeekling/zeekling.sprite
index 2b5303a4e..908b4dcfd 100644
--- a/data/images/creatures/zeekling/zeekling.sprite
+++ b/data/images/creatures/zeekling/zeekling.sprite
@@ -13,11 +13,11 @@
   (mirror-action "left"))
  (action
   (name "squished-left")
-  (hitbox 8 -19 31 30)
+  (hitbox 8 19 31 30)
   (images "squished.png"))
  (action
   (name "squished-right")
-  (hitbox 25 -19 31 30)
+  (hitbox 25 19 31 30)
   (mirror-action "squished-left"))
  (action
   (name "diving-left")
diff --git a/src/badguy/zeekling.cpp b/src/badguy/zeekling.cpp
index 90b30bbce..8c64887bb 100644
--- a/src/badguy/zeekling.cpp
+++ b/src/badguy/zeekling.cpp
@@ -64,7 +64,6 @@ Zeekling::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
   kill_squished(object);
-  kill_fall();
   return true;
 }
 
diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 048ebab73..98a6cc3d6 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -96,14 +96,37 @@ Main::init_physfs(const char* argv0)
   // PHYSFS_setSaneConfig)
   const char* application = PACKAGE_NAME;
   const char* userdir = PHYSFS_getUserDir();
-  char* writedir = new char[strlen(userdir) + strlen(application) + 2];
+
+  char* writedir = new char[strlen(userdir) + strlen(application) + 
+#ifndef _WIN32
+                                                                    2];
+#else
+                                                                    1];
+#endif
 
   // Set configuration directory
-  sprintf(writedir, "%s.%s", userdir, application);
+  sprintf(writedir, 
+#ifndef _WIN32
+                    "%s.%s",
+#else
+                    "%s%s",
+#endif
+                             userdir, application);
   if(!PHYSFS_setWriteDir(writedir)) {
     // try to create the directory
-    char* mkdir = new char[strlen(application) + 2];
-    sprintf(mkdir, ".%s", application);
+    char* mkdir = new char[strlen(application) +
+#ifndef _WIN32
+                                                 2];
+#else
+                                                 1];
+#endif
+    sprintf(mkdir,
+#ifndef _WIN32
+                   ".%s",
+#else
+                   "%s",
+#endif
+                          application);
     if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) {
       std::ostringstream msg;
       msg << "Failed creating configuration directory '"