forked from Mirrors/openclonk
OK, merge default
commit
603af91211
104
CMakeLists.txt
104
CMakeLists.txt
|
@ -24,7 +24,8 @@
|
|||
# See clonk_trademark_license.txt for full license.
|
||||
|
||||
cmake_minimum_required (VERSION 2.6.0)
|
||||
project (clonk CXX C)
|
||||
project (openclonk CXX C)
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
include(Version.txt)
|
||||
|
||||
|
@ -45,7 +46,7 @@ option(USE_GL "Enable OpenGL support" ON)
|
|||
SET(INITIAL_USE_SDL_MAINLOOP_VALUE OFF)
|
||||
SET(INITIAL_USE_OPEN_AL OFF)
|
||||
option(USE_SDL_MAINLOOP "Use SDL to create windows etc." ${INITIAL_USE_SDL_MAINLOOP_VALUE})
|
||||
if(WIN32)
|
||||
if(WIN32 AND FALSE) # disable DX option while it doesn't work anyway
|
||||
option(USE_DIRECTX "Enable DirectX support" ON)
|
||||
if(EXISTS $ENV{DXSDK_DIR})
|
||||
list(APPEND CMAKE_INCLUDE_PATH $ENV{DXSDK_DIR}/Include)
|
||||
|
@ -57,12 +58,9 @@ if(WIN32)
|
|||
else()
|
||||
|
||||
endif()
|
||||
|
||||
option(GENERATE_MINI_DUMP "Generate a minidump on crash" ON)
|
||||
else()
|
||||
SET(USE_DIRECTX OFF)
|
||||
SET(HAVE_FMOD OFF)
|
||||
SET(GENERATE_MINI_DUMP OFF)
|
||||
endif()
|
||||
if(NOT USE_GL AND NOT USE_DIRECTX)
|
||||
message(STATUS "No graphics display enabled; building dedicated server")
|
||||
|
@ -143,6 +141,9 @@ if(MSVC_VERSION)
|
|||
list(APPEND OC_CXX_FLAGS "/wd4267")
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
list(APPEND OC_CXX_FLAGS "-Wall -Wextra -Wredundant-decls -Wendif-labels -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Winit-self -Wsign-promo -Wno-reorder -Wno-unused-parameter -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo")
|
||||
endif()
|
||||
############################################################################
|
||||
# List target source files. Don't directly create a target since we condi-
|
||||
# tionally add more sources depending on configuration options later.
|
||||
|
@ -160,9 +161,9 @@ set(OC_CLONK_SOURCES
|
|||
src/C4Globals.cpp
|
||||
src/C4GraphicsSystem.cpp
|
||||
src/C4GraphicsSystem.h
|
||||
src/c4group/C4Components.h
|
||||
src/c4group/C4ComponentHost.cpp
|
||||
src/c4group/C4ComponentHost.h
|
||||
src/c4group/C4Components.h
|
||||
src/c4group/C4Extra.cpp
|
||||
src/c4group/C4Extra.h
|
||||
src/c4group/C4Group.cpp
|
||||
|
@ -209,9 +210,9 @@ set(OC_CLONK_SOURCES
|
|||
src/control/C4Teams.cpp
|
||||
src/control/C4Teams.h
|
||||
src/editor/C4Console.cpp
|
||||
src/editor/C4Console.h
|
||||
src/editor/C4ConsoleGUI.h
|
||||
src/editor/C4ConsoleGUICommon.h
|
||||
src/editor/C4ConsoleGUI.h
|
||||
src/editor/C4Console.h
|
||||
src/editor/C4DevmodeDlg.cpp
|
||||
src/editor/C4DevmodeDlg.h
|
||||
src/editor/C4EditCursor.cpp
|
||||
|
@ -224,8 +225,8 @@ set(OC_CLONK_SOURCES
|
|||
src/game/C4Physics.h
|
||||
src/game/landscape/C4Landscape.cpp
|
||||
src/game/landscape/C4Landscape.h
|
||||
src/game/landscape/C4LandscapeRender.cpp
|
||||
src/game/landscape/C4LandscapeRenderClassic.cpp
|
||||
src/game/landscape/C4LandscapeRender.cpp
|
||||
src/game/landscape/C4LandscapeRender.h
|
||||
src/game/landscape/C4Map.cpp
|
||||
src/game/landscape/C4MapCreatorS2.cpp
|
||||
|
@ -261,9 +262,9 @@ set(OC_CLONK_SOURCES
|
|||
src/game/object/C4Def.cpp
|
||||
src/game/object/C4DefGraphics.cpp
|
||||
src/game/object/C4DefGraphics.h
|
||||
src/game/object/C4Def.h
|
||||
src/game/object/C4DefList.cpp
|
||||
src/game/object/C4DefList.h
|
||||
src/game/object/C4Def.h
|
||||
src/game/object/C4GameObjects.cpp
|
||||
src/game/object/C4GameObjects.h
|
||||
src/game/object/C4Id.cpp
|
||||
|
@ -287,9 +288,9 @@ set(OC_CLONK_SOURCES
|
|||
src/game/object/C4ObjectList.h
|
||||
src/game/object/C4ObjectMenu.cpp
|
||||
src/game/object/C4ObjectMenu.h
|
||||
src/game/object/C4ObjectScript.cpp
|
||||
src/game/object/C4ObjectPtr.cpp
|
||||
src/game/object/C4ObjectPtr.h
|
||||
src/game/object/C4ObjectScript.cpp
|
||||
src/game/object/C4Sector.cpp
|
||||
src/game/object/C4Sector.h
|
||||
src/game/object/C4Shape.cpp
|
||||
|
@ -383,6 +384,8 @@ set(OC_CLONK_SOURCES
|
|||
src/lib/C4LogBuf.h
|
||||
src/lib/C4Log.cpp
|
||||
src/lib/C4Log.h
|
||||
src/lib/C4Markup.cpp
|
||||
src/lib/C4Markup.h
|
||||
src/lib/C4NameList.cpp
|
||||
src/lib/C4NameList.h
|
||||
src/lib/C4Random.cpp
|
||||
|
@ -407,15 +410,13 @@ set(OC_CLONK_SOURCES
|
|||
src/lib/StdColors.h
|
||||
src/lib/StdCompiler.cpp
|
||||
src/lib/StdCompiler.h
|
||||
src/lib/StdMarkup.cpp
|
||||
src/lib/StdMarkup.h
|
||||
src/lib/StdMesh.cpp
|
||||
src/lib/StdMesh.h
|
||||
src/lib/StdMeshLoader.h
|
||||
src/lib/StdMeshLoaderBinary.cpp
|
||||
src/lib/StdMeshLoaderBinaryChunks.cpp
|
||||
src/lib/StdMeshLoaderBinaryChunks.h
|
||||
src/lib/StdMeshLoaderBinary.cpp
|
||||
src/lib/StdMeshLoaderDataStream.h
|
||||
src/lib/StdMeshLoader.h
|
||||
src/lib/StdMeshLoaderXml.cpp
|
||||
src/lib/StdMeshMaterial.cpp
|
||||
src/lib/StdMeshMaterial.h
|
||||
|
@ -430,8 +431,7 @@ set(OC_CLONK_SOURCES
|
|||
src/lib/texture/C4Facet.h
|
||||
src/lib/texture/C4GraphicsResource.cpp
|
||||
src/lib/texture/C4GraphicsResource.h
|
||||
src/lib/texture/C4Surface.cpp
|
||||
src/lib/texture/C4Surface.h
|
||||
src/lib/texture/C4SurfaceLoaders.cpp
|
||||
src/lib/texture/StdPNG.cpp
|
||||
src/lib/texture/StdPNG.h
|
||||
src/network/C4Client.cpp
|
||||
|
@ -469,6 +469,9 @@ set(OC_CLONK_SOURCES
|
|||
src/network/C4PacketBase.h
|
||||
src/platform/Bitmap256.cpp
|
||||
src/platform/Bitmap256.h
|
||||
src/platform/C4App.cpp
|
||||
src/platform/C4App.h
|
||||
src/platform/C4AppT.cpp
|
||||
src/platform/C4FileMonitor.cpp
|
||||
src/platform/C4FileMonitor.h
|
||||
src/platform/C4Fonts.cpp
|
||||
|
@ -479,29 +482,28 @@ set(OC_CLONK_SOURCES
|
|||
src/platform/C4MusicFile.h
|
||||
src/platform/C4MusicSystem.cpp
|
||||
src/platform/C4MusicSystem.h
|
||||
src/platform/C4SoundLoaders.cpp
|
||||
src/platform/C4SoundLoaders.h
|
||||
src/platform/C4SoundSystem.cpp
|
||||
src/platform/C4SoundSystem.h
|
||||
src/platform/C4SoundLoaders.h
|
||||
src/platform/C4SoundLoaders.cpp
|
||||
src/platform/StdTApp.cpp
|
||||
src/platform/C4Surface.cpp
|
||||
src/platform/C4Surface.h
|
||||
src/platform/C4Video.cpp
|
||||
src/platform/C4Video.h
|
||||
src/platform/C4VideoPlayback.cpp
|
||||
src/platform/C4VideoPlayback.h
|
||||
src/platform/C4ViewportWindow.cpp
|
||||
src/platform/C4ViewportWindow.h
|
||||
src/platform/C4Window.h
|
||||
src/platform/C4windowswrapper.h
|
||||
src/platform/GetTime.cpp
|
||||
src/platform/PlatformAbstraction.h
|
||||
src/platform/StdApp.h
|
||||
src/platform/StdAppCommon.cpp
|
||||
src/platform/StdD3D.cpp
|
||||
src/platform/StdD3D.h
|
||||
src/platform/StdD3DShader.cpp
|
||||
src/platform/StdD3DShader.h
|
||||
src/platform/StdDDraw2.cpp
|
||||
src/platform/StdDDraw2.h
|
||||
src/platform/StdFacet.h
|
||||
src/platform/StdFile.cpp
|
||||
src/platform/StdFile.h
|
||||
src/platform/StdFont.cpp
|
||||
|
@ -515,20 +517,17 @@ set(OC_CLONK_SOURCES
|
|||
src/platform/StdRegistry.h
|
||||
src/platform/StdScheduler.cpp
|
||||
src/platform/StdScheduler.h
|
||||
src/platform/StdSurface2.cpp
|
||||
src/platform/StdSurface2.h
|
||||
src/platform/StdSurface8.cpp
|
||||
src/platform/StdSurface8.h
|
||||
src/platform/StdSync.h
|
||||
src/platform/StdVideo.cpp
|
||||
src/platform/StdVideo.h
|
||||
src/platform/StdWindow.h
|
||||
src/script/C4Aul.cpp
|
||||
src/script/C4AulExec.h
|
||||
src/script/C4AulExec.cpp
|
||||
src/script/C4AulDebug.h
|
||||
src/script/C4AulDebug.cpp
|
||||
src/script/C4AulDebug.h
|
||||
src/script/C4AulDefFunc.h
|
||||
src/script/C4AulExec.cpp
|
||||
src/script/C4AulExec.h
|
||||
src/script/C4Aul.h
|
||||
src/script/C4AulLink.cpp
|
||||
src/script/C4AulParse.cpp
|
||||
|
@ -539,21 +538,22 @@ set(OC_CLONK_SOURCES
|
|||
src/script/C4ScriptHost.h
|
||||
src/script/C4StringTable.cpp
|
||||
src/script/C4StringTable.h
|
||||
src/script/C4Value.cpp
|
||||
src/script/C4Value.h
|
||||
src/script/C4ValueArray.cpp
|
||||
src/script/C4ValueArray.h
|
||||
src/script/C4Value.cpp
|
||||
src/script/C4Value.h
|
||||
src/script/C4ValueMap.cpp
|
||||
src/script/C4ValueMap.h
|
||||
src/zlib/gzio.c
|
||||
src/zlib/zutil.h
|
||||
|
||||
)
|
||||
mark_as_advanced(OC_CLONK_SOURCES)
|
||||
mark_as_advanced(OC_SYSTEM_SOURCES)
|
||||
|
||||
if(WIN32)
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/platform/StdWindow.cpp
|
||||
src/platform/C4WindowWin32.cpp
|
||||
src/platform/StdJoystick.cpp
|
||||
src/platform/StdJoystick.h
|
||||
src/platform/C4CrashHandlerWin32.cpp
|
||||
|
@ -585,14 +585,14 @@ if(WIN32)
|
|||
endif(MINGW)
|
||||
elseif(USE_SDL_MAINLOOP)
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/platform/StdSDLApp.cpp
|
||||
src/platform/StdSDLWindow.cpp
|
||||
src/platform/C4AppSDL.cpp
|
||||
src/platform/C4WindowSDL.cpp
|
||||
)
|
||||
elseif(USE_X11)
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/platform/StdXApp.cpp
|
||||
src/platform/StdXWindow.cpp
|
||||
src/platform/StdXPrivate.h
|
||||
src/platform/C4AppX.cpp
|
||||
src/platform/C4WindowX.cpp
|
||||
src/platform/C4AppXImpl.h
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -602,9 +602,9 @@ endif()
|
|||
|
||||
if(APPLE)
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/platform/StdMacApp.mm
|
||||
src/platform/C4AppMac.mm
|
||||
src/platform/C4FileMonitorMac.mm
|
||||
src/platform/StdMacWindow.mm
|
||||
src/platform/C4WindowMac.mm
|
||||
src/platform/ClonkAppDelegate.h
|
||||
src/platform/ClonkAppDelegate.mm
|
||||
)
|
||||
|
@ -642,8 +642,8 @@ if(USE_GTK)
|
|||
)
|
||||
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/platform/StdGtkWindow.cpp
|
||||
src/platform/StdGtkWindow.h
|
||||
src/platform/C4WindowGTK.cpp
|
||||
src/platform/C4WindowGTK.h
|
||||
src/editor/C4ConsoleGTK.cpp
|
||||
)
|
||||
endif()
|
||||
|
@ -793,7 +793,7 @@ FIND_PATH(OPENSSL_INCLUDE_DIR NAMES openssl/sha.h)
|
|||
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||
|
||||
if(USE_CONSOLE)
|
||||
include(./FindReadline.cmake)
|
||||
find_package(Readline)
|
||||
include_directories(${READLINE_INCLUDE_DIRS})
|
||||
SET(HAVE_LIBREADLINE ${READLINE_FOUND} CACHE INTERNAL "libreadline available")
|
||||
endif()
|
||||
|
@ -886,7 +886,7 @@ add_executable(c4group
|
|||
src/c4group/C4Update.cpp
|
||||
src/lib/Standard.cpp
|
||||
src/c4group/CStdFile.cpp
|
||||
src/lib/StdMarkup.cpp
|
||||
src/lib/C4Markup.cpp
|
||||
src/lib/StdBuf.cpp
|
||||
src/lib/StdCompiler.cpp
|
||||
src/platform/StdFile.cpp
|
||||
|
@ -920,8 +920,8 @@ add_executable(c4script
|
|||
src/lib/StdBuf.h
|
||||
src/lib/StdCompiler.cpp
|
||||
src/lib/StdCompiler.h
|
||||
src/lib/StdMarkup.cpp
|
||||
src/lib/StdMarkup.h
|
||||
src/lib/C4Markup.cpp
|
||||
src/lib/C4Markup.h
|
||||
src/lib/StdResStr2.cpp
|
||||
src/lib/StdResStr2.h
|
||||
src/platform/GetTime.cpp
|
||||
|
@ -1073,7 +1073,7 @@ endforeach()
|
|||
# Precompiled header support, gcc part (it needs the cxx flags)
|
||||
############################################################################
|
||||
|
||||
include(GccPchSupport.cmake)
|
||||
include(GccPchSupport)
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
if(NOT DEFINED USE_GCC_PCH)
|
||||
message("Using GCC precompiled headers! USE_GCC_PCH=Off to disable.")
|
||||
|
@ -1107,11 +1107,13 @@ CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
|
|||
add_subdirectory(thirdparty/tinyxml)
|
||||
target_link_libraries(clonk tinyxml)
|
||||
|
||||
if(GENERATE_MINI_DUMP)
|
||||
FIND_PATH(DBGHELP_INCLUDE_DIR NAMES dbghelp.h)
|
||||
FINDLIB(DBGHELP_LIBRARIES NAMES dbghelp)
|
||||
target_link_libraries(clonk ${DBGHELP_LIBRARIES})
|
||||
include_directories(${DBGHELP_INCLUDE_DIR})
|
||||
if(WIN32)
|
||||
find_package(DbgHelp)
|
||||
if(DBGHELP_FOUND)
|
||||
target_link_libraries(clonk ${DBGHELP_LIBRARIES})
|
||||
include_directories(${DBGHELP_INCLUDE_DIR})
|
||||
endif()
|
||||
set(HAVE_DBGHELP ${DBGHELP_FOUND})
|
||||
endif()
|
||||
|
||||
if(USE_GL)
|
||||
|
|
38
Makefile.am
38
Makefile.am
|
@ -25,20 +25,18 @@ noinst_LIBRARIES = lib.a
|
|||
|
||||
# Some defines and warning options
|
||||
if RECENT_GCC
|
||||
GCC_FLAGS = -pipe
|
||||
WARNING_FLAGS = -Wall -Wextra -Wredundant-decls -Wendif-labels -Wpointer-arith \
|
||||
-Wcast-qual -Wcast-align -Wwrite-strings -Winit-self -Wsign-promo \
|
||||
-Wno-reorder -Wno-unused-parameter -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo
|
||||
##-Wmissing-format-attribute -Wdisabled-optimization -Wlogical-op
|
||||
##-Weffc++ -Wold-style-cast -Woverloaded-virtual -Wunsafe-loop-optimizations
|
||||
else
|
||||
GCC_FLAGS =
|
||||
WARNING_FLAGS = -Wall
|
||||
endif
|
||||
|
||||
AM_CXXFLAGS = $(PTHREAD_CFLAGS) $(WINDOWS_CFLAGS) $(WARNING_FLAGS) $(GCC_FLAGS)
|
||||
AM_CXXFLAGS = $(PTHREAD_CFLAGS) $(WINDOWS_CFLAGS) $(WARNING_FLAGS)
|
||||
|
||||
AM_CFLAGS = -Wall $(GCC_FLAGS)
|
||||
AM_CFLAGS = -Wall
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(builddir) \
|
||||
|
@ -128,8 +126,8 @@ src/lib/StdBuf.cpp \
|
|||
src/lib/StdBuf.h \
|
||||
src/lib/StdCompiler.cpp \
|
||||
src/lib/StdCompiler.h \
|
||||
src/lib/StdMarkup.cpp \
|
||||
src/lib/StdMarkup.h \
|
||||
src/lib/C4Markup.cpp \
|
||||
src/lib/C4Markup.h \
|
||||
src/lib/StdResStr2.cpp \
|
||||
src/lib/StdResStr2.h \
|
||||
src/network/C4NetIO.cpp \
|
||||
|
@ -404,8 +402,7 @@ src/lib/texture/C4FacetEx.h \
|
|||
src/lib/texture/C4Facet.h \
|
||||
src/lib/texture/C4GraphicsResource.cpp \
|
||||
src/lib/texture/C4GraphicsResource.h \
|
||||
src/lib/texture/C4Surface.cpp \
|
||||
src/lib/texture/C4Surface.h \
|
||||
src/lib/texture/C4SurfaceLoaders.cpp \
|
||||
src/lib/texture/StdPNG.cpp \
|
||||
src/lib/texture/StdPNG.h \
|
||||
src/network/C4Client.cpp \
|
||||
|
@ -464,15 +461,14 @@ src/platform/C4ViewportWindow.cpp \
|
|||
src/platform/C4ViewportWindow.h \
|
||||
src/platform/C4windowswrapper.h \
|
||||
src/platform/PlatformAbstraction.h \
|
||||
src/platform/StdApp.h \
|
||||
src/platform/StdAppCommon.cpp \
|
||||
src/platform/C4App.h \
|
||||
src/platform/C4App.cpp \
|
||||
src/platform/StdD3D.cpp \
|
||||
src/platform/StdD3D.h \
|
||||
src/platform/StdD3DShader.cpp \
|
||||
src/platform/StdD3DShader.h \
|
||||
src/platform/StdDDraw2.cpp \
|
||||
src/platform/StdDDraw2.h \
|
||||
src/platform/StdFacet.h \
|
||||
src/platform/StdFont.cpp \
|
||||
src/platform/StdFont.h \
|
||||
src/platform/StdGL.cpp \
|
||||
|
@ -480,15 +476,15 @@ src/platform/StdGLCtx.cpp \
|
|||
src/platform/StdGL.h \
|
||||
src/platform/StdNoGfx.cpp \
|
||||
src/platform/StdNoGfx.h \
|
||||
src/platform/StdSurface2.cpp \
|
||||
src/platform/StdSurface2.h \
|
||||
src/platform/C4Surface.cpp \
|
||||
src/platform/C4Surface.h \
|
||||
src/platform/StdSurface8.cpp \
|
||||
src/platform/StdSurface8.h \
|
||||
src/platform/StdSync.h \
|
||||
src/platform/StdTApp.cpp \
|
||||
src/platform/C4AppT.cpp \
|
||||
src/platform/StdVideo.cpp \
|
||||
src/platform/StdVideo.h \
|
||||
src/platform/StdWindow.h \
|
||||
src/platform/C4Window.h \
|
||||
src/res/Brush.h \
|
||||
src/res/Cursor.h \
|
||||
src/res/Dynamic.h \
|
||||
|
@ -544,9 +540,9 @@ src/platform/StdJoystick.h
|
|||
endif
|
||||
if MACOSX
|
||||
clonk_SOURCES += \
|
||||
src/platform/StdMacApp.mm \
|
||||
src/platform/C4AppMac.mm \
|
||||
src/platform/C4FileMonitorMac.mm \
|
||||
src/platform/StdMacWindow.mm \
|
||||
src/platform/C4WindowMac.mm \
|
||||
src/platform/ClonkAppDelegate.h \
|
||||
src/platform/ClonkAppDelegate.mm \
|
||||
src/platform/ConsoleWindowController.h \
|
||||
|
@ -561,16 +557,16 @@ src/platform/ClonkMainMenuActions.h \
|
|||
src/platform/ClonkMainMenuActions.mm
|
||||
endif
|
||||
if SDL_MAIN_LOOP
|
||||
clonk_SOURCES += src/platform/StdSDLApp.cpp src/platform/StdSDLWindow.cpp
|
||||
clonk_SOURCES += src/platform/C4AppSDL.cpp src/platform/C4WindowSDL.cpp
|
||||
else
|
||||
if WIN32
|
||||
clonk_SOURCES += src/platform/StdWindow.cpp
|
||||
clonk_SOURCES += src/platform/C4WindowWin32.cpp
|
||||
else
|
||||
clonk_SOURCES += src/platform/StdXApp.cpp src/platform/StdXWindow.cpp src/platform/StdXPrivate.h
|
||||
clonk_SOURCES += src/platform/C4AppX.cpp src/platform/C4WindowX.cpp src/platform/C4AppXImpl.h
|
||||
endif
|
||||
endif
|
||||
if DEVELOPER_MODE
|
||||
clonk_SOURCES += src/platform/StdGtkWindow.cpp src/platform/StdGtkWindow.h src/editor/C4ConsoleGTK.cpp
|
||||
clonk_SOURCES += src/platform/C4WindowGTK.cpp src/platform/C4WindowGTK.h src/editor/C4ConsoleGTK.cpp
|
||||
endif
|
||||
|
||||
clonk_LDADD = \
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
# - Find DbgHelp
|
||||
# Find the DbgHelp library
|
||||
# This module defines
|
||||
# DBGHELP_INCLUDE_DIR, where to find dbghelp.h, etc.
|
||||
# DBGHELP_LIBRARIES, the libraries needed to use DbgHelp.
|
||||
# DBGHELP_FOUND, If false, do not try to use DbgHelp.
|
||||
|
||||
#=============================================================================
|
||||
# OpenClonk, http://www.openclonk.org
|
||||
#
|
||||
# Copyright (c) 2011 Nicolas Hake
|
||||
#
|
||||
# Permission to use, copy, modify, and/or distribute this software for any
|
||||
# purpose with or without fee is hereby granted, provided that the above
|
||||
# copyright notice and this permission notice appear in all copies.
|
||||
# See isc_license.txt for full license and disclaimer.
|
||||
#
|
||||
# "Clonk" is a registered trademark of Matthes Bender.
|
||||
# See clonk_trademark_license.txt for full license.
|
||||
#=============================================================================
|
||||
|
||||
find_path(DBGHELP_INCLUDE_DIR NAMES dbghelp.h)
|
||||
set(DBGHELP_NAMES ${DBGHELP_NAMES} dbghelp)
|
||||
find_library(DBGHELP_LIBRARY NAMES ${DBGHELP_NAMES})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBGHELP DEFAULT_MSG DBGHELP_LIBRARY DBGHELP_INCLUDE_DIR)
|
||||
|
||||
if(DBGHELP_FOUND)
|
||||
set(DBGHELP_LIBRARIES ${DBGHELP_LIBRARY})
|
||||
endif()
|
||||
|
||||
mark_as_advanced(DBGHELP_LIBRARY DBGHELP_INCLUDE_DIR)
|
|
@ -209,4 +209,4 @@
|
|||
#cmakedefine HAVE_STATIC_ASSERT 1
|
||||
|
||||
/* Generate minidumps on crash */
|
||||
#cmakedefine GENERATE_MINI_DUMP 1
|
||||
#cmakedefine HAVE_DBGHELP 1
|
||||
|
|
|
@ -35,6 +35,12 @@
|
|||
<name>on_ending</name>
|
||||
<desc>
|
||||
Specifies what happens once end is reached. There are the following possibilities:
|
||||
<table>
|
||||
<rowh><col>Constant</col><col>Value</col><col>Description</col></rowh>
|
||||
<row><col>ANIM_Loop</col><col>0</col><col>Once end is reached the value is reset to begin so the cycle restarts.</col></row>
|
||||
<row><col>ANIM_Hold</col><col>1</col><col>Once end is reached the value remains constant.</col></row>
|
||||
<row><col>ANIM_Remove</col><col>2</col><col>Once end is reached the corresponding animation is removed the same way as if <funclink>AnimationStop</funclink> were called to the exact point in time. For combination nodes the child node with the smaller weight is removed.</col></row>
|
||||
</table>
|
||||
</desc>
|
||||
</param>
|
||||
</params>
|
||||
|
|
|
@ -23,7 +23,8 @@
|
|||
</param>
|
||||
</params>
|
||||
</syntax>
|
||||
<desc>Adds or removes an object (usually a clonk) to or from the crew of a player. The object must have the CrewMember property set in the DefCore.</desc>
|
||||
<desc>Adds or removes an object (usually a clonk) to or from the crew of a player. The object must have the CrewMember property set in the DefCore.
|
||||
This does not add the object to the permanent crew of the player, use <funclink>MakeCrewMember</funclink> for that.</desc>
|
||||
<examples>
|
||||
<example>
|
||||
<code>var nClonk = <funclink>CreateObject</funclink>(Clonk);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Head]
|
||||
Icon=39
|
||||
Title=Boomrace
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MaxPlayer=8
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=ArrowWheel
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Structure
|
||||
Width=16
|
||||
Height=16
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=BrickEdge
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_MouseIgnore
|
||||
Width=10
|
||||
Height=10
|
||||
|
|
|
@ -30,7 +30,7 @@ func Initialize()
|
|||
var c=goal->AddCheckpoint(1000, 100, mode);
|
||||
c->SetCPSize(40);
|
||||
var door=CreateObject(StoneDoor, 135, 60, NO_OWNER);
|
||||
door->CloseGateDoor();
|
||||
door->CloseDoor();
|
||||
AddEffect("AutoOpen",door,100,100);
|
||||
goal->SetFinishpoint(100, 150, true);
|
||||
|
||||
|
@ -83,7 +83,7 @@ global func FxAutoOpenTimer(object pTarget, effect, int timer)
|
|||
{
|
||||
if(FindObject(Find_ID(Plane),Find_InRect(0,0,2000,500)))
|
||||
{
|
||||
pTarget->OpenGateDoor();
|
||||
pTarget->OpenDoor();
|
||||
return -1;
|
||||
}
|
||||
else return 1;
|
||||
|
@ -149,7 +149,7 @@ protected func Doors()
|
|||
var gate = CreateObject(StoneDoor, 865, 1195, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 1045, 1165, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 1155, 1026, NO_OWNER);
|
||||
|
@ -157,54 +157,54 @@ protected func Doors()
|
|||
var straw = CreateObject(DoorTarget,1850,820,NO_OWNER);
|
||||
straw->SetGate(gate);
|
||||
straw->SetAction("Float");
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 1875, 761, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 1752, 1148, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 1875, 864, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 1116, 1038, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 3115, 685, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 3140, 588, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 585, 915, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 853, 681, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 345, 740, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 60, 644, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 1935, 550, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 1900, 565, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
AddEffect("SparklingAttention",wheel,100,100);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 2965, 310, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 3260, 328, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
|
||||
var gate = CreateObject(StoneDoor, 3285, 1150, NO_OWNER);
|
||||
var wheel = CreateObject(SpinWheel, 3220, 1200, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
gate->CloseGateDoor();
|
||||
gate->CloseDoor();
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=StoneDoor
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Structure
|
||||
Width=10
|
||||
Height=40
|
||||
|
|
|
@ -7,14 +7,14 @@ protected func Initialize()
|
|||
return;
|
||||
}
|
||||
|
||||
public func OpenGateDoor()
|
||||
public func OpenDoor()
|
||||
{
|
||||
AddEffect("IntMoveGateUp", this, 100, 1, this);
|
||||
Sound("GateMove");
|
||||
return;
|
||||
}
|
||||
|
||||
public func CloseGateDoor()
|
||||
public func CloseDoor()
|
||||
{
|
||||
AddEffect("IntMoveGateDown", this, 100, 1, this);
|
||||
Sound("GateMove");
|
||||
|
|
|
@ -8,7 +8,7 @@ public func ControlUp(object clonk)
|
|||
if(GetEffect("SparklingAttention",this)) RemoveEffect("SparklingAttention",this);
|
||||
if (GetAction() == "Still" && targetdoor)
|
||||
{
|
||||
targetdoor->OpenGateDoor();
|
||||
targetdoor->OpenDoor();
|
||||
SetAction("SpinLeft");
|
||||
Sound("Chain.ogg");
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ public func Burst()
|
|||
{
|
||||
DrawParticleLine("Straw",0,0,AbsX(gate->GetX()),AbsY(gate->GetY()),6,80,RGB(255,255,255),RGB(255,150,200));
|
||||
RemoveObject();
|
||||
gate->OpenGateDoor();
|
||||
gate->OpenDoor();
|
||||
CastParticles("Straw",130,30,0,-3,30,40,RGB(255,255,255),RGB(255,120,200));
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Head]
|
||||
Icon=34
|
||||
Title=Cavern
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MaxPlayer=12
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Goal_FlagMeshes
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=30
|
||||
Height=40
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Head]
|
||||
Icon=13
|
||||
Title=FrozenFortress
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
MaxPlayer=8
|
||||
|
||||
|
|
|
@ -24,12 +24,12 @@ protected func Initialize()
|
|||
goal->SetFlagBase(2, LandscapeWidth() - 135, 264);
|
||||
CreateObject(Rule_KillLogs);
|
||||
|
||||
var gate = CreateObject(StoneDoor, 345, 273, NO_OWNER);
|
||||
gate->SetClrModulation(RGB(180,205,255));
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 1);
|
||||
var gate = CreateObject(StoneDoor, LandscapeWidth()-344, 273, NO_OWNER);
|
||||
gate->SetClrModulation(RGB(180,205,255));
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 2);
|
||||
var gate = CreateObject(StoneDoor, 345, 272, NO_OWNER);
|
||||
gate->SetClrModulation(RGB(140,185,255));
|
||||
gate->SetAutoControl(1);
|
||||
var gate = CreateObject(StoneDoor, LandscapeWidth()-344, 272, NO_OWNER);
|
||||
gate->SetClrModulation(RGB(140,185,255));
|
||||
gate->SetAutoControl(2);
|
||||
|
||||
// Chests with weapons.
|
||||
var chest;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=FrostboltScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=HardeningScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=WindScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -2,85 +2,17 @@
|
|||
|
||||
#appendto StoneDoor
|
||||
|
||||
private func GetStrength() { return 300; }
|
||||
|
||||
protected func Damage()
|
||||
{
|
||||
if (GetDamage() > 300)
|
||||
// Destroy if damage above strength.
|
||||
if (GetDamage() > GetStrength())
|
||||
{
|
||||
if (!this)
|
||||
return false;
|
||||
var ctr = Contained();
|
||||
// Transfer all contents to container.
|
||||
while (Contents())
|
||||
if (!ctr || !Contents()->Enter(ctr))
|
||||
Contents()->Exit();
|
||||
// Split components.
|
||||
for (var i = 0, compid; compid = GetComponent(nil, i); ++i)
|
||||
for (var j = 0; j < GetComponent(compid); ++j)
|
||||
{
|
||||
var comp = CreateObject(compid, nil, nil, GetOwner());
|
||||
if (OnFire()) comp->Incinerate();
|
||||
if (!ctr || !comp->Enter(ctr))
|
||||
{
|
||||
comp->SetR(Random(360));
|
||||
comp->SetXDir(Random(3) - 1);
|
||||
comp->SetYDir(Random(3) - 1);
|
||||
comp->SetRDir(Random(3) - 1);
|
||||
comp->SetClrModulation(RGB(130,190,255));//give rocks the color of brick
|
||||
}
|
||||
}
|
||||
RemoveObject();
|
||||
CastObjects(Ice, 5, 20);
|
||||
return RemoveObject();
|
||||
}
|
||||
// Change appearance.
|
||||
DoGraphics();
|
||||
return;
|
||||
}
|
||||
|
||||
private func IsOpen()
|
||||
{
|
||||
if (GBackSolid(0, -20))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private func IsClosed()
|
||||
{
|
||||
if (GBackSolid(0, 19))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Automatically open for team stored in effect var 0.
|
||||
protected func FxAutoControlStart(object target, effect, int temporary, int team)
|
||||
{
|
||||
if (temporary == 0)
|
||||
effect.team = team;
|
||||
return 1;
|
||||
}
|
||||
|
||||
protected func FxAutoControlTimer(object target, effect, int time)
|
||||
{
|
||||
|
||||
var d = 0;
|
||||
if (IsOpen())
|
||||
d = 30;
|
||||
var team = effect.team;
|
||||
var open_door = false;
|
||||
DigFreeRect(target->GetX()-5,target->GetY()-22,10,44);
|
||||
for (var clonk in FindObjects(Find_OCF(OCF_CrewMember), Find_InRect(-50, d - 30, 100, 60)))
|
||||
{
|
||||
var plr = clonk->GetOwner();
|
||||
var plr_team = GetPlayerTeam(plr);
|
||||
if (plr_team == team)
|
||||
open_door = true;
|
||||
else
|
||||
{
|
||||
open_door = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (open_door && IsClosed())
|
||||
OpenGateDoor();
|
||||
if (!open_door && IsOpen())
|
||||
CloseGateDoor();
|
||||
|
||||
return 1;
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Goal_FlagMeshes
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=30
|
||||
Height=40
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=LifeGem
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=PyreGem
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Head]
|
||||
Icon=13
|
||||
Title=Hideout
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
MaxPlayer=8
|
||||
|
||||
|
|
|
@ -24,21 +24,21 @@ protected func Initialize()
|
|||
|
||||
// Doors and spinwheels.
|
||||
var gate, wheel;
|
||||
gate = CreateObject(StoneDoor, 365, 449, NO_OWNER);
|
||||
gate = CreateObject(StoneDoor, 365, 448, NO_OWNER);
|
||||
gate->DoDamage(50); // Upper doors are easier to destroy
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 1);
|
||||
gate = CreateObject(StoneDoor, 341, 585, NO_OWNER);
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 1);
|
||||
gate->SetAutoControl(1);
|
||||
gate = CreateObject(StoneDoor, 341, 584, NO_OWNER);
|
||||
gate->SetAutoControl(1);
|
||||
gate = CreateObject(StoneDoor, 693, 544, NO_OWNER);
|
||||
gate->DoDamage(80); // Middle doors even easier
|
||||
wheel = CreateObject(SpinWheel, 660, 552, NO_OWNER);
|
||||
wheel->SetStoneDoor(gate);
|
||||
|
||||
gate = CreateObject(StoneDoor, LandscapeWidth() - 364, 449, NO_OWNER);
|
||||
gate = CreateObject(StoneDoor, LandscapeWidth() - 364, 448, NO_OWNER);
|
||||
gate->DoDamage(50); // Upper doors are easier to destroy
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 2);
|
||||
gate = CreateObject(StoneDoor, LandscapeWidth() - 340, 585, NO_OWNER);
|
||||
AddEffect("AutoControl", gate, 100, 3, gate, nil, 2);
|
||||
gate->SetAutoControl(2);
|
||||
gate = CreateObject(StoneDoor, LandscapeWidth() - 340, 584, NO_OWNER);
|
||||
gate->SetAutoControl(2);
|
||||
gate = CreateObject(StoneDoor, LandscapeWidth() - 692, 544, NO_OWNER);
|
||||
gate->DoDamage(80); // Middle doors even easier
|
||||
wheel = CreateObject(SpinWheel, LandscapeWidth() - 660, 552, NO_OWNER);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=ShieldGem
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=CrystalShield
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=8
|
||||
Height=7
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=SlowGem
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,84 +0,0 @@
|
|||
// Stone door destructible, and auto control for the base.
|
||||
|
||||
#appendto StoneDoor
|
||||
|
||||
protected func Damage()
|
||||
{
|
||||
if (GetDamage() > 180)
|
||||
{
|
||||
if (!this)
|
||||
return false;
|
||||
var ctr = Contained();
|
||||
// Transfer all contents to container.
|
||||
while (Contents())
|
||||
if (!ctr || !Contents()->Enter(ctr))
|
||||
Contents()->Exit();
|
||||
// Split components.
|
||||
for (var i = 0, compid; compid = GetComponent(nil, i); ++i)
|
||||
for (var j = 0; j < GetComponent(compid); ++j)
|
||||
{
|
||||
var comp = CreateObject(compid, nil, nil, GetOwner());
|
||||
if (OnFire()) comp->Incinerate();
|
||||
if (!ctr || !comp->Enter(ctr))
|
||||
{
|
||||
comp->SetR(Random(360));
|
||||
comp->SetXDir(Random(3) - 1);
|
||||
comp->SetYDir(Random(3) - 1);
|
||||
comp->SetRDir(Random(3) - 1);
|
||||
comp->SetClrModulation(RGB(240,210,200)); //give rocks the color of brick
|
||||
}
|
||||
}
|
||||
RemoveObject();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
private func IsOpen()
|
||||
{
|
||||
if (GBackSolid(0, -20))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private func IsClosed()
|
||||
{
|
||||
if (GBackSolid(0, 19))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Automatically open for team stored in effect var 0.
|
||||
protected func FxAutoControlStart(object target, effect, int temporary, int team)
|
||||
{
|
||||
if (temporary == 0)
|
||||
effect.team = team;
|
||||
return 1;
|
||||
}
|
||||
|
||||
protected func FxAutoControlTimer(object target, effect, int time)
|
||||
{
|
||||
var d = 0;
|
||||
if (IsOpen())
|
||||
d = 30;
|
||||
var team = effect.team;
|
||||
var open_door = false;
|
||||
for (var clonk in FindObjects(Find_OCF(OCF_CrewMember), Find_InRect(-50, d - 30, 100, 60)))
|
||||
{
|
||||
var plr = clonk->GetOwner();
|
||||
var plr_team = GetPlayerTeam(plr);
|
||||
if (plr_team == team)
|
||||
open_door = true;
|
||||
else
|
||||
{
|
||||
open_door = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (open_door && IsClosed())
|
||||
OpenGateDoor();
|
||||
if (!open_door && IsOpen())
|
||||
CloseGateDoor();
|
||||
|
||||
return 1;
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=KingWeapons
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=MoltenMonarch
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Icon=23
|
||||
MinPlayer=2
|
||||
MaxPlayer=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=Overcast
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=FireballScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=TeleportScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=WindScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=Bottom
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
MaxPlayer=4
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=Ruins
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
MaxPlayer=6
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Grass
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Background
|
||||
Width=12
|
||||
Height=7
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=Overcast
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[Head]
|
||||
Title=Overcast
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MinPlayer=2
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=FireballScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=ThunderScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=WindScroll
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=BigBoomattack
|
||||
Version=4,9,10,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
ContactCalls=1
|
||||
Width=60
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Boomattack
|
||||
Version=4,9,10,10
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
ContactCalls=1
|
||||
Width=15
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Goal_SaveTheWindmills
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Width=1
|
||||
Height=1
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[Head]
|
||||
Icon=39
|
||||
Title=Windmill
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
MaxPlayer=8
|
||||
|
||||
[Definitions]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Butterfly
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Living
|
||||
TimerCall=Activity
|
||||
ContactCalls=1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=Skin_Alchemist
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=BackpackGraphic
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Clonk
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Living
|
||||
Width=8
|
||||
Height=20
|
||||
|
|
|
@ -844,7 +844,7 @@ func FxIntWalkTimer(pTarget, effect)
|
|||
{
|
||||
|
||||
// Test Waterlevel
|
||||
if(GBackLiquid(0, -5))
|
||||
if(GBackLiquid(0, -5) && !Contained())
|
||||
{
|
||||
SetAction("Swim");
|
||||
if(GetComDir() == COMD_Left)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=Skin_Steampunk
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Fx_Bubble
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Vehicle
|
||||
Width=2
|
||||
Height=2
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=CloudEffect
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Vehicle|C4D_Parallax
|
||||
Width=10
|
||||
Height=10
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Flame
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=15
|
||||
Height=20
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=BrickEdge
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_MouseIgnore
|
||||
Width=8
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=MovingBrick
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Structure
|
||||
Width=40
|
||||
Height=8
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Environment_AcidRain
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Environment
|
||||
Width=1
|
||||
Height=1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Cloud
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Vehicle|C4D_Background
|
||||
Timer=25
|
||||
TimerCall=TimedEvents
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Environment_Clouds
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Environment
|
||||
Width=1
|
||||
Height=1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=Lightning
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Column
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Structure
|
||||
Width=20
|
||||
Height=50
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=Earthquake
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Environment
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=BigRock
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=40
|
||||
Height=40
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Environment_Celestial
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Environment|C4D_StaticBack
|
||||
Width=1
|
||||
Height=1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Environment_Time
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Environment
|
||||
Width=1
|
||||
Height=1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Moon
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Background|C4D_Parallax
|
||||
Width=64
|
||||
Height=64
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Star
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Background
|
||||
Width=2
|
||||
Height=2
|
||||
|
|
|
@ -7,7 +7,7 @@ protected func Initialize()
|
|||
var alpha=0;
|
||||
if(GetTime()<300 || GetTime()>1140) alpha=255;
|
||||
SetClrModulation(RGBa(255,255,255,alpha));
|
||||
this["Parallaxity"] = [10+Random(30),100];
|
||||
this["Parallaxity"] = [10,10];
|
||||
|
||||
SetCategory(GetCategory() | C4D_Parallax | C4D_Background);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Fern
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Timer=350
|
||||
TimerCall=Seed
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Grass
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Background
|
||||
Width=12
|
||||
Height=7
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Mushroom
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Timer=350
|
||||
TimerCall=Seed
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Rank
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=28
|
||||
Height=10
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Seaweed
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Object
|
||||
Width=6
|
||||
Height=16
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Tree_Coniferous
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Timer=350
|
||||
TimerCall=Seed
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Trunk
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=20
|
||||
Height=60
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_CaptureTheFlag
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,128,128
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Goal_Flag
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_Vehicle
|
||||
Width=16
|
||||
Height=26
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=Goal_FlagBase
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=10
|
||||
Height=5
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_DeathMatch
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,128,128
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_KingOfTheHill
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,64,64
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=KingOfTheHill_Location
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=10
|
||||
Height=10
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=KingOfTheHill_Marker
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
#Category=C4D_StaticBack | C4D_Foreground | C4D_IgnoreFoW
|
||||
Category=C4D_StaticBack | C4D_IgnoreFoW
|
||||
Width=15
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=KingOfTheHill_Star
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack | C4D_IgnoreFoW
|
||||
Width=30
|
||||
Height=30
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_LastManStanding
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,128,128
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=RelaunchContainer
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
ClosedContainer=2
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_Melee
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,128,128
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=GUI_GoalArrow
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=16
|
||||
Height=36
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[DefCore]
|
||||
id=ParkourCheckpoint
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[DefCore]
|
||||
id=ParkourFlag
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack
|
||||
Width=64
|
||||
Height=64
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Goal_Parkour
|
||||
Version=4,10,0,0
|
||||
Version=5,2,0,1
|
||||
Category=C4D_StaticBack|C4D_Goal
|
||||
Picture=0,0,128,128
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue