merged master into Controls

.git_archival

@@ -0,0 +1 @@
+node: $Format:%H$

.gitattributes

@@ -0,0 +1,3 @@
+.git_archival	export-subst
+.gitattributes	export-ignore
+.gitignore	export-ignore

.gitignore

@@ -1,5 +1,3 @@
-syntax: glob
-
 autom4te.cache
 *~
 *.bak

.hgeol

@@ -1,3 +0,0 @@
-[patterns]
-planet/** = LF
-** = native

CMakeLists.txt

@@ -67,6 +67,8 @@ endif()
 if(NOT USE_GL AND NOT USE_DIRECTX)
 	message(STATUS "No graphics display enabled; building dedicated server")
 	SET(USE_CONSOLE ON CACHE INTERNAL "Build dedicated server")
+else()
+	SET(USE_CONSOLE OFF)
 endif()
 if(UNIX AND NOT USE_SDL_MAINLOOP AND NOT APPLE AND NOT USE_CONSOLE)
 	option(USE_X11 "Use X11 to create windows etc." ON)
@@ -253,8 +255,8 @@ set(OC_CLONK_SOURCES
 	src/graphics/C4FacetEx.cpp
 	src/graphics/C4FacetEx.h
 	src/graphics/C4Facet.h
-	src/graphics/C4Fonts.cpp
-	src/graphics/C4Fonts.h
+	src/graphics/C4FontLoader.cpp
+	src/graphics/C4FontLoader.h
 	src/graphics/C4GraphicsResource.cpp
 	src/graphics/C4GraphicsResource.h
 	src/graphics/C4Surface.cpp
@@ -351,8 +353,6 @@ set(OC_CLONK_SOURCES
 	src/landscape/C4PathFinder.h
 	src/landscape/C4PXS.cpp
 	src/landscape/C4PXS.h
-	src/landscape/C4Region.cpp
-	src/landscape/C4Region.h
 	src/landscape/C4Scenario.cpp
 	src/landscape/C4Scenario.h
 	src/landscape/C4Sky.cpp
@@ -488,7 +488,6 @@ set(OC_CLONK_SOURCES
 	src/object/C4Shape.h
 	src/platform/C4App.cpp
 	src/platform/C4App.h
-	src/platform/C4AppT.cpp
 	src/platform/C4AppWin32Impl.h
 	src/platform/C4FileMonitor.cpp
 	src/platform/C4FileMonitor.h
@@ -502,6 +501,8 @@ set(OC_CLONK_SOURCES
 	src/platform/C4SoundLoaders.h
 	src/platform/C4SoundSystem.cpp
 	src/platform/C4SoundSystem.h
+	src/platform/C4StdInProc.cpp
+	src/platform/C4StdInProc.h
 	src/platform/C4Video.cpp
 	src/platform/C4Video.h
 	src/platform/C4Window.h
@@ -511,8 +512,6 @@ set(OC_CLONK_SOURCES
 	src/platform/PlatformAbstraction.h
 	src/platform/StdFile.cpp
 	src/platform/StdFile.h
-	src/platform/StdFont.cpp
-	src/platform/StdFont.h
 	src/platform/StdRegistry.cpp
 	src/platform/StdRegistry.h
 	src/platform/StdScheduler.cpp
@@ -633,6 +632,10 @@ elseif(USE_SDL_MAINLOOP)
 		src/platform/C4AppSDL.cpp
 		src/platform/C4WindowSDL.cpp
 	)
+elseif(USE_CONSOLE)
+	list(APPEND OC_SYSTEM_SOURCES
+		src/platform/C4AppT.cpp
+	)
 elseif(WIN32)
 	list(APPEND OC_SYSTEM_SOURCES
 		src/editor/C4ConsoleWin32.cpp
@@ -734,10 +737,8 @@ CHECK_INCLUDE_FILE_CXX(natupnp.h HAVE_NATUPNP_H)
 # 'Bool' and 'Window' to be defined. Unfortunately, this doesn't exist
 # as a CXX version (yet?).
 include(CheckIncludeFiles)
-CHECK_INCLUDE_FILES(X11/Xlib.h X11/extensions/xf86vmode.h HAVE_X11_EXTENSIONS_XF86VMODE_H)
 CHECK_INCLUDE_FILES(X11/Xlib.h X11/extensions/Xrandr.h HAVE_X11_EXTENSIONS_XRANDR_H)
 CHECK_INCLUDE_FILES(X11/Xlib.h X11/keysym.h HAVE_X11_KEYSYM_H)
-CHECK_INCLUDE_FILES(X11/Xlib.h X11/xpm.h HAVE_X11_XPM_H)
 CHECK_INCLUDE_FILE_CXX(iconv.h HAVE_ICONV)
 
 if(HAVE_ICONV)
@@ -857,6 +858,9 @@ if(USE_OPEN_AL)
 		FINDLIB(VORBISFILE_LIBRARY NAMES vorbisfile)
 		FINDLIB(OGG_LIBRARY NAMES ogg)
 	endif()
+	if(NOT APPLE)
+		FINDLIB(ALUT_LIBRARY NAMES alut)
+	endif()
 endif()
 
 ############################################################################
@@ -999,11 +1003,17 @@ target_link_libraries(clonk
 	${PNG_LIBRARIES}
 	${JPEG_LIBRARIES}
 	${ICONV_LIBRARY}
-	${VORBIS_LIBRARY}
-	${VORBISFILE_LIBRARY}
-	${OGG_LIBRARY}
-	${OPENAL_LIBRARY}
 )
+
+if(USE_OPEN_AL)
+	target_link_libraries(clonk
+		${OPENAL_LIBRARY}
+		${ALUT_LIBRARY}
+		${VORBIS_LIBRARY}
+		${VORBISFILE_LIBRARY}
+		${OGG_LIBRARY}
+	)
+endif()
 target_link_libraries(c4group
 	${ZLIB_LIBRARIES}
 )
@@ -1081,7 +1091,7 @@ if(UNIX)
 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
 	# and when the path is changed both the old and new definition appears
 	# in the list of flags.
-	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/openclonk\"")
+	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
 endif()
 if(OC_CXX_FLAGS)
 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
@@ -1230,13 +1240,9 @@ if(USE_GTK)
 endif()
 if(USE_X11)
 	FINDLIB(X11_LIBRARIES X11)
-	FINDLIB(XPM_LIBRARIES Xpm)
-	FINDLIB(XXF86VM_LIBRARIES Xxf86vm)
 	FINDLIB(XRANDR_LIBRARIES Xrandr)
 	target_link_libraries(clonk
 		${X11_LIBRARIES}
-		${XPM_LIBRARIES}
-		${XXF86VM_LIBRARIES}
 		${XRANDR_LIBRARIES}
 	)
 endif()
@@ -1364,8 +1370,9 @@ set(OC_C4GROUPS
 	Sound.ocg
 	System.ocg
 	Objects.ocd
-	BackToTheRocks.ocf
-	BeyondTheRocks.ocf
+	Arena.ocf
+	Parkour.ocf
+	Settlement.ocf
 	Tutorial.ocf
 )
 
@@ -1387,7 +1394,7 @@ foreach(group ${OC_C4GROUPS})
 			DEPENDS c4group
 			VERBATIM
 			)
-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/openclonk)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
 	endif()
 endforeach()
 if (NOT APPLE)

Credits.txt

@@ -22,4 +22,4 @@ David Dormagen (Zapper)
 Tobias Zwick (Newton)
 
 <Thanks to Contributors>
-Benjamin Herr (Loriel), Matthias Rottländer (Matthi), Felix Riese (Fungiform), Manuel Riecke (MrBeast), Benedict Etzel (B_E), Carl-Philip Hänsch (Carli), Alexander Semeniuk (AlteredARMOR), Florian Graier (Nachtfalter), ST-DDT, Asmageddon, Merten Ehmig (Pluto), Mark Haßelbusch (Marky), Luchs, Peewee, Lauri Niskanen (Ape), Dominik Bayerl (Kanibal), Faby, Checkmaty, Gurkenglas, Clonkine, mizipzor, mixi, RedWolf Design GmbH and all those who contributed to previous Clonk titles for the passion they put into the game and for agreeing to make Clonk open source.
+Benjamin Herr (Loriel), Matthias Rottländer (Matthi), Felix Riese (Fungiform), Manuel Riecke (MrBeast), Benedict Etzel (B_E), Carl-Philip Hänsch (Carli), Alexander Semeniuk (AlteredARMOR), Florian Graier (Nachtfalter), Daniel Theuke (ST-DDT), Asmageddon, Merten Ehmig (Pluto), Mark Haßelbusch (Marky), Luchs, Peewee, Lauri Niskanen (Ape), Dominik Bayerl (Kanibal), Faby, Checkmaty, Gurkenglas, Clonkine, mizipzor, mixi, Pyrit, grgecko, Koronis, RedWolf Design GmbH and all those who contributed to previous Clonk titles for the passion they put into the game and for agreeing to make Clonk open source.

Makefile.am

@@ -203,7 +203,6 @@ src/game/C4GraphicsSystem.h \
 src/game/C4Physics.h \
 src/game/C4Viewport.cpp \
 src/game/C4Viewport.h \
-src/game/ClonkMain.cpp \
 src/gamescript/C4Effect.cpp \
 src/gamescript/C4Effects.h \
 src/gamescript/C4FindObject.cpp \
@@ -229,8 +228,8 @@ src/graphics/C4Facet.cpp \
 src/graphics/C4FacetEx.cpp \
 src/graphics/C4FacetEx.h \
 src/graphics/C4Facet.h \
-src/graphics/C4Fonts.cpp \
-src/graphics/C4Fonts.h \
+src/graphics/C4FontLoader.cpp \
+src/graphics/C4FontLoader.h \
 src/graphics/C4GraphicsResource.cpp \
 src/graphics/C4GraphicsResource.h \
 src/graphics/C4Surface.cpp \
@@ -304,8 +303,6 @@ src/gui/C4StartupPlrSelDlg.cpp \
 src/gui/C4StartupPlrSelDlg.h \
 src/gui/C4StartupScenSelDlg.cpp \
 src/gui/C4StartupScenSelDlg.h \
-src/gui/C4UpdateDlg.cpp \
-src/gui/C4UpdateDlg.h \
 src/gui/C4UpperBoard.cpp \
 src/gui/C4UpperBoard.h \
 src/landscape/C4Landscape.cpp \
@@ -329,8 +326,6 @@ src/landscape/C4PathFinder.cpp \
 src/landscape/C4PathFinder.h \
 src/landscape/C4PXS.cpp \
 src/landscape/C4PXS.h \
-src/landscape/C4Region.cpp \
-src/landscape/C4Region.h \
 src/landscape/C4Scenario.cpp \
 src/landscape/C4Scenario.h \
 src/landscape/C4Sky.cpp \
@@ -452,7 +447,6 @@ src/object/C4Shape.cpp \
 src/object/C4Shape.h \
 src/platform/C4App.cpp \
 src/platform/C4App.h \
-src/platform/C4AppT.cpp \
 src/platform/C4AppWin32Impl.h \
 src/platform/C4FileMonitor.cpp \
 src/platform/C4FileMonitor.h \
@@ -466,14 +460,14 @@ src/platform/C4SoundLoaders.cpp \
 src/platform/C4SoundLoaders.h \
 src/platform/C4SoundSystem.cpp \
 src/platform/C4SoundSystem.h \
+src/platform/C4StdInProc.cpp \
+src/platform/C4StdInProc.h \
 src/platform/C4Video.cpp \
 src/platform/C4Video.h \
 src/platform/C4Window.h \
 src/platform/C4windowswrapper.h \
 src/platform/PlatformAbstraction.cpp \
 src/platform/PlatformAbstraction.h \
-src/platform/StdFont.cpp \
-src/platform/StdFont.h \
 src/platform/StdSync.h \
 src/platform/StdVideo.cpp \
 src/platform/StdVideo.h \
@@ -537,6 +531,16 @@ src/res/engine.rc \
 src/res/resource.h
 endif
 
+if MACOSX
+clonk_SOURCES += \
+src/platform/C4AppDelegate.h \
+src/platform/C4AppDelegate.mm \
+src/platform/C4FileMonitorMac.mm
+else
+clonk_SOURCES += \
+src/game/ClonkMain.cpp
+endif
+
 if SDL_MAIN_LOOP
 clonk_SOURCES += \
 src/platform/C4AppSDL.cpp \
@@ -551,6 +555,10 @@ src/platform/C4AppGTK.cpp \
 src/platform/C4AppGTKImpl.h \
 src/platform/C4WindowGTK.cpp
 else
+if CONSOLE
+clonk_SOURCES += \
+src/platform/C4AppT.cpp
+else
 if WIN32
 clonk_SOURCES += \
 src/editor/C4ConsoleWin32.cpp \
@@ -561,23 +569,28 @@ endif
 if MACOSX
 clonk_SOURCES += \
 src/editor/C4ConsoleCocoa.mm \
+src/editor/C4EditorWindowController.h \
+src/editor/C4EditorWindowController.mm \
+src/graphics/C4DrawGLMac.h \
+src/graphics/C4DrawGLMac.mm \
+src/platform/C4AppDelegate+MainMenuActions.h \
+src/platform/C4AppDelegate+MainMenuActions.mm \
 src/platform/C4AppMac.mm \
-src/platform/C4FileMonitorMac.mm \
+src/platform/C4WindowController.h \
+src/platform/C4WindowController.mm \
 src/platform/C4WindowMac.mm \
-src/platform/ClonkAppDelegate.h \
-src/platform/ClonkAppDelegate.mm \
-src/platform/ConsoleWindowController.h \
-src/platform/ConsoleWindowController.mm \
-src/platform/ClonkWindowController.h \
-src/platform/ClonkWindowController.mm \
-src/platform/ClonkOpenGLView.h \
-src/platform/ClonkOpenGLView.mm \
 src/platform/CocoaKeycodeMap.h \
-src/platform/ClonkMainMenuActions.h \
-src/platform/ClonkMainMenuActions.mm
+src/platform/ObjectiveCAssociated.h
 endif
 endif
 endif
+endif
+
+if AUTOUPDATE
+clonk_SOURCES += \
+src/gui/C4UpdateDlg.cpp \
+src/gui/C4UpdateDlg.h
+endif
 
 if LIBUPNP
 clonk_SOURCES += src/network/C4Network2UPnPLinux.cpp
@@ -718,7 +731,9 @@ c4groups = \
   Sound.ocg \
   System.ocg \
   Objects.ocd \
-  BackToTheRocks.ocf \
+  Arena.ocf \
+  Parkour.ocf \
+  Settlement.ocf \
   Tutorial.ocf
 
 CLEANFILES += $(c4groups)

Version.txt

@@ -12,33 +12,20 @@ SET(C4ENGINENICK        "openclonk")
 SET(C4ENGINEID          "${C4PROJECT_TLD}.${C4PROJECT_DOMAIN}.${C4ENGINENICK}")
 
 SET(C4XVER1             5)
-SET(C4XVER2             2)
+SET(C4XVER2             3)
 SET(C4XVER3             90)
-SET(C4XVER4             21)
 
 # C4VERSIONBUILDNAME should be witty and somewhat frequently changing
 # for alpha and beta releases, and meaningful and stable for stable releases.
 # Both variables need to start with a space if they aren't empty.
 SET(C4VERSIONBUILDNAME  " Beyond the Rocks")
-SET(C4VERSIONEXTRA      " Alpha")
+SET(C4VERSIONEXTRA      " Delta")
 
 ############################################################################
-# Get revision from Mercurial
+# Get revision from Git
 ############################################################################
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg_archival.txt")
-	# Archives generated by hg archive
-	file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/.hg_archival.txt" C4REVISION
-		LIMIT_COUNT 1
-		REGEX "node: [0-9a-f]+"
-	)
-	string(SUBSTRING "${C4REVISION}" 6 12 C4REVISION)
-else()
-	# Working copies
-	execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND "hg" "id" "--id"
-		OUTPUT_VARIABLE C4REVISION
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
+include(GitGetChangesetID)
+git_get_changeset_id(C4REVISION)
 
 ############################################################################
 # Get year

cmake/FindUpnp.cmake

@@ -24,15 +24,17 @@
 
 find_path(UPNP_INCLUDE_DIR NAMES upnp.h PATH_SUFFIXES upnp)
 set(UPNP_NAMES ${UPNP_NAMES} upnp)
+set(THREADUTIL_NAMES ${THREADUTIL_NAMES} threadutil)
 set(IXML_NAMES ${IXML_NAMES} ixml)
 find_library(UPNP_LIBRARY NAMES ${UPNP_NAMES})
+find_library(THREADUTIL_LIBRARY NAMES ${THREADUTIL_NAMES})
 find_library(IXML_LIBRARY NAMES ${IXML_NAMES})
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(UPNP DEFAULT_MSG UPNP_LIBRARY IXML_LIBRARY UPNP_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UPNP DEFAULT_MSG UPNP_LIBRARY THREADUTIL_LIBRARY IXML_LIBRARY UPNP_INCLUDE_DIR)
 
 if(UPNP_FOUND)
-	set(UPNP_LIBRARIES ${UPNP_LIBRARY} ${IXML_LIBRARY})
+	set(UPNP_LIBRARIES ${UPNP_LIBRARY} ${THREADUTIL_LIBRARY} ${IXML_LIBRARY})
 	set(UPNP_INCLUDE_DIR ${UPNP_INCLUDE_DIR})
 endif()
 

cmake/GitGetChangesetID.cmake

@@ -0,0 +1,39 @@
+function(git_get_changeset_id VAR)
+	find_package(Git QUIET)
+	if (GIT_FOUND)
+		execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			COMMAND "${GIT_EXECUTABLE}" "rev-parse" "HEAD"
+			RESULT_VARIABLE GIT_RESULT
+			OUTPUT_VARIABLE C4REVISION
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			ERROR_QUIET)
+
+		if(GIT_RESULT EQUAL 0)
+			string(SUBSTRING "${C4REVISION}" 0 12 C4REVISION)
+			execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+				COMMAND "${GIT_EXECUTABLE}" "status" "--porcelain"
+				OUTPUT_VARIABLE GIT_STATUS
+			)
+			string(REGEX MATCH "^[MADRC ][MD ]" WORKDIR_DIRTY "${GIT_STATUS}")
+		endif()
+	endif()
+	if (NOT C4REVISION)
+		# Git not found or not a git workdir
+		file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/.git_archival" C4REVISION
+			LIMIT_COUNT 1
+			REGEX "node: [0-9a-f]+"
+		)
+		string(LENGTH "${C4REVISION}" revlength)
+		if(revlength LESS 18)
+			set(C4REVISION "unknown")
+			message(WARNING "Could not retrieve git revision. Please set GIT_EXECUTABLE!")
+		else()
+			string(SUBSTRING "${C4REVISION}" 6 12 C4REVISION)
+		endif()
+		unset(revlength)
+	endif()
+	if(WORKDIR_DIRTY)
+		set(C4REVISION "${C4REVISION}+")
+	endif()
+	set(${VAR} "${C4REVISION}" PARENT_SCOPE)
+endfunction()

config.h.cmake

@@ -1,12 +1,18 @@
 /* Activate DebugRecs */
 #cmakedefine DEBUGREC 1
 
+/* Generate minidumps on crash */
+#cmakedefine HAVE_DBGHELP 1
+
 /* Define to 1 if you have the <direct.h> header file. */
 #cmakedefine HAVE_DIRECT_H 1
 
-/* Define to 1 if you have the <execinfo.h> header file. */
+/* The backtrace function is declared in execinfo.h and works */
 #cmakedefine HAVE_EXECINFO_H 1
 
+/* Whether FMOD shall be used */
+#cmakedefine HAVE_FMOD 1
+
 /* Define to 1 if you have FreeType2. */
 #cmakedefine HAVE_FREETYPE 1
 
@@ -31,18 +37,15 @@
 /* Define to 1 if you have SDL_mixer. */
 #cmakedefine HAVE_LIBSDL_MIXER 1
 
-/* Define to 1 if FMOD is available */
-#cmakedefine HAVE_FMOD 1
-
-/* Use OpenAL for playing sounds */
-#cmakedefine USE_OPEN_AL 1
-
 /* Define to 1 if you have the <locale.h> header file. */
 #cmakedefine HAVE_LOCALE_H 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
 
+/* Define to 1 if you have support for nullptr. */
+#cmakedefine HAVE_NULLPTR 1
+
 /* Define to 1 if you have the <poll.h> header file. */
 #cmakedefine HAVE_POLL_H 1
 
