From: mathnerd314 Date: Sun, 17 Jan 2010 19:53:26 +0000 (+0000) Subject: Replace igel with snail in dan_morial.stl + small nit in CMakeLists.txt X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=80546521a4ad00724be17a0ce879a8876ef56c26;p=supertux.git Replace igel with snail in dan_morial.stl + small nit in CMakeLists.txt git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6255 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e527a9c28..e80830561 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,7 @@ IF(SVNVERSION_EXECUTABLE) ADD_CUSTOM_TARGET(svnversion ALL cmake -E echo "#ifndef VERSION_H" > "${CMAKE_BINARY_DIR}/version.h.tmp" COMMAND cmake -E echo "#define VERSION_H" >> "${CMAKE_BINARY_DIR}/version.h.tmp" - COMMAND cmake -E echo_append "#define PACKAGE_VERSION \"${SUPERTUX_VERSION}r" >> "${CMAKE_BINARY_DIR}/version.h.tmp" + COMMAND cmake -E echo_append "#define PACKAGE_VERSION \"${SUPERTUX_VERSION} r" >> "${CMAKE_BINARY_DIR}/version.h.tmp" COMMAND svnversion -n ${CMAKE_CURRENT_SOURCE_DIR} >> "${CMAKE_BINARY_DIR}/version.h.tmp" COMMAND cmake -E echo "\"" >> "${CMAKE_BINARY_DIR}/version.h.tmp" COMMAND cmake -E echo "#endif" >> "${CMAKE_BINARY_DIR}/version.h.tmp" diff --git a/data/levels/world2/dan_morial.stl b/data/levels/world2/dan_morial.stl index 83b52136e..95dd56ce0 100644 --- a/data/levels/world2/dan_morial.stl +++ b/data/levels/world2/dan_morial.stl @@ -57,10 +57,6 @@ (x 9376) (y 544) ) - (igel - (x 304) - (y 496) - ) (mrbomb (x 8032) (y 432) @@ -101,14 +97,18 @@ raiser1.goto_node(0);") (x 4656) (y 496) ) + (snail + (x 290) + (y 499) + ) (spawnpoint (name "main") (x 9504) (y 64) ) (tilemap - (z-pos -100) (solid #f) + (z-pos -100) (width 299) (height 19) (tiles @@ -134,8 +134,8 @@ raiser1.goto_node(0);") ) ) (tilemap - (z-pos -99) (solid #f) + (z-pos -99) (width 299) (height 19) (tiles @@ -161,8 +161,8 @@ raiser1.goto_node(0);") ) ) (tilemap - (z-pos 0) (solid #t) + (z-pos 0) (width 299) (height 19) (tiles @@ -188,8 +188,8 @@ raiser1.goto_node(0);") ) ) (tilemap - (z-pos 100) (solid #f) + (z-pos 100) (width 299) (height 19) (tiles @@ -215,34 +215,34 @@ raiser1.goto_node(0);") ) ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9312) (y 160) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9088) (y 384) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9120) (y 384) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9152) (y 384) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9248) (y 160) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) (unstable_tile + (sprite "images/objects/unstable_tile/unstable_tile.sprite") (x 9280) (y 160) - (sprite "images/objects/unstable_tile/unstable_tile.sprite") ) ) )