0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename editor2 -> editor. Old editor is long dead, long live the new editor!

Browse source
This commit is contained in:
Tomasz Śniatowski 2009-08-08 12:14:58 +01:00
parent d8a2ca5efe
commit 1a934ac94b
58 changed files with 2925 additions and 2928 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -133,7 +133,7 @@ if(NOT ENABLE_POOL_ALLOC OR WIN32)
endif(NOT ENABLE_POOL_ALLOC OR WIN32)
if(NOT ENABLE_EDITOR)
add_definitions(-DDISABLE_EDITOR2)
add_definitions(-DDISABLE_EDITOR)
endif(NOT ENABLE_EDITOR)
if(X11_FOUND)

2
Doxyfile
View file

@ -530,7 +530,7 @@ WARN_LOGFILE =
INPUT = src \
src/ai \
src/campaign_server \
src/editor2 \
src/editor \
src/serialization \
src/server \
src/tools \

2
SConstruct
View file

@ -345,7 +345,7 @@ for env in [test_env, client_env, env]:
env.Append(CPPDEFINES = "USE_INTERNAL_DATA")
if not env["editor"]:
env.Append(CPPDEFINES = "DISABLE_EDITOR2")
env.Append(CPPDEFINES = "DISABLE_EDITOR")
if not env['lua']:
env.Append(CPPDEFINES = "DISABLE_LUA")

2
changelog
View file

@ -6,6 +6,8 @@ Version 1.7.2+svn:
* Replaced campaign specific portraits with mainline portraits
* Under the Burning Suns
* Fixed bug #13978: UtBS: "stun" ability doesn't modify enemy ZoC
* Editor
* Renamed editor2 to editor pretty much everywhere
* Graphics:
* New portrait for the Duelist, Mermaid Enchantress/Siren,
Priestess/Diviner, Merman Fighter/Warrior, Fencer, Drake

4
configure.ac
View file

@ -334,8 +334,8 @@ AM_CONDITIONAL([POOLALLOC], [test x$poolalloc = xyes])
if test x$editor = xno
then
CFLAGS="$CFLAGS -DDISABLE_EDITOR2"
CXXFLAGS="$CXXFLAGS -DDISABLE_EDITOR2"
CFLAGS="$CFLAGS -DDISABLE_EDITOR"
CXXFLAGS="$CXXFLAGS -DDISABLE_EDITOR"
fi
if test x$dummylocales = xyes; then

2
data/core/about.cfg
View file

@ -178,7 +178,7 @@
[/entry]
[entry]
name = "Tomasz Śniatowski (ilor)"
comment = "Editor2"
comment = "Editor"
[/entry]
[entry]
name = "Yann Dirson"

2
data/core/editor/_main.cfg
View file

@ -3,7 +3,7 @@
# wmlscope: set export=yes
#ifdef EDITOR2
#ifdef EDITOR
#ifndef MULTIPLAYER
{multiplayer/}
#endif

2
data/gui/default/window/editor_generate_map.cfg
View file

@ -1,6 +1,6 @@
#textdomain wesnoth-lib
###
### Definition of the window to create a new map in editor2.
### Definition of the window to generate a new map in the editor.
###
#define ONE_ROW_GRID

2
data/gui/default/window/editor_new_map.cfg
View file

@ -1,6 +1,6 @@
#textdomain wesnoth-lib
###
### Definition of the window to create a new map in editor2.
### Definition of the window to create a new map in the editor.
###
[window]

2
data/gui/default/window/editor_resize_map.cfg
View file

@ -1,6 +1,6 @@
#textdomain wesnoth-lib
###
### Definition of the window to create a new map in editor2.
### Definition of the window to resize a map in the editor.
###
[window]

2
data/gui/default/window/editor_settings.cfg
View file

@ -1,6 +1,6 @@
#textdomain wesnoth-lib
###
### Definition of the window to create a new map in editor2.
### Definition of the settings window in the editor.
###
#define ONE_ROW_GRID

6
data/themes/editor2.cfg → data/themes/editor.cfg
View file

@ -15,7 +15,7 @@
[/theme]
[theme]
name=editor2
name=editor
#define DEFAULT_EDITOR_FONT_NORMAL
14 #enddef
@ -275,7 +275,7 @@
[/label]
[status]
#[editor2_tool_hint]
#[editor_tool_hint]
# id=tool-hint
# font_size={DEFAULT_EDITOR_FONT_REALLYTINY}
# ref=draw_button_editor
@ -284,7 +284,7 @@
# yanchor=fixed
# prefix="" #wmllint: ignore
# prefix_literal=""
#[/editor2_tool_hint]
#[/editor_tool_hint]
# the time of day image
# [time_of_day]

4
data/tools/wesnoth/wmlgrammar.py
View file

@ -106,7 +106,7 @@ class Grammar:
'defend' : 'animation',
'defense' : 'movement_costs',
'drains' : 'special-dummy',
'editor2_tool_hint' : 'gold-theme',
'editor_tool_hint' : 'gold-theme',
'effect' : (
[ 'defense', 'movement_costs', 'resistance', ], #TODO: point tags to where they should go (specials, contents of filter_attack, { set_specials : specials }, abilities)
[ 'apply_to', 'times', 'unit_type', re.compile("\w+"), ]),
@ -227,7 +227,7 @@ class Grammar:
[ 'attacks', 'berserk', 'chance_to_hit', 'damage', 'drains', 'firststrike', 'plague', 'poison', 'slow', 'petrifies', 'swarm', { re.compile('\w+') : 'special-dummy' }, ], #TODO: add the rest of them
[]),
'status' : (
[ 'editor2_tool_hint', { 'gold' : 'gold-theme' }, 'income', 'num_units', 'observers', 'panel', 'position', 'report_clock', 'report_countdown', 'side_playing', { 'terrain' : 'terrain-theme' }, 'time_of_day', 'turn', 'unit_abilities', 'unit_advancement_options', 'unit_alignment', 'unit_amla', 'unit_hp', 'unit_image', 'unit_level', 'unit_moves', 'unit_name', 'unit_race', 'unit_side', 'unit_status', 'unit_traits', { 'unit_type' : 'unit_type-theme' } , 'unit_weapons', 'unit_xp', 'upkeep', 'villages', ],
[ 'editor_tool_hint', { 'gold' : 'gold-theme' }, 'income', 'num_units', 'observers', 'panel', 'position', 'report_clock', 'report_countdown', 'side_playing', { 'terrain' : 'terrain-theme' }, 'time_of_day', 'turn', 'unit_abilities', 'unit_advancement_options', 'unit_alignment', 'unit_amla', 'unit_hp', 'unit_image', 'unit_level', 'unit_moves', 'unit_name', 'unit_race', 'unit_side', 'unit_status', 'unit_traits', { 'unit_type' : 'unit_type-theme' } , 'unit_weapons', 'unit_xp', 'upkeep', 'villages', ],
[]),
'petrifies' : 'special-dummy',
'swarm' : TagPlus('special-dummy', ([], ['swarm_attacks_min', 'swarm_attacks_max',]) ),

22
po/wesnoth-editor/POTFILES.in
View file

@ -1,14 +1,14 @@
src/editor2/action.cpp
src/editor2/brush.cpp
src/editor2/editor_controller.cpp
src/editor2/editor_display.cpp
src/editor2/editor_layout.cpp
src/editor2/editor_main.cpp
src/editor2/editor_map.cpp
src/editor2/editor_palettes.cpp
src/editor2/map_context.cpp
src/editor2/map_fragment.cpp
src/editor2/mouse_action.cpp
src/editor/action.cpp
src/editor/brush.cpp
src/editor/editor_controller.cpp
src/editor/editor_display.cpp
src/editor/editor_layout.cpp
src/editor/editor_main.cpp
src/editor/editor_map.cpp
src/editor/editor_palettes.cpp
src/editor/map_context.cpp
src/editor/map_fragment.cpp
src/editor/mouse_action.cpp
src/gui/dialogs/editor_generate_map.cpp
src/gui/dialogs/editor_new_map.cpp
src/gui/dialogs/editor_resize_map.cpp

48
projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file

@ -140,30 +140,30 @@
<Unit filename="..\..\src\dialogs.hpp" />
<Unit filename="..\..\src\display.cpp" />
<Unit filename="..\..\src\display.hpp" />
<Unit filename="..\..\src\editor2\action.cpp" />
<Unit filename="..\..\src\editor2\action.hpp" />
<Unit filename="..\..\src\editor2\action_base.hpp" />
<Unit filename="..\..\src\editor2\brush.cpp" />
<Unit filename="..\..\src\editor2\brush.hpp" />
<Unit filename="..\..\src\editor2\editor_common.hpp" />
<Unit filename="..\..\src\editor2\editor_controller.cpp" />
<Unit filename="..\..\src\editor2\editor_controller.hpp" />
<Unit filename="..\..\src\editor2\editor_display.cpp" />
<Unit filename="..\..\src\editor2\editor_display.hpp" />
<Unit filename="..\..\src\editor2\editor_layout.cpp" />
<Unit filename="..\..\src\editor2\editor_layout.hpp" />
<Unit filename="..\..\src\editor2\editor_main.cpp" />
<Unit filename="..\..\src\editor2\editor_main.hpp" />
<Unit filename="..\..\src\editor2\editor_map.cpp" />
<Unit filename="..\..\src\editor2\editor_map.hpp" />
<Unit filename="..\..\src\editor2\editor_palettes.cpp" />
<Unit filename="..\..\src\editor2\editor_palettes.hpp" />
<Unit filename="..\..\src\editor2\map_context.cpp" />
<Unit filename="..\..\src\editor2\map_context.hpp" />
<Unit filename="..\..\src\editor2\map_fragment.cpp" />
<Unit filename="..\..\src\editor2\map_fragment.hpp" />
<Unit filename="..\..\src\editor2\mouse_action.cpp" />
<Unit filename="..\..\src\editor2\mouse_action.hpp" />
<Unit filename="..\..\src\editor\action.cpp" />
<Unit filename="..\..\src\editor\action.hpp" />
<Unit filename="..\..\src\editor\action_base.hpp" />
<Unit filename="..\..\src\editor\brush.cpp" />
<Unit filename="..\..\src\editor\brush.hpp" />
<Unit filename="..\..\src\editor\editor_common.hpp" />
<Unit filename="..\..\src\editor\editor_controller.cpp" />
<Unit filename="..\..\src\editor\editor_controller.hpp" />
<Unit filename="..\..\src\editor\editor_display.cpp" />
<Unit filename="..\..\src\editor\editor_display.hpp" />
<Unit filename="..\..\src\editor\editor_layout.cpp" />
<Unit filename="..\..\src\editor\editor_layout.hpp" />
<Unit filename="..\..\src\editor\editor_main.cpp" />
<Unit filename="..\..\src\editor\editor_main.hpp" />
<Unit filename="..\..\src\editor\editor_map.cpp" />
<Unit filename="..\..\src\editor\editor_map.hpp" />
<Unit filename="..\..\src\editor\editor_palettes.cpp" />
<Unit filename="..\..\src\editor\editor_palettes.hpp" />
<Unit filename="..\..\src\editor\map_context.cpp" />
<Unit filename="..\..\src\editor\map_context.hpp" />
<Unit filename="..\..\src\editor\map_fragment.cpp" />
<Unit filename="..\..\src\editor\map_fragment.hpp" />
<Unit filename="..\..\src\editor\mouse_action.cpp" />
<Unit filename="..\..\src\editor\mouse_action.hpp" />
<Unit filename="..\..\src\events.cpp" />
<Unit filename="..\..\src\events.hpp" />
<Unit filename="..\..\src\filechooser.cpp" />