@@ -61,6 +64,9 @@
 /* Define to 1 if you have the <readline/readline.h> header file. */
 #cmakedefine HAVE_READLINE_READLINE_H 1
 
+/* C++ Compiler has rvalue references, a C++0x feature. */
+#cmakedefine HAVE_RVALUE_REF 1
+
 /* Define to 1 if you have SDL. */
 #cmakedefine HAVE_SDL 1
 
@@ -70,6 +76,9 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #cmakedefine HAVE_SIGNAL_H 1
 
+/* Define to 1 if your compiler supports static_assert */
+#cmakedefine HAVE_STATIC_ASSERT 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1
 
@@ -82,15 +91,15 @@
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H 1
 
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#cmakedefine HAVE_SYS_INOTIFY_H 1
-
 /* Define to 1 if you have the <sys/eventfd.h> header file. */
-#cmakedefine HAVE_SYS_EVENTFD_H
+#cmakedefine HAVE_SYS_EVENTFD_H 1
 
 /* Define to 1 if you have the <sys/file.h> header file. */
 #cmakedefine HAVE_SYS_FILE_H 1
 
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+#cmakedefine HAVE_SYS_INOTIFY_H 1
+
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #cmakedefine HAVE_SYS_SOCKET_H 1
 
@@ -111,18 +120,12 @@
 
 #cmakedefine HAVE_VFW32
 
-/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
-#cmakedefine HAVE_X11_EXTENSIONS_XF86VMODE_H 1
-
 /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
 #cmakedefine HAVE_X11_EXTENSIONS_XRANDR_H 1
 
 /* Define to 1 if you have the <X11/keysym.h> header file. */
 #cmakedefine HAVE_X11_KEYSYM_H 1
 
-/* Define to 1 if you have the <X11/xpm.h> header file. */
-#cmakedefine HAVE_X11_XPM_H 1
-
 /* Define as const if the declaration of iconv() needs const. */
 #cmakedefine ICONV_CONST
 
@@ -166,44 +169,32 @@
 /* MP3 music */
 #cmakedefine USE_MP3 1
 
+/* OpenAL sound */
+#cmakedefine USE_OPEN_AL 1
+
 /* Define to 1 if SDL is used for the main loop */
 #cmakedefine USE_SDL_MAINLOOP 1
 
 /* Define to 1 if the X Window System is used */
 #cmakedefine USE_X11 1
 
+/* Enable automatic update system */
+#cmakedefine WITH_AUTOMATIC_UPDATE 1
+
 /* Developer mode */
 #cmakedefine WITH_DEVELOPER_MODE 1
 
 /* Glib */
 #cmakedefine WITH_GLIB 1
 
-/* Use GTK+3 for the developer mode */
-#cmakedefine WITH_GTK3 1
-
-/* Enable the automatic update system */
-#cmakedefine WITH_AUTOMATIC_UPDATE 1
-
 /* Define to 1 if the X Window System is missing or not being used. */
 #cmakedefine X_DISPLAY_MISSING 1
 
 /* compile with debug options */
-#cmakedefine _DEBUG
-
-/* Define to 1 if rvalue references are supported */
-#cmakedefine HAVE_RVALUE_REF 1
+#cmakedefine _DEBUG 1
 
 /* Define to 1 if you have support for precompiled headers */
 #cmakedefine HAVE_PRECOMPILED_HEADERS 1
 
-/* Define to 1 if you have support for nullptr. */
-#cmakedefine HAVE_NULLPTR 1
-
 /* Use Apple Cocoa for the UI */
 #cmakedefine USE_COCOA 1
-
-/* Define to 1 if your compiler supports static_assert */
-#cmakedefine HAVE_STATIC_ASSERT 1
-
-/* Generate minidumps on crash */
-#cmakedefine HAVE_DBGHELP 1

config.h.in

@@ -6,6 +6,12 @@
 /* define if the Boost library is available */
 #undef HAVE_BOOST
 
+/* Generate minidumps on crash */
+#undef HAVE_DBGHELP
+
+/* Define to 1 if you have the <dbghelp.h> header file. */
+#undef HAVE_DBGHELP_H
+
 /* Define to 1 if you have the <direct.h> header file. */
 #undef HAVE_DIRECT_H
 
@@ -45,6 +51,9 @@
 /* Define to 1 if you have the <natupnp.h> header file. */
 #undef HAVE_NATUPNP_H
 
+/* Define to 1 if you have support for nullptr. */
+#undef HAVE_NULLPTR
+
 /* Define to 1 if you have the <poll.h> header file. */
 #undef HAVE_POLL_H
 
@@ -78,6 +87,9 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
+/* Define to 1 if your compiler supports static_assert */
+#undef HAVE_STATIC_ASSERT
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -120,18 +132,12 @@
 /* */
 #undef HAVE_VFW32
 
-/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
-#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
-
 /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
 #undef HAVE_X11_EXTENSIONS_XRANDR_H
 
 /* Define to 1 if you have the <X11/keysym.h> header file. */
 #undef HAVE_X11_KEYSYM_H
 
-/* Define to 1 if you have the <X11/xpm.h> header file. */
-#undef HAVE_X11_XPM_H
-
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
@@ -172,9 +178,6 @@
 /* DirectX graphics */
 #undef USE_DIRECTX
 
-/* Whether FMOD shall be used */
-#undef USE_FMOD
-
 /* OpenGL graphics */
 #undef USE_GL
 

configure.ac

@@ -38,9 +38,28 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_PROG_CXX
 AC_LANG([C++])
 AX_CHECK_COMPILE_FLAG([-std=gnu++0x], [CXX="${CXX} -std=gnu++0x"], [])
