Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge a few changes from 0.9.20
authorkoda
Thu, 26 Dec 2013 16:51:46 +0100
changeset 9859 85ce4dc3de8a
parent 9857 c49b2daced22 (diff)
parent 9851 b1e4f0dddfb5 (current diff)
child 9861 2b4f9e1496c6
merge a few changes from 0.9.20
--- a/.hgtags	Thu Dec 26 16:18:19 2013 +0100
+++ b/.hgtags	Thu Dec 26 16:51:46 2013 +0100
@@ -60,3 +60,4 @@
 0000000000000000000000000000000000000000 0.9.18-release
 2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
 1617149e01a4fa25637e2ab655d0287ef9c21b7c 0.9.19-release
+2b8f928faa1470858190cd9724b9ceed2a887358 0.9.20-release
--- a/CMakeLists.txt	Thu Dec 26 16:18:19 2013 +0100
+++ b/CMakeLists.txt	Thu Dec 26 16:51:46 2013 +0100
@@ -43,7 +43,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 20)
-set(HEDGEWARS_PROTO_VER 47)
+set(HEDGEWARS_PROTO_VER 46)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 include(${CMAKE_MODULE_PATH}/revinfo.cmake)
 
--- a/QTfrontend/CMakeLists.txt	Thu Dec 26 16:18:19 2013 +0100
+++ b/QTfrontend/CMakeLists.txt	Thu Dec 26 16:51:46 2013 +0100
@@ -61,8 +61,8 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform)
 include_directories(${SDL_INCLUDE_DIR})
 include_directories(${SDLMIXER_INCLUDE_DIR})
-include_directories(${PHYSFS_INCLUDE_DIR})
-include_directories(${PHYSLAYER_INCLUDE_DIR})
+include_directories(BEFORE ${PHYSFS_INCLUDE_DIR})
+include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR})
 
 
 if(UNIX)
--- a/QTfrontend/ui/page/pagemain.cpp	Thu Dec 26 16:18:19 2013 +0100
+++ b/QTfrontend/ui/page/pagemain.cpp	Thu Dec 26 16:51:46 2013 +0100
@@ -158,7 +158,7 @@
 #else
     int platform = 3;
 #endif
-    if(Tips.length() == 0)
+    if(!Tips.length())
     {
         DataManager & dataMgr = DataManager::instance();
 
@@ -209,7 +209,11 @@
 
         file.close();
     }
-    return Tips[QTime(0, 0, 0).secsTo(QTime::currentTime()) % Tips.length()];
+    
+    if(Tips.length())
+        return Tips[QTime(0, 0, 0).secsTo(QTime::currentTime()) % Tips.length()];
+    else
+        return QString();
 }
 
 void PageMain::toggleNetworkChoice()
--- a/hedgewars/uGearsHandlersMess.pas	Thu Dec 26 16:18:19 2013 +0100
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Dec 26 16:51:46 2013 +0100
@@ -3008,6 +3008,8 @@
 
     FollowGear := Gear;
 
+    Gear^.dY:= cMaxWindSpeed * 100;
+
     Gear^.doStep := @doStepCakeFall
 end;
 
--- a/misc/libphysfs/platform_unix.c	Thu Dec 26 16:18:19 2013 +0100
+++ b/misc/libphysfs/platform_unix.c	Thu Dec 26 16:51:46 2013 +0100
@@ -193,7 +193,7 @@
 
         if (access(exe, X_OK) == 0)  /* Exists as executable? We're done. */
         {
-            exe[size - binlen] = '\0'; /* chop off filename, leave '/' */
+            exe[size - binlen - 1] = '\0'; /* chop off filename, leave '/' */
             return exe;
         } /* if */
sheepy-clone