From 1156f4054bb94efee05728b5f58db7793b40aff1 Mon Sep 17 00:00:00 2001 From: "Stephen E. Baker" Date: Tue, 9 Feb 2016 19:31:20 -0500 Subject: [PATCH] Remove old map editor Removes the old map editor and files that only it depended on. --- .gitattributes | 17 - CMakeLists.txt | 20 - CorsixTH/Bitmap/flags32.png | Bin 342 -> 0 bytes CorsixTH/Bitmap/new32.png | Bin 1008 -> 0 bytes CorsixTH/Bitmap/open32.png | Bin 1550 -> 0 bytes CorsixTH/Bitmap/parcels32.png | Bin 413 -> 0 bytes CorsixTH/Bitmap/positions32.png | Bin 358 -> 0 bytes CorsixTH/Bitmap/redo32.png | Bin 1502 -> 0 bytes CorsixTH/Bitmap/save32.png | Bin 890 -> 0 bytes CorsixTH/Bitmap/transparent_walls32.png | Bin 353 -> 0 bytes CorsixTH/Bitmap/undo32.png | Bin 1601 -> 0 bytes CorsixTH/Lua/command.lua | 29 - CorsixTH/Lua/command_stack.lua | 61 - CorsixTH/Lua/commands/compound.lua | 48 - CorsixTH/Lua/commands/set_map_cell.lua | 50 - CorsixTH/Lua/commands/set_map_cell_flags.lua | 49 - CorsixTH/Src/main.cpp | 3 - DoxyGen/mapedit.doxygen | 2291 ------------------ MapEdit/CMakeLists.txt | 200 -- MapEdit/Icon.icns | Bin 106194 -> 0 bytes MapEdit/MapEdit.ico | Bin 136837 -> 0 bytes MapEdit/MapEdit.rc | 34 - MapEdit/RequiredResources.txt | 14 - MapEdit/Src/app.cpp | 38 - MapEdit/Src/app.h | 47 - MapEdit/Src/block_gallery.cpp | 286 --- MapEdit/Src/block_gallery.h | 86 - MapEdit/Src/embedded_game.cpp | 448 ---- MapEdit/Src/embedded_game.h | 146 -- MapEdit/Src/frmLog.cpp | 43 - MapEdit/Src/frmLog.h | 50 - MapEdit/Src/frmMain.cpp | 761 ------ MapEdit/Src/frmMain.h | 129 - MapEdit/Src/game.h | 31 - MapEdit/Src/scrollable_game.cpp | 304 --- MapEdit/Src/scrollable_game.h | 79 - MapEdit/Src/th_map_wrapper.cpp | 391 --- MapEdit/Src/th_map_wrapper.h | 70 - 38 files changed, 5725 deletions(-) delete mode 100644 CorsixTH/Bitmap/flags32.png delete mode 100644 CorsixTH/Bitmap/new32.png delete mode 100644 CorsixTH/Bitmap/open32.png delete mode 100644 CorsixTH/Bitmap/parcels32.png delete mode 100644 CorsixTH/Bitmap/positions32.png delete mode 100644 CorsixTH/Bitmap/redo32.png delete mode 100644 CorsixTH/Bitmap/save32.png delete mode 100644 CorsixTH/Bitmap/transparent_walls32.png delete mode 100644 CorsixTH/Bitmap/undo32.png delete mode 100644 CorsixTH/Lua/command.lua delete mode 100644 CorsixTH/Lua/command_stack.lua delete mode 100644 CorsixTH/Lua/commands/compound.lua delete mode 100644 CorsixTH/Lua/commands/set_map_cell.lua delete mode 100644 CorsixTH/Lua/commands/set_map_cell_flags.lua delete mode 100644 DoxyGen/mapedit.doxygen delete mode 100644 MapEdit/CMakeLists.txt delete mode 100644 MapEdit/Icon.icns delete mode 100644 MapEdit/MapEdit.ico delete mode 100644 MapEdit/MapEdit.rc delete mode 100644 MapEdit/RequiredResources.txt delete mode 100644 MapEdit/Src/app.cpp delete mode 100644 MapEdit/Src/app.h delete mode 100644 MapEdit/Src/block_gallery.cpp delete mode 100644 MapEdit/Src/block_gallery.h delete mode 100644 MapEdit/Src/embedded_game.cpp delete mode 100644 MapEdit/Src/embedded_game.h delete mode 100644 MapEdit/Src/frmLog.cpp delete mode 100644 MapEdit/Src/frmLog.h delete mode 100644 MapEdit/Src/frmMain.cpp delete mode 100644 MapEdit/Src/frmMain.h delete mode 100644 MapEdit/Src/game.h delete mode 100644 MapEdit/Src/scrollable_game.cpp delete mode 100644 MapEdit/Src/scrollable_game.h delete mode 100644 MapEdit/Src/th_map_wrapper.cpp delete mode 100644 MapEdit/Src/th_map_wrapper.h diff --git a/.gitattributes b/.gitattributes index 14c75070..3a7c237f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ CorsixTH/Bitmap/flag_travel_east.bmp -text CorsixTH/Bitmap/flag_travel_north.bmp -text CorsixTH/Bitmap/flag_travel_south.bmp -text CorsixTH/Bitmap/flag_travel_west.bmp -text -CorsixTH/Bitmap/flags32.png -text CorsixTH/Bitmap/fullscreen_border_bottom.bmp -text CorsixTH/Bitmap/fullscreen_border_bottomleft.bmp -text CorsixTH/Bitmap/fullscreen_border_bottomright.bmp -text @@ -32,13 +31,6 @@ CorsixTH/Bitmap/map_cell_outline_east.bmp -text CorsixTH/Bitmap/map_cell_outline_north.bmp -text CorsixTH/Bitmap/map_cell_outline_south.bmp -text CorsixTH/Bitmap/map_cell_outline_west.bmp -text -CorsixTH/Bitmap/new32.png -text svneol=unset#image/png -CorsixTH/Bitmap/open32.png -text svneol=unset#image/png -CorsixTH/Bitmap/parcels32.png -text -CorsixTH/Bitmap/positions32.png -text -CorsixTH/Bitmap/redo32.png -text -CorsixTH/Bitmap/save32.png -text svneol=unset#image/png -CorsixTH/Bitmap/transparent_walls32.png -text CorsixTH/Bitmap/tree_collapsed.bmp -text CorsixTH/Bitmap/tree_ctrl.dat -text CorsixTH/Bitmap/tree_ctrl.pal -text @@ -46,7 +38,6 @@ CorsixTH/Bitmap/tree_ctrl.tab -text CorsixTH/Bitmap/tree_expanded.bmp -text CorsixTH/Bitmap/tree_leaf.bmp -text CorsixTH/Bitmap/tree_level.bmp -text -CorsixTH/Bitmap/undo32.png -text CorsixTH/CorsixTH.ico -text CorsixTH/Icon.icns -text CorsixTH/Levels/Example.map -text @@ -54,11 +45,6 @@ CorsixTH/Levels/avatar.map -text CorsixTH/Levels/confined_v5.map -text CorsixTH/Levels/finisham.map -text CorsixTH/Levels/original08.level -text -CorsixTH/Lua/command.lua -text -CorsixTH/Lua/command_stack.lua -text -CorsixTH/Lua/commands/compound.lua -text -CorsixTH/Lua/commands/set_map_cell.lua -text -CorsixTH/Lua/commands/set_map_cell_flags.lua -text CorsixTH/Lua/dialogs/resizables/customise.lua -text CorsixTH/Lua/dialogs/resizables/folder_settings.lua -text CorsixTH/Lua/dialogs/resizables/update.lua -text @@ -104,7 +90,4 @@ LevelEdit/src/icon256.png -text LevelEdit/src/icon32.png -text LevelEdit/src/icon48.png -text LevelEdit/src/icon64.png -text -MapEdit/Icon.icns -text -MapEdit/MapEdit.ico -text -MapEdit/RequiredResources.txt -text WindowsInstaller/welcome.bmp -text diff --git a/CMakeLists.txt b/CMakeLists.txt index 0efc3d0f..deaa252f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ # - WITH_FREETYPE2 # - WITH_MOVIES : Activate movies (requires Sound) # - BUILD_ANIMVIEWER -# - BUILD_MAPEDITOR # - WITH_LUAJIT : Whether to use LuaJIT 2 instead of Lua51 (default is LuaJIT 2) # - WITH_LIBAV : Whether to use LibAV (as opposed to FFMEPG) when building movies # - WITH_VLD : Build with Visual Leak Detector (requires Visual Studio) @@ -37,7 +36,6 @@ OPTION(WITH_FREETYPE2 "Enhanced Font Support" ON) OPTION(WITH_LUAJIT "Use LuaJIT instead of Lua" OFF) OPTION(WITH_LIBAV "Use LibAV instead of FFmpeg" OFF) OPTION(BUILD_ANIMVIEWER "Build the animation viewer as part of the build process" OFF) -OPTION(BUILD_MAPEDITOR "Build the map editor as part of the build process" OFF) IF(MSVC) OPTION(WITH_VLD "Build with Visual Leak Detector for Visual Studio" OFF) ENDIF(MSVC) @@ -107,15 +105,6 @@ IF(BUILD_ANIMVIEWER) add_subdirectory(AnimView) ENDIF(BUILD_ANIMVIEWER) -IF(BUILD_MAPEDITOR) - IF(WITH_OPENGL) - message("Building MapEdit") - add_subdirectory(MapEdit) - ELSE(WITH_OPENGL) - message(FATAL_ERROR "The map editor can only be built when using OpenGL as renderer") - ENDIF(WITH_OPENGL) -ENDIF(BUILD_MAPEDITOR) - # Documentation generation, construct 'doc' target (or a message it is disabled). # Try to find 'lua' @@ -172,14 +161,6 @@ IF (DOXYGEN_FOUND) add_dependencies(doc doc_leveledit) - add_custom_target(doc_mapedit - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/DoxyGen/mapedit.doxygen - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc - COMMENT "Generating API documentation for MapEdit" VERBATIM - ) - add_dependencies(doc doc_mapedit) - - add_custom_target(doc_corsixth_engine ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/DoxyGen/corsixth_engine.doxygen WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc @@ -223,7 +204,6 @@ IF (DOXYGEN_FOUND) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/doc/index.html "