-AC_COMPILE_IFELSE([
-void f(struct D&&); int main() { return 0; }
-], [AC_DEFINE([HAVE_RVALUE_REF], [], [C++ Compiler has rvalue references, a C++0x feature.])], [AX_PROG_CXX_REFTOTEMP])
+
+AC_MSG_CHECKING([for rvalue references])
+AC_COMPILE_IFELSE([void f(struct D&&); int main() { return 0; }], [
+    AC_DEFINE([HAVE_RVALUE_REF], [], [C++ Compiler has rvalue references, a C++0x feature.])
+    AC_MSG_RESULT([yes])
+  ], [
+    AC_MSG_RESULT([no])
+    AX_PROG_CXX_REFTOTEMP
+  ])
+
+AC_MSG_CHECKING([for nullptr])
+AC_COMPILE_IFELSE([int main() { void *d = nullptr; }], [
+    AC_DEFINE([HAVE_NULLPTR], [], [Define to 1 if you have support for nullptr.])
+    AC_MSG_RESULT([yes])
+  ], [AC_MSG_RESULT([no])])
+
+AC_MSG_CHECKING([for static_assert])
+AC_COMPILE_IFELSE([int main() { static_assert(true, \"\"); }], [
+    AC_DEFINE([HAVE_STATIC_ASSERT], [], [Define to 1 if your compiler supports static_assert])
+    AC_MSG_RESULT([yes])
+  ], [AC_MSG_RESULT([no])])
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
@@ -65,7 +84,7 @@ AM_CONDITIONAL(MACOSX, [test $osx = true])
 # various used headers
 dnl the whitespace is there to prevent AC_INCLUDES_DEFAULT
 AC_CHECK_HEADERS([stdint.h unistd.h poll.h sys/file.h sys/stat.h sys/types.h locale.h sys/socket.h signal.h langinfo.h sys/eventfd.h sys/timerfd.h sys/inotify.h], , , [[ ]])
-AC_CHECK_HEADERS([io.h direct.h share.h natupnp.h], [], [], [[#include <windows.h>]])
+AC_CHECK_HEADERS([io.h direct.h share.h natupnp.h dbghelp.h], [], [], [[#include <windows.h>]])
 # iconv
 AX_ICONV
 # vasprintf is a GNU extension
@@ -107,7 +126,7 @@ AC_ARG_ENABLE([console],
 
 AC_ARG_ENABLE([sound],
   [AS_HELP_STRING([--enable-sound],[compile with sound support [default=yes]])],
-  , [if test $enable_console = yes; then enable_sound=no; else if test $win32 = true; then enable_sound=no; else enable_sound=yes; fi; fi])
+  , [if test $enable_console = yes; then enable_sound=no; else enable_sound=yes; fi])
 
 # GTK+
 GTK2_REQUIRED="glib-2.0 >= 2.8 gtk+-2.0 >= 2.8"
@@ -147,7 +166,7 @@ AC_ARG_WITH([openal],
   [AS_HELP_STRING([--with-openal],[compile with openal support [default=no]])],
   , [with_openal=no])
 if test $with_openal = yes; then
-  PKG_CHECK_MODULES(OPENAL, [vorbis vorbisfile openal])
+  PKG_CHECK_MODULES(OPENAL, [vorbis vorbisfile openal freealut])
   AC_DEFINE([USE_OPEN_AL], 1, [OpenAL sound])
   if test $enable_sound = no; then
     AC_MSG_ERROR([--with-openal cannot be used with --disable-sound.])
@@ -208,6 +227,7 @@ else
   enable_sdlmainloop=no
   VL_LIB_READLINE
 fi
+AM_CONDITIONAL([CONSOLE], [test $enable_console = yes])
 
 # Check for boost
 AX_BOOST_BASE([1.40.0], [], [
@@ -256,19 +276,15 @@ if test $enable_console = no; then
   AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have FreeType2.])
 fi
 
-# X11, Xpm, Xrandr
+# X11, Xrandr
 AC_PATH_XTRA
 if test $have_x = yes; then
   AC_DEFINE(USE_X11, 1, [Define to 1 if the X Window System is used])
   CLONK_LIBS="$X_LIBS $CLONK_LIBS"
-  AC_CHECK_HEADERS([X11/keysym.h X11/extensions/xf86vmode.h X11/xpm.h X11/extensions/Xrandr.h], ,
+  AC_CHECK_HEADERS([X11/keysym.h X11/extensions/Xrandr.h], ,
     [AC_MSG_ERROR([A required X11 header was not found.])], [[#include <X11/Xlib.h>]])
   AC_CHECK_LIB(X11, XOpenDisplay, [CLONK_LIBS="-lX11 $CLONK_LIBS"],
     [AC_MSG_ERROR([libX11 not found.])], [$X_LIBS])
-  AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [CLONK_LIBS="-lXpm $CLONK_LIBS"],
-    [AC_MSG_ERROR([libXpm not found.])], [$X_LIBS])
-  AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, [CLONK_LIBS="-lXxf86vm $CLONK_LIBS"],
-    [AC_MSG_ERROR([XF86VidMode not found.])], [$X_LIBS])
   AC_CHECK_LIB(Xrandr, XRRQueryExtension, [CLONK_LIBS="-lXrandr $CLONK_LIBS"],
     [AC_MSG_ERROR([libXrandr not found.])], [$X_LIBS])
 fi
@@ -280,8 +296,7 @@ AC_ARG_WITH([gl],
 if test $with_gl = yes; then
   if test $osx = true; then
     CLONK_LIBS="-framework OpenGL $CLONK_LIBS"
-    AC_CHECK_LIB(GLEW, glewInit, [CLONK_LIBS="-lGLEW $CLONK_LIBS"],
-      [AC_MSG_ERROR([glew not found.])])
+    PKG_CHECK_MODULES(GLEW, [glew], [CLONK_LIBS="$GLEW_LIBS $CLONK_LIBS"], [AC_MSG_ERROR([glew not found.])])
   elif test $win32 = true; then
     AC_CHECK_LIB(opengl32, main, [CLONK_LIBS="-lopengl32 $CLONK_LIBS"],
       [AC_MSG_ERROR([opengl32 not found.])])
@@ -338,9 +353,6 @@ if test $win32 = false; then
   AX_PTHREAD( , [AC_MSG_ERROR([No pthread support.])])
   AC_SUBST(PTHREAD_LIBS)
   AC_SUBST(PTHREAD_CFLAGS)
-
-  # FMod is used for windows only
-  AM_CONDITIONAL(USE_FMOD, false)
 else
   # Windows
   for WIN32LIB in gdi32 comdlg32 ws2_32
@@ -355,11 +367,10 @@ else
     AC_DEFINE([HAVE_VFW32], 1, [ ])
     ], [])
 
-  # FMod (Library comes with standard)
-  if test "$enable_sound" = yes; then
-    AC_DEFINE([USE_FMOD], 1, [Whether FMOD shall be used])
-  fi
-  AM_CONDITIONAL(USE_FMOD, test "$enable_sound" = yes)
+  AC_CHECK_LIB([dbghelp], main, [AS_IF([test "x$ac_cv_header_dbghelp_h" = xyes], [
+    CLONK_LIBS="-ldbghelp $CLONK_LIBS"
+    AC_DEFINE([HAVE_DBGHELP], 1, [Generate minidumps on crash])
+    ])], [])
 
   # windres
   AC_CHECK_TOOL(WINDRES, windres, no)

docs/Makefile

@@ -53,7 +53,7 @@ chm: $(sdk-de-dirs) $(chm-dirs) chm/en/Developer.chm chm/de/Entwickler.chm
 
 install: all
 	$(MKDIR_P) $(prefix)
-	$(CP_R) $(PWD)/online/* $(prefix)
+	$(CP_R) online/* $(prefix)
 
 check:
 	xmllint --noblanks --noout --valid $(xmlfiles)

docs/clonk.xsl

@@ -514,7 +514,7 @@
   <xsl:template name="color2">
     <xsl:param name="s" select="." />
     <!-- the list of keywords -->
-    <xsl:param name="t" select="'#include|#appendto|public|private|protected|global|static|var|local|const|int|proplist|object|array|string|bool|any|return|if|else|break|continue|while|for|func|true|false|nil|'" />
+    <xsl:param name="t" select="'#include|#appendto|public|private|protected|global|static|var|local|const|any|int|bool|def|effect|object|proplist|string|array|func|return|if|else|break|continue|while|for|true|false|nil|'" />
     <xsl:param name="w" select="substring-before($t, '|')" />
     <!-- text before the keyword -->
     <xsl:variable name="l" select="substring-before($s, $w)" />

docs/header.xml

@@ -15,10 +15,10 @@ clonk.xsl also uses it to match the processing for it. -->
 				search <input id="searchInput" name="s" type="text" value="" /> in the
 				<select name="p">
 					<option  value="blog">blog</option>
-					<option  value="functions">c4script function list</option>
+					<option selected="selected"  value="functions">c4script function list</option>
 					<option value="docs">c4script reference</option>
 					<option  value="functionsDE">c4script function list (DE)</option>
-					<option value="docsDE">c4script reference (DE)</option>
+					<option  value="docsDE">c4script reference (DE)</option>
 					<option  value="bugtrack">bugtracker</option>
 					<option  value="forum">forum</option>
 					<option  value="hg">hg changelog</option>
@@ -59,7 +59,7 @@ clonk.xsl also uses it to match the processing for it. -->
 		<li><a href="http://hg.openclonk.org/openclonk-resources/" target="_top">Resource Repository</a></li>
 	</ul>
 	</li>
-	<li><!--[if lt IE 9]><span><![endif]--><a href="http://wiki.openclonk.org/w/C4Script_Documentation" target="_top">Documentation</a><!--[if lt IE 9]></span><![endif]-->	<ul>
+	<li><!--[if lt IE 9]><span><![endif]--><a class="current" href="http://wiki.openclonk.org/w/C4Script_Documentation" target="_top">Documentation</a><!--[if lt IE 9]></span><![endif]-->	<ul>
 		<li><a href="http://docs.openclonk.org/en/sdk/" target="_top">C4Script Reference</a></li>
 	</ul>
 	</li>

docs/sdk/playercontrols.xml

@@ -8,12 +8,11 @@
   <part>
     <text>The engine allows to define control commands completely arbitrarily. Own keyboard commands can be added and modified. All supported input devices such as mouse, keyboard and gamepads can be mapped freely and commands can consist of any key combinations or sequences.</text>
     <h id="ControlFiles">PlayerControls.txt</h>
-    <text>All control commands which a player can send to the game are defined in the file PlayerControls.txt. The standard keys as well as their standard mapping for various input devices are contained in the global definition file in the Systems.ocg folder. Object definitions and scenarios can add more keys or overload the parameters of existing commands in their local Systems.ocg folder**.</text>
-    <text>Additional PlayerControls.txt files can be put in language packages to adapt the standard key mappings of different loaded languages to the keyboard of their respective country**.</text>
+    <text>All control commands which a player can send to the game are defined in the file PlayerControls.txt. The standard keys as well as their standard mapping for various input devices are contained in the global definition file in the Systems.ocg folder. Object definitions and scenarios can add more keys or overload the parameters of existing commands in their local Systems.ocg folder.</text>
     <part>
       <h id="ControlDefs">Section [ControlDefs]</h>
       <text>
-        Definition of possible player commands. Not valid in language packages. Subordinated to this section: 
+        Definition of possible player commands. Subordinated to this section: 
         <text>
           <table>
             <caption id="ControlDef">Any number of sections [ControlDef]</caption>
@@ -35,7 +34,7 @@
             <row>
               <literal_col>GUIDesc</literal_col>
               <col>String</col>
-              <col>Informative description which is displayed to the player in the control configuration dialog. Lokalisierte Zeichenketten koennen aus dem zugehoerigen StringTable refeenziert werden ($Name$).</col>
+              <col>Informative description which is displayed to the player in the control configuration dialog. Localized strings from the corresponding string table can be used ($Desc$).</col>
             </row>
             <row>
               <literal_col>Global</literal_col>
@@ -91,6 +90,14 @@
                       <literal_col>Script</literal_col>
                       <col>Execution of the script function <em>PlayerControl</em>. See <emlink href="playercontrols.xml#Script">Script callbacks</emlink>. (Default value)</col>
                     </row>
+                    <row>
+                      <literal_col>ZoomIn</literal_col>
+                      <col>Zoom in one unit</col>
+                    </row>
+                    <row>
+                      <literal_col>ZoomOut</literal_col>
+                      <col>Zoom out one unit</col>
+                    </row>
                     <row>
                       <literal_col>Menu</literal_col>
                       <col>Open the player menu (asynchronous command).</col>
@@ -107,6 +114,18 @@
                       <literal_col>MenuLeft / MenuUp / MenuRight / MenuDown</literal_col>
                       <col>Navigation in the player menu (asynchronous command).</col>
                     </row>
+                    <row>
+                      <literal_col>ObjectMenuOK / ObjectMenuSelect / ObjectMenuOKAll</literal_col>
+                      <col>Confirmation of the selected item in a menu (synchronous command).</col>
+                    </row>
+                    <row>
+                      <literal_col>ObjectMenuCancel</literal_col>
+                      <col>Close a menu (synchronous command).</col>
+                    </row>
+                    <row>
+                      <literal_col>ObjectMenuLeft / ObjectMenuUp / ObjectMenuRight / ObjectMenuDown</literal_col>
+                      <col>Navigation in a menu (synchronous command).</col>
+                    </row>
                   </table>
                 </text>
 
@@ -130,7 +149,27 @@
             <row>
               <literal_col>Name</literal_col>
               <col>String</col>
-              <col>Internal name for identification of otherwise equal control mappings. The names of the standard mappings are <em>Keyboard1</em>, <em>Keyboard1Classic</em>, <em>Keyboard2</em>, <em>Keyboard2Classic</em>, <em>Gamepad</em>. By using placeholders (*) keys can directly be defined in multiple mappings**.</col>
+              <col>Internal name for identification of otherwise equal control mappings. By using placeholders (*) keys can directly be defined in multiple mappings.</col>
+            </row>
+            <row>
+              <literal_col>GUIName</literal_col>
+              <col>String</col>
+              <col>Name for the control assignment set which is shown to the player in the control configuration dialog.</col>
+            </row>
+			<row>
+              <literal_col>Keyboard</literal_col>
+              <col>Boolean</col>
+              <col>Whether this control assignment set uses the keyboard. Default 1.</col>
+            </row>
+			<row>
+              <literal_col>Mouse</literal_col>
+              <col>Boolean</col>
+              <col>Whether this control assignment set uses the mouse. Default 1.</col>
+            </row>
+			<row>
+              <literal_col>Gamepad</literal_col>
+              <col>Boolean</col>
+              <col>Whether this control assignment set uses the gamepad. Default 0.</col>
             </row>
           </table>
           <text>
@@ -156,6 +195,26 @@
                 <col>String</col>
                 <col>Command that is combined with this mapping. The name should be equivalent to the <em>Identifier</em> of a command defined in a <emlink href="playercontrols.xml#ControlDef">[ControlDef]</emlink>.</col>
               </row>
+              <row>
+                <literal_col>GUIName</literal_col>
+                <col>String</col>
+                <col>Name which is shown to the player in the control configuration dialog and in control tooltips. Localized strings from the corresponding string table can be used ($Name$). If unset, GUIName of the control def is used. If set to "None", the control is not displayed in the user customization dialog even if the control def has a name set.</col>
+              </row>
+              <row>
+                <literal_col>GUIDesc</literal_col>
+                <col>String</col>
+                <col>Informative description which is displayed to the player in the control configuration dialog. Lokalisierte Zeichenketten koennen aus dem zugehoerigen StringTable refeenziert werden ($Name$). If unset, GUIDesc of the control def is used.</col>
+              </row>
+              <row>
+                <literal_col>GUIGroup</literal_col>
+                <col>Integer</col>
+                <col>Control assignments in the same group are displayed grouped together in the control assignment dialog. The group with the lowest number is displayed at the top. Default 0.</col>
+              </row>
+              <row>
+                <literal_col>GUIDisabled</literal_col>
+                <col>Boolean</col>
+                <col>Whether this control assignment can not be changed in the control assignment dialog. Default 0.</col>
+              </row>
               <row>
                 <literal_col>Priority</literal_col>
                 <col>Integer</col>
@@ -188,10 +247,6 @@
                         <literal_col>AlwaysUnhandled</literal_col>
                         <col>The key press is always passed to the mapping with the next lowest priority, independent of whether the previous command was executed successfully or not.</col>
                       </row>
-                      <row>
-                        <literal_col>ToggleUnhandled</literal_col>
-                        <col>The keypress is passed to the mapping with the next lower priority only if the previous command was executed successfully. This can be used to define macros. **</col>
-                      </row>
                       <row>
                         <literal_col>OverrideAssignments</literal_col>
                         <col>The assignment overwrites all other assignments for the same control with the same press/release trigger mode.</col>
@@ -357,6 +412,5 @@ global func UpdateControlDir(int player)
     <h id="Priority">Priorities</h>
     <text>...</text>
   </part>
-  <text><em>** - not yet implemented</em></text>
   <author>Sven2</author><date>2009-06</date>
 </doc>

docs/sdk/script/fn/Call.xml

@@ -8,11 +8,12 @@
     <category>Script</category>
     <subcat>Function call</subcat>
     <version>5.1 OC</version>
+    <extversion>5.4 OC</extversion>
     <syntax>
       <rtype>any</rtype>
       <params>
         <param>
-          <type>string</type>
+          <type>string or function</type>
           <name>function</name>
           <desc>Function to be called.</desc>
         </param>
@@ -23,11 +24,12 @@
         </param>
       </params>
     </syntax>
-    <desc>Calls the local function function. If "~" is prepended to the function name then the call does not fail if the function does not exist.</desc>
+    <desc>Calls the specified function. If given a string, the function is looked up in the context object (<code>this</code>). For example, <code>obj->Call("Foo")</code> is the same as <code>obj->Foo()</code>. Using Call like this is primarily useful when the name of the function can vary. If "~" is prepended to the function name then the call does not fail if the function does not exist.</desc>
     <related>
       <funclink>GameCall</funclink>
       <funclink>eval</funclink>
     </related>
   </func>
   <author>jwk</author><date>2002-04</date>
+  <author>Günther</author><date>2012</date>
 </funcs>

docs/sdk/script/fn/GetIndexOf.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE funcs
+  SYSTEM '../../../clonk.dtd'>
+<?xml-stylesheet type="text/xsl" href="../../../clonk.xsl"?>
+<funcs>
+  <func>
+    <title>GetIndexOf</title>
+    <category>Script</category>
+    <subcat>Arrays</subcat>
+    <version>5.1 OC</version>
+    <syntax>
+      <rtype>int</rtype>
+      <params>
+        <param>
+          <type>array</type>
+          <name>array2search</name>
+          <desc>Array in which the element should be searched. The array can be zero, in which case the element is never found and -1 is returned.</desc>
+        </param>
+        <param>
+          <type>any</type>
+          <name>needle</name>
+          <desc>The value to which every element of the array is to be compared.</desc>
+        </param>
+      </params>
+    </syntax>
+    <desc>Finds the first occurrence of a value in an array and returns its zero-based index. If the element is not found, -1 is returned. The usual rules for comparison using the <emlink href="script/operatoren.html#equality">==-operator</emlink> apply.</desc>
+  </func>
+  <author>Sven2</author><date>2012-12</date>
+</funcs>

docs/sdk/script/fn/InsertMaterial.xml

@@ -45,7 +45,6 @@
     <desc>Inserts a material pixel at the given position and given speed.</desc>
     <related>
       <funclink>Material</funclink>
-      <funclink>InsertMaterialAmount</funclink>
     </related>
   </func>
   <author>Sven2</author><date>2001-11</date>

docs/sdk/script/fn/SortArray.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE funcs
+  SYSTEM '../../../clonk.dtd'>
+<?xml-stylesheet type="text/xsl" href="../../../clonk.xsl"?>
+<funcs>
+  <func>
+    <title>SortArray</title>
+    <category>Script</category>
+    <subcat>Arrays</subcat>
+    <version>5.4 OC</version>
+    <syntax>
+      <rtype>bool</rtype>
+      <params>
+        <param>
+          <type>array</type>
+          <name>array2sort</name>
+          <desc>Array that is to be sorted</desc>
+        </param>
+        <param>
+          <type>bool</type>
+          <name>descending</name>
+          <desc>If true, elements are sorted in descending (highest to lowest) order. Otherwise ascending order.</desc>
+        </param>
+      </params>
+    </syntax>
+    <desc>Sorts an array by its elements. Elements should be either all strings or all integers.</desc>
+    <related>
+      <funclink>SortArrayByProperty</funclink>
+      <funclink>SortArrayByArrayElement</funclink>
+    </related>
+  </func>
+  <author>Sven2</author><date>2012-12</date>
+</funcs>

docs/sdk/script/fn/SortArrayByArrayElement.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE funcs
+  SYSTEM '../../../clonk.dtd'>
+<?xml-stylesheet type="text/xsl" href="../../../clonk.xsl"?>
+<funcs>
+  <func>
+    <title>SortArrayByArrayElement</title>
+    <category>Script</category>
+    <subcat>Arrays</subcat>
+    <version>5.4 OC</version>
+    <syntax>
+      <rtype>bool</rtype>
+      <params>
+        <param>
+          <type>array</type>
+          <name>array2sort</name>
+          <desc>Array that is to be sorted</desc>
+        </param>
+        <param>
+          <type>int</type>
+          <name>element_index</name>
+          <desc>Index of element in sub-array by which sorting should happen</desc>
+        </param>
+        <param>
+          <type>bool</type>
+          <name>descending</name>
+          <desc>If true, elements are sorted in descending (highest to lowest) order. Otherwise ascending order.</desc>
+        </param>
+      </params>
+    </syntax>
+    <desc>Sorts an array of arrays by a subarray element. All elements must be arrays of at least element_index+1 size. Subarray elements should be either all strings or all integer.</desc>
+    <related>
+      <funclink>SortArray</funclink>
+      <funclink>SortArrayByProperty</funclink>
+    </related>
+  </func>
+  <author>Sven2</author><date>2012-12</date>
+</funcs>

docs/sdk/script/fn/SortArrayByProperty.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE funcs
+  SYSTEM '../../../clonk.dtd'>
+<?xml-stylesheet type="text/xsl" href="../../../clonk.xsl"?>
+<funcs>
+  <func>
+    <title>SortArrayByProperty</title>
+    <category>Script</category>
+    <subcat>Arrays</subcat>
+    <version>5.4 OC</version>
+    <syntax>
+      <rtype>bool</rtype>
+      <params>
+        <param>
+          <type>array</type>
+          <name>array2sort</name>
+          <desc>Array that is to be sorted</desc>
+        </param>
+        <param>
+          <type>string</type>
+          <name>property_name</name>
+          <desc>Name of property by which the array is to be sorted</desc>
+        </param>
+        <param>
+          <type>bool</type>
+          <name>descending</name>
+          <desc>If true, elements are sorted in descending (highest to lowest) order. Otherwise ascending order.</desc>
+        </param>
+      </params>
+    </syntax>
+    <desc>Sorts an array of proplists by a property. All elements must be proplists. Properties should be either all strings or all integer. If a property is not assigned, it is assumed to be integer zero.</desc>
+    <related>
+      <funclink>SortArray</funclink>
+      <funclink>SortArrayByArrayElement</funclink>
+    </related>
+  </func>
+  <author>Sven2</author><date>2012-12</date>
+</funcs>

masterserver/web/server/index.php

@@ -140,6 +140,17 @@ if ($link && $db) {
 					$version = $row['new_version'];
 					if ($version) {
 						$message .= 'Version=' . $version . PHP_EOL;
+						// strip build version from client request
+						$n = 0;
+						for($i=0;$i<strlen($client_version);$i++){
+							if($client_version[$i]=='.'){
+								$n++;
+								if($n>=3){
+									break;
+								}
+							}
+						}
+						$client_version = substr($client_version,0,$i);
 						if (version_compare($client_version, $version) < 0) { //We need to update
 							$result = mysql_query('SELECT `file` FROM `' . $prefix . 'update` WHERE `old_version` = \'' . $client_version . '\' AND `platform` = \'' . $platform . '\'');
 							$row = mysql_fetch_assoc($result);

planet/.gitattributes

@@ -0,0 +1,2 @@
+* -crlf
+

planet/Arena.ocf/Folder.txt

@@ -0,0 +1,2 @@
+[Head]
+Index=4

planet/Arena.ocf/FrozenFortress.ocs/Scenario.txt

@@ -3,7 +3,7 @@ Icon=13
 Title=FrozenFortress
 Version=5,2,0,1
 MinPlayer=2
-MaxPlayer=8
+Difficulty=80
 
 [Definitions]
 Definition1=Objects.ocd

planet/Arena.ocf/FrozenFortress.ocs/Script.c

@@ -14,14 +14,14 @@ protected func Initialize()
 	var time=CreateObject(Environment_Time);
 	time->SetTime();
 	time->SetCycleSpeed();
-	FindObject(Find_ID(Moon))->SetPhase(3);
+	FindObject(Find_ID(Moon))->SetMoonPhase(3);
 	FindObject(Find_ID(Moon))->SetCon(150);
 	FindObject(Find_ID(Moon))->SetPosition(LandscapeWidth()/2,150);
 
 	// Goal: Capture the flag, with bases in both hideouts.
 	var goal = CreateObject(Goal_CaptureTheFlag, 0, 0, NO_OWNER);
-	goal->SetFlagBase(1, 135, 264);
-	goal->SetFlagBase(2, LandscapeWidth() - 135, 264);
+	goal->SetFlagBase(1, 135, 266);
+	goal->SetFlagBase(2, LandscapeWidth() - 135, 266);
 	CreateObject(Rule_KillLogs);	
 	
 	var gate = CreateObject(StoneDoor, 345, 272, NO_OWNER);
@@ -34,16 +34,21 @@ protected func Initialize()
 	// Chests with weapons.
 	var chest;
 	chest = CreateObject(Chest, 60, 220, NO_OWNER);
+	chest->MakeInvincible();
 	AddEffect("FillBaseChest", chest, 100, 7 * 36,nil,nil,false);
 	chest = CreateObject(Chest, 150, 370, NO_OWNER);
+	chest->MakeInvincible();
 	AddEffect("FillBaseChest", chest, 100, 7 * 36,nil,nil,true);
 	chest = CreateObject(Chest, LandscapeWidth() - 60, 220, NO_OWNER);
+	chest->MakeInvincible();
 	AddEffect("FillBaseChest", chest, 100, 7 * 36,nil,nil,false);
 	chest = CreateObject(Chest, LandscapeWidth() - 150, 370, NO_OWNER);
+	chest->MakeInvincible();
 	AddEffect("FillBaseChest", chest, 100, 7 * 36,nil,nil,true);
 
 	
 	chest = CreateObject(Chest, LandscapeWidth()/2, 320, NO_OWNER);
+	chest->MakeInvincible();
 	AddEffect("FillOtherChest", chest, 100, 5 * 36);
 	
 	AddEffect("SnowyWinter", nil, 100, 1);

planet/Arena.ocf/FrozenFortress.ocs/Scrolls.ocd/FrostboltScroll.ocd/Script.c

@@ -45,7 +45,9 @@ public func FxFrostboltTimer(pTarget, effect, iEffectTime)
 	 	)
 	{
 		CreateObject(Dynamite,x,y,effect.owner)->BlueExplode();
-		CreateObject(Star,x,y,-1)->Sound("GlassShatter");
+		var dummy = CreateObject(Dummy,x,y,-1);
+		dummy->Sound("GlassShatter");
+		ScheduleCall(dummy, "RemoveObject", 36);
 		for(var i=0; i<=60;i++)
 		{
 			var r=Random(10)+Random(18);

planet/Arena.ocf/FrozenFortress.ocs/System.ocg/StoneDoor.c

@@ -2,8 +2,6 @@
 
 #appendto StoneDoor
 
-private func GetStrength() { return 300; }
-
 protected func Damage()
 {
 	// Destroy if damage above strength.