Merge fixes from .21 branch
authorunc0rr
Tue, 30 Dec 2014 21:00:03 +0300
changeset 10728 d58d7d8b5392
parent 10722 37264e44ec0f (diff)
parent 10723 2cfa65083621 (current diff)
child 10730 eac6a4d53752
Merge fixes from .21 branch
CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 30 19:07:57 2014 +0300
+++ b/CMakeLists.txt	Tue Dec 30 21:00:03 2014 +0300
@@ -52,7 +52,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 21)
-set(HEDGEWARS_PROTO_VER 49)
+set(HEDGEWARS_PROTO_VER 48)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 include(${CMAKE_MODULE_PATH}/revinfo.cmake)
 
--- a/hedgewars/uGearsHandlersRope.pas	Tue Dec 30 19:07:57 2014 +0300
+++ b/hedgewars/uGearsHandlersRope.pas	Tue Dec 30 21:00:03 2014 +0300
@@ -29,7 +29,7 @@
     uAmmos, uDebug, uUtils, uGearsHedgehog, uGearsRender;
 
 const
-    IsNilHHFatal = true;
+    IsNilHHFatal = false;
 
 procedure doStepRopeAfterAttack(Gear: PGear);
 var
Binary file share/hedgewars/Data/Graphics/amRubber.png has changed