48
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -169,30 +169,30 @@
<Unit filename="..\..\src\dialogs.hpp" />
<Unit filename="..\..\src\display.cpp" />
<Unit filename="..\..\src\display.hpp" />
<Unit filename="..\..\src\editor2\action.cpp" />
<Unit filename="..\..\src\editor2\action.hpp" />
<Unit filename="..\..\src\editor2\action_base.hpp" />
<Unit filename="..\..\src\editor2\brush.cpp" />
<Unit filename="..\..\src\editor2\brush.hpp" />
<Unit filename="..\..\src\editor2\editor_common.hpp" />
<Unit filename="..\..\src\editor2\editor_controller.cpp" />
<Unit filename="..\..\src\editor2\editor_controller.hpp" />
<Unit filename="..\..\src\editor2\editor_display.cpp" />
<Unit filename="..\..\src\editor2\editor_display.hpp" />
<Unit filename="..\..\src\editor2\editor_layout.cpp" />
<Unit filename="..\..\src\editor2\editor_layout.hpp" />
<Unit filename="..\..\src\editor2\editor_main.cpp" />
<Unit filename="..\..\src\editor2\editor_main.hpp" />
<Unit filename="..\..\src\editor2\editor_map.cpp" />
<Unit filename="..\..\src\editor2\editor_map.hpp" />
<Unit filename="..\..\src\editor2\editor_palettes.cpp" />
<Unit filename="..\..\src\editor2\editor_palettes.hpp" />
<Unit filename="..\..\src\editor2\map_context.cpp" />
<Unit filename="..\..\src\editor2\map_context.hpp" />
<Unit filename="..\..\src\editor2\map_fragment.cpp" />
<Unit filename="..\..\src\editor2\map_fragment.hpp" />
<Unit filename="..\..\src\editor2\mouse_action.cpp" />
<Unit filename="..\..\src\editor2\mouse_action.hpp" />
<Unit filename="..\..\src\editor\action.cpp" />
<Unit filename="..\..\src\editor\action.hpp" />
<Unit filename="..\..\src\editor\action_base.hpp" />
<Unit filename="..\..\src\editor\brush.cpp" />
<Unit filename="..\..\src\editor\brush.hpp" />
<Unit filename="..\..\src\editor\editor_common.hpp" />
<Unit filename="..\..\src\editor\editor_controller.cpp" />
<Unit filename="..\..\src\editor\editor_controller.hpp" />
<Unit filename="..\..\src\editor\editor_display.cpp" />
<Unit filename="..\..\src\editor\editor_display.hpp" />
<Unit filename="..\..\src\editor\editor_layout.cpp" />
<Unit filename="..\..\src\editor\editor_layout.hpp" />
<Unit filename="..\..\src\editor\editor_main.cpp" />
<Unit filename="..\..\src\editor\editor_main.hpp" />
<Unit filename="..\..\src\editor\editor_map.cpp" />
<Unit filename="..\..\src\editor\editor_map.hpp" />
<Unit filename="..\..\src\editor\editor_palettes.cpp" />
<Unit filename="..\..\src\editor\editor_palettes.hpp" />
<Unit filename="..\..\src\editor\map_context.cpp" />
<Unit filename="..\..\src\editor\map_context.hpp" />
<Unit filename="..\..\src\editor\map_fragment.cpp" />
<Unit filename="..\..\src\editor\map_fragment.hpp" />
<Unit filename="..\..\src\editor\mouse_action.cpp" />
<Unit filename="..\..\src\editor\mouse_action.hpp" />
<Unit filename="..\..\src\events.cpp" />
<Unit filename="..\..\src\events.hpp" />
<Unit filename="..\..\src\filechooser.cpp" />

5256
projectfiles/Dev-C++/wesnoth.dev
View file

File diff suppressed because it is too large Load diff

118
projectfiles/VC9/wesnoth.vcproj
View file

@ -2854,17 +2854,17 @@
</Filter>
</Filter>
<Filter
Name="Editor2"
Name="Editor"
>
<File
RelativePath="..\..\src\editor2\action.cpp"
RelativePath="..\..\src\editor\action.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2872,7 +2872,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2880,19 +2880,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\brush.cpp"
RelativePath="..\..\src\editor\brush.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2900,7 +2900,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2908,19 +2908,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_controller.cpp"
RelativePath="..\..\src\editor\editor_controller.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2928,7 +2928,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2936,19 +2936,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_display.cpp"
RelativePath="..\..\src\editor\editor_display.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2956,7 +2956,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2964,19 +2964,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_layout.cpp"
RelativePath="..\..\src\editor\editor_layout.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2984,7 +2984,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -2992,19 +2992,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_main.cpp"
RelativePath="..\..\src\editor\editor_main.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3012,7 +3012,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3020,19 +3020,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_map.cpp"
RelativePath="..\..\src\editor\editor_map.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3040,7 +3040,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3048,19 +3048,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\editor_palettes.cpp"
RelativePath="..\..\src\editor\editor_palettes.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3068,7 +3068,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3076,19 +3076,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\map_context.cpp"
RelativePath="..\..\src\editor\map_context.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3096,7 +3096,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3104,19 +3104,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\map_fragment.cpp"
RelativePath="..\..\src\editor\map_fragment.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3124,7 +3124,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3132,19 +3132,19 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\editor2\mouse_action.cpp"
RelativePath="..\..\src\editor\mouse_action.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3152,7 +3152,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
<FileConfiguration
@ -3160,7 +3160,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Editor2\"
ObjectFile="$(IntDir)\Editor\"
/>
</FileConfiguration>
</File>
@ -5073,58 +5073,58 @@
>
</File>
<Filter
Name="Editor2"
Name="Editor"
>
<File
RelativePath="..\..\src\editor2\action.hpp"
RelativePath="..\..\src\editor\action.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\action_base.hpp"
RelativePath="..\..\src\editor\action_base.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\brush.hpp"
RelativePath="..\..\src\editor\brush.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_common.hpp"
RelativePath="..\..\src\editor\editor_common.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_controller.hpp"
RelativePath="..\..\src\editor\editor_controller.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_display.hpp"
RelativePath="..\..\src\editor\editor_display.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_layout.hpp"
RelativePath="..\..\src\editor\editor_layout.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_main.hpp"
RelativePath="..\..\src\editor\editor_main.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_map.hpp"
RelativePath="..\..\src\editor\editor_map.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\editor_palettes.hpp"
RelativePath="..\..\src\editor\editor_palettes.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\map_context.hpp"
RelativePath="..\..\src\editor\map_context.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\map_fragment.hpp"
RelativePath="..\..\src\editor\map_fragment.hpp"
>
</File>
<File
RelativePath="..\..\src\editor2\mouse_action.hpp"
RelativePath="..\..\src\editor\mouse_action.hpp"
>
</File>
</Filter>

22
src/CMakeLists.txt
View file

@ -410,17 +410,17 @@ SET(wesnoth-editor_SRC
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
editor2/action.cpp
editor2/brush.cpp
editor2/editor_main.cpp
editor2/editor_controller.cpp
editor2/editor_display.cpp
editor2/editor_layout.cpp
editor2/editor_map.cpp
editor2/editor_palettes.cpp
editor2/map_context.cpp
editor2/map_fragment.cpp
editor2/mouse_action.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_main.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
)
IF(ENABLE_EDITOR)

22
src/Makefile.am
View file

