fixed a warning that prevented the game from compiling

SVN-Revision: 5253

diff --git a/data/levels/test/transition.stl b/data/levels/test/transition.stl
index 39c8298..980d875 100644 (file)
--- a/data/levels/test/transition.stl
+++ b/data/levels/test/transition.stl
@@ -13,10 +13,10 @@
       (distance_bias 100)
       (volume 0.5)
       (name "Rain")
-      (width 7996)
+      (width 14396)
       (height 636)
       (x 0)
-      (y 640)
+      (y 0)
     )
     (background
       (speed 0.5)
@@ -64,6 +64,22 @@ willo3.set_state(\"move_path_track\");")
       (x 7264)
       (y 0)
     )
+    (scripttrigger
+      (script "play_sound(\"sounds/tuxgasp1.wav\");")
+      (button #f)
+      (width 32)
+      (height 492)
+      (x 4416)
+      (y -12)
+    )
+    (scripttrigger
+      (script "play_sound(\"sounds/tuxgasp2.wav\");")
+      (button #f)
+      (width 32)
+      (height 428)
+      (x 7776)
+      (y -12)
+    )
     (spawnpoint
       (name "main")
       (x 128)
@@ -218,7 +234,6 @@ willo3.set_state(\"move_path_track\");")
       (sector "")
       (spawnpoint "")
       (name "willo1")
-      (running #t)
       (flyspeed 300)
       (track-range 96)
       (hit-script "willohit();")
@@ -291,9 +306,9 @@ willo3.set_state(\"move_path_track\");")
       (sector "")
       (spawnpoint "")
       (name "willo3")
-      (hit-script "willohit();")
       (flyspeed 300)
       (track-range 96)
+      (hit-script "willohit();")
       (x 2528)
       (y 32)
       (path

diff --git a/src/main.cpp b/src/main.cpp
index d97dcd5..08d3d86 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -429,9 +429,9 @@ void init_video()
 
   // set icon
   #ifdef MACOSX
-  char* icon_fname = "images/engine/icons/supertux-256x256.png";
+  const char* icon_fname = "images/engine/icons/supertux-256x256.png";
   #else
-  char* icon_fname = "images/engine/icons/supertux.xpm";
+  const char* icon_fname = "images/engine/icons/supertux.xpm";
   #endif
   SDL_Surface* icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
   if(icon != 0) {