@ -234,17 +234,17 @@ wesnoth_editor_SOURCES = \
gui/dialogs/editor_new_map.cpp \
gui/dialogs/editor_resize_map.cpp \
gui/dialogs/editor_settings.cpp \
editor2/action.cpp \
editor2/brush.cpp \
editor2/editor_main.cpp \
editor2/editor_controller.cpp \
editor2/editor_display.cpp \
editor2/editor_layout.cpp \
editor2/editor_map.cpp \
editor2/editor_palettes.cpp \
editor2/map_context.cpp \
editor2/map_fragment.cpp \
editor2/mouse_action.cpp
editor/action.cpp \
editor/brush.cpp \
editor/editor_main.cpp \
editor/editor_controller.cpp \
editor/editor_display.cpp \
editor/editor_layout.cpp \
editor/editor_map.cpp \
editor/editor_palettes.cpp \
editor/map_context.cpp \
editor/map_fragment.cpp \
editor/mouse_action.cpp
if EDITOR
wesnoth_source += $(wesnoth_editor_SOURCES)

26
src/SConscript
View file

@ -329,26 +329,26 @@ wesnoth_sources = Split("""
wesnoth_sources.extend(client_env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))
wesnoth_editor2_sources = Split("""
wesnoth_editor_sources = Split("""
gui/dialogs/editor_generate_map.cpp
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
editor2/action.cpp
editor2/brush.cpp
editor2/editor_main.cpp
editor2/editor_controller.cpp
editor2/editor_display.cpp
editor2/editor_layout.cpp
editor2/editor_map.cpp
editor2/editor_palettes.cpp
editor2/map_context.cpp
editor2/map_fragment.cpp
editor2/mouse_action.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_main.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
""")
if env["editor"]:
wesnoth_sources += wesnoth_editor2_sources
wesnoth_sources += wesnoth_editor_sources
libwesnoth_extras = client_env.Library("wesnoth_extras", wesnoth_sources)
#

8
src/editor2/action.cpp → src/editor/action.cpp
View file

@ -23,7 +23,7 @@
#include "../foreach.hpp"
#include "../gettext.hpp"
namespace editor2 {
namespace editor {
int editor_action::next_id_ = 1;
int editor_action::instance_count_ = 0;
@ -42,7 +42,7 @@ editor_action::editor_action()
: id_(next_id_++)
{
instance_count_++;
#ifdef EDITOR2_DEBUG_ACTION_LIFETIME
#ifdef EDITOR_DEBUG_ACTION_LIFETIME
LOG_ED << "Action " << std::setw(2) << id_ << " ctor " << this << " (count is " << instance_count << "\n";
#endif
}
@ -50,7 +50,7 @@ editor_action::editor_action()
editor_action::~editor_action()
{
instance_count_--;
#ifdef EDITOR2_DEBUG_ACTION_LIFETIME
#ifdef EDITOR_DEBUG_ACTION_LIFETIME
LOG_ED << "Action " << std::setw(2) << id_ << " dtor " << this << " (count is " << instance_count << "\n";
#endif
}
@ -394,4 +394,4 @@ void editor_action_shuffle_area::perform_without_undo(map_context& mc) const
mc.set_needs_terrain_rebuild();
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/action.hpp → src/editor/action.hpp
View file

@ -23,8 +23,8 @@
* need to ensure the pointer is deleted.
*/
#ifndef EDITOR2_ACTION_HPP
#define EDITOR2_ACTION_HPP
#ifndef EDITOR_ACTION_HPP
#define EDITOR_ACTION_HPP
#include "action_base.hpp"
#include "editor_map.hpp"
@ -34,7 +34,7 @@
#include "../terrain.hpp"
namespace editor2 {
namespace editor {
/**
* Replace contents of the entire map,
@ -481,6 +481,6 @@ class editor_action_shuffle_area : public editor_action_area
};
} //end namespace editor2
} //end namespace editor
#endif

11
src/editor2/action_base.hpp → src/editor/action_base.hpp
View file

@ -24,17 +24,14 @@
* include this header file.
*/
#ifndef EDITOR2_ACTION_BASE_HPP_INCLUDED
#define EDITOR2_ACTION_BASE_HPP_INCLUDED
#ifndef EDITOR_ACTION_BASE_HPP_INCLUDED
#define EDITOR_ACTION_BASE_HPP_INCLUDED
#include "editor_common.hpp"
#include <string>
namespace editor2 {
namespace editor {
/**
* Base class for all editor actions. An editor_action object
@ -121,6 +118,6 @@ struct editor_action_creation_fail : public editor_action_exception
editor_action_creation_fail();
};
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/brush.cpp → src/editor/brush.cpp
View file

@ -20,7 +20,7 @@
#include "../pathutils.hpp"
namespace editor2 {
namespace editor {
brush::brush()
: relative_tiles_()
@ -68,4 +68,4 @@ std::set<map_location> brush::project(const map_location& hotspot) const
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/brush.hpp → src/editor/brush.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_BRUSH_HPP_INCLUDED
#define EDITOR2_BRUSH_HPP_INCLUDED
#ifndef EDITOR_BRUSH_HPP_INCLUDED
#define EDITOR_BRUSH_HPP_INCLUDED
#include "editor_map.hpp"
@ -21,7 +21,7 @@
#include <set>
namespace editor2 {
namespace editor {
/**
* The brush class represents a single brush -- a set of relative locations around a "hotspot",
@ -72,6 +72,6 @@ protected:
};
} //end namespace editor2
} //end namespace editor
#endif

8
src/editor2/editor_common.hpp → src/editor/editor_common.hpp
View file

@ -18,8 +18,8 @@
* logging macro definitions and base exception declarations
*/
#ifndef EDITOR2_EDITOR_COMMON_HPP_INCLUDED
#define EDITOR2_EDITOR_COMMON_HPP_INCLUDED
#ifndef EDITOR_EDITOR_COMMON_HPP_INCLUDED
#define EDITOR_EDITOR_COMMON_HPP_INCLUDED
#include "../log.hpp"
#include <stdexcept>
@ -34,7 +34,7 @@ extern lg::log_domain log_editor;
class display;
class gamemap;
namespace editor2 {
namespace editor {
struct editor_exception : public std::exception
{
@ -66,6 +66,6 @@ class map_context;
class map_fragment;
class mouse_action;
} //end namespace editor2
} //end namespace editor
#endif

12
src/editor2/editor_controller.cpp → src/editor/editor_controller.cpp
View file

@ -42,9 +42,9 @@
#include <boost/bind.hpp>
namespace {
const char* prefkey_default_dir = "editor2_default_dir";
const char* prefkey_auto_update_transitions = "editor2_auto_update_transitions";
const char* prefkey_use_mdi = "editor2_use_mdi";
const char* prefkey_default_dir = "editor_default_dir";
const char* prefkey_auto_update_transitions = "editor_auto_update_transitions";
const char* prefkey_use_mdi = "editor_use_mdi";
namespace TransitionUpdateMode {
const int off = 0;
@ -54,7 +54,7 @@ namespace {
}
}
namespace editor2 {
namespace editor {
/**
* Utility class to properly refresh the display when the map context object is replaced
@ -154,7 +154,7 @@ editor_controller::editor_controller(const config &game_config, CVideo& video, m
void editor_controller::init_gui(CVideo& video)
{
const config &theme_cfg = get_theme(game_config_, "editor2");
const config &theme_cfg = get_theme(game_config_, "editor");
gui_.reset(new editor_display(video, get_map(), theme_cfg, game_config_, config()));
gui_->set_grid(preferences::grid());
prefs_disp_manager_.reset(new preferences::display_manager(&gui()));
@ -1432,4 +1432,4 @@ void editor_controller::clear_mouseover_overlay()
gui().clear_mouseover_hex_overlay();
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/editor_controller.hpp → src/editor/editor_controller.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_EDITOR_CONTROLLER_HPP_INCLUDED
#define EDITOR2_EDITOR_CONTROLLER_HPP_INCLUDED
#ifndef EDITOR_EDITOR_CONTROLLER_HPP_INCLUDED
#define EDITOR_EDITOR_CONTROLLER_HPP_INCLUDED
#include "action_base.hpp"
#include "brush.hpp"
@ -51,7 +51,7 @@ class rng;
struct set_random_generator;
}
namespace editor2 {
namespace editor {
class brush_bar;
struct size_specs;
@ -440,6 +440,6 @@ class editor_controller : public controller_base,
std::string default_dir_;
};
} //end namespace editor2
} //end namespace editor
#endif

7
src/editor2/editor_display.cpp → src/editor/editor_display.cpp
View file

@ -16,7 +16,7 @@
#include "editor_display.hpp"
#include "builder.hpp"
namespace editor2 {
namespace editor {
editor_display::editor_display(CVideo& video, const editor_map& map,
const config& theme_cfg, const config& cfg,
@ -100,8 +100,7 @@ void editor_display::draw_sidebar()
refresh_report(reports::POSITION, reports::report(lexical_cast<std::string>(mouseoverHex_)));
}
refresh_report(reports::VILLAGES, reports::report(lexical_cast<std::string>(get_map().villages().size())));
refresh_report(reports::EDITOR2_TOOL_HINT, reports::report(toolbar_hint_));
refresh_report(reports::EDITOR_TOOL_HINT, reports::report(toolbar_hint_));
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/editor_display.hpp → src/editor/editor_display.hpp
View file

@ -12,13 +12,13 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_EDITOR_DISPLAY_HPP_INCLUDED
#define EDITOR2_EDITOR_DISPLAY_HPP_INCLUDED
#ifndef EDITOR_EDITOR_DISPLAY_HPP_INCLUDED
#define EDITOR_EDITOR_DISPLAY_HPP_INCLUDED
#include "editor_map.hpp"
#include "../display.hpp"
namespace editor2 {
namespace editor {
class editor_display : public display
{
@ -52,5 +52,5 @@ protected:
std::string toolbar_hint_;
};
} //end namespace editor2
} //end namespace editor
#endif

6
src/editor2/editor_layout.cpp → src/editor/editor_layout.cpp
View file

@ -15,7 +15,7 @@
#define GETTEXT_DOMAIN "wesnoth-editor"
/**
* @file editor2/editor_layout.cpp
* @file editor/editor_layout.cpp
* Set various sizes for the screen-layout of the map editor.
*/
@ -27,7 +27,7 @@ namespace {
const size_t default_palette_width = 3;
}
namespace editor2 {
namespace editor {
size_specs::size_specs()
: terrain_size(default_terrain_size)
@ -55,5 +55,5 @@ void adjust_sizes(const display &disp, size_specs &sizes) {
sizes.palette_h = disp.h() - sizes.palette_y;
}
} // end namespace editor2
} // end namespace editor

4
src/editor2/editor_layout.hpp → src/editor/editor_layout.hpp
View file

@ -12,7 +12,7 @@
See the COPYING file for more details.
*/
/** @file editor2/editor_layout.hpp */
/** @file editor/editor_layout.hpp */
#ifndef EDITOR_LAYOUT_H_INCLUDED
#define EDITOR_LAYOUT_H_INCLUDED
@ -21,7 +21,7 @@
#include "display.hpp"
namespace editor2 {
namespace editor {
/** Size specifications for the map editor. */
struct size_specs {

6
src/editor2/editor_main.cpp → src/editor/editor_main.cpp
View file

@ -23,7 +23,7 @@
lg::log_domain log_editor("editor");
namespace editor2 {
namespace editor {
EXIT_STATUS start(config& game_conf, CVideo& video, const std::string& filename /* = "" */,
bool take_screenshot /* = false */, const std::string& screenshot_filename /* = "map_screenshot.bmp" */)
@ -50,7 +50,7 @@ EXIT_STATUS start(config& game_conf, CVideo& video, const std::string& filename
e = editor.main_loop();
}
} catch (editor_exception& e) {
ERR_ED << "Editor exception in editor2::start: " << e.what() << "\n";
ERR_ED << "Editor exception in editor::start: " << e.what() << "\n";
throw;
}
if (editor_action::get_instance_count() != 0) {
@ -59,4 +59,4 @@ EXIT_STATUS start(config& game_conf, CVideo& video, const std::string& filename
return e;
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/editor_main.hpp → src/editor/editor_main.hpp
View file

@ -12,13 +12,13 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_EDITOR_MAIN_H_INCLUDED
#define EDITOR2_EDITOR_MAIN_H_INCLUDED
#ifndef EDITOR_EDITOR_MAIN_H_INCLUDED
#define EDITOR_EDITOR_MAIN_H_INCLUDED
class config;
class CVideo;
namespace editor2 {
namespace editor {
enum EXIT_STATUS {
EXIT_NORMAL,
@ -34,6 +34,6 @@ enum EXIT_STATUS {
EXIT_STATUS start(config& game_config, CVideo& video, const std::string& filename = "", bool take_screenshot = false, const std::string& screenshot_filename = "map_screenshot.bmp");
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/editor_map.cpp → src/editor/editor_map.cpp
View file

@ -27,7 +27,7 @@
#include "../wml_exception.hpp"
namespace editor2 {
namespace editor {
editor_map_load_exception wrap_exc(const char* type, const std::string& e_msg, const std::string& filename)
{
@ -412,4 +412,4 @@ void editor_map::shrink_bottom(int count)
} //end namespace editor2
} //end namespace editor

8
src/editor2/editor_map.hpp → src/editor/editor_map.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_EDITOR_MAP_HPP_INCLUDED
#define EDITOR2_EDITOR_MAP_HPP_INCLUDED
#ifndef EDITOR_EDITOR_MAP_HPP_INCLUDED
#define EDITOR_EDITOR_MAP_HPP_INCLUDED
#include "editor_common.hpp"
@ -22,7 +22,7 @@
#include <deque>
#include <set>
namespace editor2 {
namespace editor {
struct editor_map_operation_exception : public editor_exception
{
@ -209,6 +209,6 @@ protected:
};
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/editor_palettes.cpp → src/editor/editor_palettes.cpp
View file

@ -26,7 +26,7 @@
#include "../tooltips.hpp"
namespace editor2 {
namespace editor {
static bool is_invalid_terrain(t_translation::t_terrain c) {
return (c == t_translation::VOID_TERRAIN || c == t_translation::FOGGED);
@ -677,5 +677,5 @@ int brush_bar::selected_index(int x, int y) const {
return -1;
}
} // end namespace editor2
} // end namespace editor

4
src/editor2/editor_palettes.hpp → src/editor/editor_palettes.hpp
View file

@ -35,7 +35,7 @@
class config;
namespace editor2 {
namespace editor {
/**
* Stores the info about the data in editor-groups.cfg in a nice format.
*
@ -229,6 +229,6 @@ private:
};
}
} //end namespace editor
#endif // EDITOR_PALETTES_H_INCLUDED

4
src/editor2/map_context.cpp → src/editor/map_context.cpp
View file

@ -29,7 +29,7 @@
#include <boost/regex.hpp>
namespace editor2 {
namespace editor {
const size_t map_context::max_action_stack_size_ = 100;
@ -389,4 +389,4 @@ void map_context::perform_action_between_stacks(action_stack& from, action_stack
trim_stack(to);
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/map_context.hpp → src/editor/map_context.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_MAP_CONTEXT_HPP_INCLUDED
#define EDITOR2_MAP_CONTEXT_HPP_INCLUDED
#ifndef EDITOR_MAP_CONTEXT_HPP_INCLUDED
#define EDITOR_MAP_CONTEXT_HPP_INCLUDED
#include "editor_common.hpp"
#include "editor_map.hpp"
@ -22,7 +22,7 @@
#include <deque>
namespace editor2 {
namespace editor {
/**
* This class wraps around a map to provide a conscise interface for the editor to work with.
@ -301,6 +301,6 @@ protected:
};
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/map_fragment.cpp → src/editor/map_fragment.cpp
View file

@ -18,7 +18,7 @@
#include "../foreach.hpp"
namespace editor2 {
namespace editor {
map_fragment::map_fragment()
: items_()
@ -217,4 +217,4 @@ std::string map_fragment::dump() const
return ss.str();
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/map_fragment.hpp → src/editor/map_fragment.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_MAP_FRAGMENT_HPP_INCLUDED
#define EDITOR2_MAP_FRAGMENT_HPP_INCLUDED
#ifndef EDITOR_MAP_FRAGMENT_HPP_INCLUDED
#define EDITOR_MAP_FRAGMENT_HPP_INCLUDED
#include "editor_map.hpp"
@ -21,7 +21,7 @@
#include <set>
namespace editor2 {
namespace editor {
/**
* This represents a tile along with information about it, namely the terrain,
@ -162,6 +162,6 @@ class map_fragment
std::set<map_location> area_;
};
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/mouse_action.cpp → src/editor/mouse_action.cpp
View file

@ -21,7 +21,7 @@
#include "../construct_dialog.hpp"
#include "../gettext.hpp"
namespace editor2 {
namespace editor {
bool mouse_action::has_context_menu() const
{
@ -490,4 +490,4 @@ void mouse_action_starting_position::set_mouse_overlay(editor_display& disp)
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/mouse_action.hpp → src/editor/mouse_action.hpp
View file

@ -12,8 +12,8 @@
See the COPYING file for more details.
*/
#ifndef EDITOR2_MOUSE_ACTION_HPP
#define EDITOR2_MOUSE_ACTION_HPP
#ifndef EDITOR_MOUSE_ACTION_HPP
#define EDITOR_MOUSE_ACTION_HPP
#include "action_base.hpp"
#include "editor_map.hpp"
@ -22,7 +22,7 @@
class CKey;
namespace editor2 {
namespace editor {
/**
* A mouse action receives events from the controller, and responds to them by creating
@ -407,6 +407,6 @@ private:
bool click_;
};
} //end namespace editor2
} //end namespace editor
#endif

4
src/editor2/terrain_group.cpp.wip → src/editor/terrain_group.cpp.wip
View file

@ -18,7 +18,7 @@
#include "editor_common.hpp"
#include "../foreach.hpp"
namespace editor2 {
namespace editor {
terrain_group::terrain_group(const config& cfg);
: id_(cfg["id"]), name_(cfg["name"]), icon_string_(cfg["icon"])
@ -128,4 +128,4 @@ void set_group(const std::string& id)
}
}
} //end namespace editor2
} //end namespace editor

8
src/editor2/terrain_group.hpp.wip → src/editor/terrain_group.hpp.wip
View file

@ -14,8 +14,8 @@
// UNUSED CODE -- TODO FOR THE NEW TERRAIN PALETTE
#ifndef EDITOR2_TERRAIN_GROUP_HPP
#define EDITOR2_TERRAIN_GROUP_HPP
#ifndef EDITOR_TERRAIN_GROUP_HPP
#define EDITOR_TERRAIN_GROUP_HPP
#include "action_base.hpp"
#include "editor_map.hpp"
@ -24,7 +24,7 @@
#include "../terrain.hpp"
namespace editor2 {
namespace editor {
class terrain_group
{
@ -60,6 +60,6 @@ private:
};
} //end namespace editor2
} //end namespace editor
#endif

53
src/game.cpp
View file

@ -17,7 +17,7 @@
#include "SDL.h"
#include "SDL_mixer.h"
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
#include "SDL_getenv.h"
#endif
@ -81,8 +81,8 @@
//#include "locale.h"
//#endif
#ifndef DISABLE_EDITOR2
#include "editor2/editor_main.hpp"
#ifndef DISABLE_EDITOR
#include "editor/editor_main.hpp"
#endif
#include "wesconfig.h"
@ -150,7 +150,7 @@ public:
bool new_campaign();
bool goto_campaign();
bool goto_multiplayer();
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
bool goto_editor();
#endif
bool play_multiplayer();
@ -163,8 +163,8 @@ public:
enum RELOAD_GAME_DATA { RELOAD_DATA, NO_RELOAD_DATA };
void launch_game(RELOAD_GAME_DATA reload=RELOAD_DATA);
void play_replay();
#ifndef DISABLE_EDITOR2
editor2::EXIT_STATUS start_editor(const std::string& filename = "");
#ifndef DISABLE_EDITOR
editor::EXIT_STATUS start_editor(const std::string& filename = "");
#endif
void start_wesnothd();
const config& game_config(){return game_config_;};
@ -223,7 +223,7 @@ private:
std::string multiplayer_server_;
bool jump_to_campaign_, jump_to_multiplayer_;
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
bool jump_to_editor_;
#endif
game_config::config_cache& cache_;
@ -263,7 +263,7 @@ game_controller::game_controller(int argc, char** argv) :
multiplayer_server_(),
jump_to_campaign_(false),
jump_to_multiplayer_(false)
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
,jump_to_editor_(false)
#endif
,cache_(game_config::config_cache::instance())
@ -285,7 +285,7 @@ game_controller::game_controller(int argc, char** argv) :
font_manager_.update_font_path();
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
const std::string app_basename = file_name(argv[0]);
jump_to_editor_ = app_basename.find("editor") != std::string::npos;
#endif
@ -347,7 +347,7 @@ game_controller::game_controller(int argc, char** argv) :
no_sound = true;
preferences::disable_preferences_save();
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
else if(val == "--screenshot") {
if(arg_+2 != argc_) {
++arg_;
@ -429,7 +429,7 @@ game_controller::game_controller(int argc, char** argv) :
} else if(val == "--new-uploader") {
//hidden option to test experimental game log upload changes
uploader_settings::new_uploader = true;
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
} else if(val == "-e" || val == "--editor") {
jump_to_editor_ = true;
if(arg_+1 != argc_) {
@ -715,15 +715,14 @@ bool game_controller::play_screenshot_mode()
return true;
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
cache_.clear_defines();
cache_.add_define("EDITOR");
cache_.add_define("EDITOR2");
load_game_cfg();
const binary_paths_manager bin_paths_manager(game_config_);
::init_textdomains(game_config_);
editor2::start(game_config_, video_, screenshot_map_, true, screenshot_filename_);
editor::start(game_config_, video_, screenshot_map_, true, screenshot_filename_);
return false;
#else
return false;
@ -1170,13 +1169,13 @@ bool game_controller::goto_multiplayer()
return true;
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
bool game_controller::goto_editor()
{
if(jump_to_editor_){
jump_to_editor_ = false;
if (start_editor(normalize_path(loaded_game_)) ==
editor2::EXIT_QUIT_TO_DESKTOP)
editor::EXIT_QUIT_TO_DESKTOP)
{
return false;
}
@ -1614,16 +1613,16 @@ void game_controller::play_replay()
}
}
#ifndef DISABLE_EDITOR2
editor2::EXIT_STATUS game_controller::start_editor(const std::string& filename)
#ifndef DISABLE_EDITOR
editor::EXIT_STATUS game_controller::start_editor(const std::string& filename)
{
cache_.clear_defines();
cache_.add_define("EDITO");
cache_.add_define("EDITOR");
cache_.add_define("EDITOR2");
load_game_cfg();
const binary_paths_manager bin_paths_manager(game_config_);
::init_textdomains(game_config_);
return editor2::start(game_config_, video_, filename);
return editor::start(game_config_, video_, filename);
}
#endif
@ -1728,7 +1727,7 @@ static int process_command_args(int argc, char** argv) {
#endif
<< " --dummy-locales enables dummy locales for switching to non-system\n"
<< " locales.\n"
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
<< " -e, --editor [<file>] starts the in-game map editor directly. If <file>\n"
<< " is specified, equivalent to -e --load <file>.\n"
#endif
@ -1744,7 +1743,7 @@ static int process_command_args(int argc, char** argv) {
<< " -h, --help prints this message and exits.\n"
<< " -l, --load <file> loads the save <file> from the standard save\n"
<< " game directory.\n"
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
<< " When launching the map editor via -e, the map\n"
<< " <file> is loaded, relative to the current\n"
<< " directory. If it is a directory, the editor\n"
@ -1787,7 +1786,7 @@ static int process_command_args(int argc, char** argv) {
<< " --smallgui allows to use screen resolutions down to 800x480\n"
<< " and resizes a few interface elements.\n"
<< " --screenshot <map> <output> Saves a screenshot of <map> to <output> without\n"
<< " initializing a screen. Editor2 must be compiled\n"
<< " initializing a screen. Editor must be compiled\n"
<< " in for this to work.\n"
<< " -s, --server [<host>] connects to the host if specified\n"
<< " or to the first host in your preferences.\n"
@ -1821,7 +1820,7 @@ static int process_command_args(int argc, char** argv) {
<< "\n";
return 0;
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
else if (val == "--screenshot" ) {
if(!(argc > arg + 2)) {
std::cerr << "format of " << val << " command: " << val << " <map file> <output file>\n";
@ -2039,7 +2038,7 @@ static int do_gameloop(int argc, char** argv)
if(game.goto_multiplayer() == false){
continue; //Go to main menu
}
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
if (game.goto_editor() == false) {
return 0;
}
@ -2124,10 +2123,10 @@ static int do_gameloop(int argc, char** argv)
game.reload_changed_game_config();
image::flush_cache();
continue;
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
} else if(res == gui::START_MAP_EDITOR) {
//@todo editor can ask the game to quit completely
if (game.start_editor() == editor2::EXIT_QUIT_TO_DESKTOP) {
if (game.start_editor() == editor::EXIT_QUIT_TO_DESKTOP) {
return 0;
} else {
gui::set_background_dirty();

2
src/gui/widgets/settings.cpp
View file

@ -93,7 +93,7 @@ static void fill_window_types()
window_type_list[GAME_SAVE] = "game_save";
window_type_list[GAME_SAVE_MESSAGE] = "game_save_message";
window_type_list[GAME_SAVE_OOS] = "game_save_oos";
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
window_type_list[EDITOR_NEW_MAP] = "editor_new_map";
window_type_list[EDITOR_GENERATE_MAP] = "editor_generate_map";
window_type_list[EDITOR_RESIZE_MAP] = "editor_resize_map";

2
src/gui/widgets/settings.hpp
View file

@ -61,7 +61,7 @@ enum twindow_type {
MP_LOGIN, /**< The mp login dialog. */
MP_CMD_WRAPPER, /**< graphical front-end to various mp commands*/
MP_CREATE_GAME, /**< The mp creation dialog. */
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
EDITOR_NEW_MAP, /**< New map dialog. */
EDITOR_GENERATE_MAP, /**< Editor random map genarator dialog. */
EDITOR_RESIZE_MAP, /**< Editor resize map dialog. */

2
src/gui/widgets/window.cpp
View file

@ -326,7 +326,7 @@ twindow::tretval twindow::get_retval_by_id(const std::string& id)
*/
} else if(id == "tutorial") {
return static_cast<tretval>(gui::TUTORIAL);
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
} else if(id == "editor") {
return static_cast<tretval>(gui::START_MAP_EDITOR);
#endif

2
src/hotkeys.cpp
View file

@ -100,7 +100,7 @@ const struct {
N_("Team 1"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_REPLAY_SKIP_ANIMATION, "replayskipanimation", N_("Skip animation"), false, hotkey::SCOPE_GAME },
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
{ hotkey::HOTKEY_EDITOR_QUIT_TO_DESKTOP, "editor-quit-to-desktop", N_("Quit to Desktop"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_CLOSE_MAP, "editor-close-map", N_("Close Map"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SWITCH_MAP, "editor-switch-map", N_("Switch Map"), false, hotkey::SCOPE_EDITOR },

2
src/hotkeys.hpp
View file

@ -61,7 +61,7 @@ enum HOTKEY_COMMAND {
HOTKEY_REPLAY_SHOW_EACH, HOTKEY_REPLAY_SHOW_TEAM1,
HOTKEY_REPLAY_SKIP_ANIMATION,
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
HOTKEY_EDITOR_QUIT_TO_DESKTOP,
HOTKEY_EDITOR_CLOSE_MAP, HOTKEY_EDITOR_SWITCH_MAP,
HOTKEY_EDITOR_SETTINGS,

2
src/reports.cpp
View file

@ -27,7 +27,7 @@ namespace {
"turn", "gold", "villages", "num_units", "upkeep", "expenses",
"income", "terrain", "position", "side_playing", "observers",
"report_countdown", "report_clock",
"selected_terrain", "edit_left_button_function", "editor2_tool_hint"
"selected_terrain", "edit_left_button_function", "editor_tool_hint"
};
}

4
src/reports.hpp
View file

@ -34,10 +34,10 @@ namespace reports {
TURN, GOLD, VILLAGES, NUM_UNITS, UPKEEP, EXPENSES,
INCOME, TERRAIN, POSITION, SIDE_PLAYING, OBSERVERS,
REPORT_COUNTDOWN, REPORT_CLOCK, SELECTED_TERRAIN,
EDIT_LEFT_BUTTON_FUNCTION, EDITOR2_TOOL_HINT, NUM_REPORTS};
EDIT_LEFT_BUTTON_FUNCTION, EDITOR_TOOL_HINT, NUM_REPORTS};
enum { UNIT_REPORTS_BEGIN=UNIT_NAME, UNIT_REPORTS_END=UNIT_PROFILE+1 };
enum { STATUS_REPORTS_BEGIN=TIME_OF_DAY, STATUS_REPORTS_END=EDITOR2_TOOL_HINT };
enum { STATUS_REPORTS_BEGIN=TIME_OF_DAY, STATUS_REPORTS_END=EDITOR_TOOL_HINT };
const std::string& report_name(TYPE type);

8
src/tests/gui/test_gui2.cpp
View file

@ -27,7 +27,7 @@
#include "gui/dialogs/addon_connect.hpp"
#include "gui/dialogs/addon_list.hpp"
#include "gui/dialogs/campaign_selection.hpp"
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
#include "gui/dialogs/editor_generate_map.hpp"
#include "gui/dialogs/editor_new_map.hpp"
#include "gui/dialogs/editor_resize_map.hpp"
@ -179,8 +179,8 @@ BOOST_AUTO_TEST_CASE(test_gui2)
game_config::config_cache& cache = game_config::config_cache::instance();
cache.clear_defines();
#ifndef DISABLE_EDITOR2
cache.add_define("EDITOR2");
#ifndef DISABLE_EDITOR
cache.add_define("EDITOR");
#endif
cache.add_define("MULTIPLAYER");
#ifdef USE_TINY_GUI
@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(test_gui2)
test<gui2::taddon_connect>();
test<gui2::taddon_list>();
test<gui2::tcampaign_selection>();
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
test<gui2::teditor_generate_map>();
test<gui2::teditor_new_map>();
test<gui2::teditor_resize_map>();

4
src/titlescreen.cpp
View file

@ -424,7 +424,7 @@ TITLE_RESULT show_title(game_display& screen, config& tips_of_day)
N_("TitleScreen button^Multiplayer"),
N_("TitleScreen button^Load"),
N_("TitleScreen button^Add-ons"),
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
N_("TitleScreen button^Map Editor"),
#endif
N_("TitleScreen button^Language"),
@ -444,7 +444,7 @@ TITLE_RESULT show_title(game_display& screen, config& tips_of_day)
N_("Play multiplayer (hotseat, LAN, or Internet), or a single scenario against the AI"),
N_("Load a saved game"),
N_("Download usermade campaigns, eras, or map packs"),
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
N_("Start the map editor"),
#endif
N_("Change the language"),

2
src/titlescreen.hpp
View file

@ -40,7 +40,7 @@ enum TITLE_RESULT { TUTORIAL = 1, /**< Start special campaign 'tutorial' */
NEW_CAMPAIGN, /**< Let user select a campaign to play */
MULTIPLAYER, /**< Play single scenario against humans or AI */
LOAD_GAME, GET_ADDONS,
#ifndef DISABLE_EDITOR2
#ifndef DISABLE_EDITOR
START_MAP_EDITOR,
#endif
CHANGE_LANGUAGE, EDIT_PREFERENCES,