From a60e59aab06a9658b4b6fdedc3a6d8911caa319a Mon Sep 17 00:00:00 2001
From: cade <>
Date: Thu, 4 Jul 2002 10:09:11 +0000
Subject: [PATCH] - 2- and 4-side mirror editing is available in the internal
editor (press ctrl+m several times to toggle 2-, 4-, disable...)
---
Rules.make | 8 ++++++--
src/editor/editloop.cpp | 20 +++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/Rules.make b/Rules.make
index ea44e47c5..fec21f77e 100644
--- a/Rules.make
+++ b/Rules.make
@@ -23,8 +23,12 @@ CCL = -DUSE_CCL
CCLLIB = -lm
# Video support
-VIDEO = -DUSE_X11
-VIDEOLIB = -lXext -lX11 -ldl
+SDL = -DUSE_SDL -DUSE_SDLA $(SDL_CFLAGS)
+SDL_CFLAGS = $(shell sdl-config --cflags)
+SDLLIB = $(shell sdl-config --libs)
+
+VIDEO = $(SDL)
+VIDEOLIB = $(SDLLIB) -ldl
# Sound support
DSOUND = -DWITH_SOUND
diff --git a/src/editor/editloop.cpp b/src/editor/editloop.cpp
index df212c6e9..10a783396 100644
--- a/src/editor/editloop.cpp
+++ b/src/editor/editloop.cpp
@@ -259,6 +259,9 @@ global void EditTiles(int x, int y, int tile, int size)
if ( !MirrorEdit ) return;
EditTilesInternal( mx - x - size, y, tile, size );
+
+ if ( MirrorEdit == 1 ) return;
+
EditTilesInternal( x, my - y - size, tile, size );
EditTilesInternal( mx - x - size, my - y - size, tile, size );
}
@@ -308,6 +311,9 @@ local void EditUnit(int x, int y, UnitType* type, Player* player)
if ( !MirrorEdit ) return;
EditUnitInternal( mx - x - 1, y, type, player );
+
+ if ( MirrorEdit == 1 ) return;
+
EditUnitInternal( x, my - y - 1, type, player );
EditUnitInternal( mx - x - 1, my - y - 1, type, player );
}
@@ -1281,9 +1287,17 @@ local void EditorCallbackKeyDown(unsigned key, unsigned keychar)
case 'M': // CTRL+M Mirror edit
if( KeyModifiers & ModifierControl )
{
- MirrorEdit = !MirrorEdit;
- SetStatusLine( MirrorEdit ? "Miror editing enabled"
- : "Miror editing disabled" );
+ MirrorEdit++;
+ if ( MirrorEdit == 3 ) MirrorEdit = 0;
+ switch( MirrorEdit )
+ {
+ case 1:
+ SetStatusLine( "Mirror editing enabled: 2-side" ); break;
+ case 2:
+ SetStatusLine( "Mirror editing enabled: 4-side" ); break;
+ default:
+ SetStatusLine( "Mirror editing disabled" ); break;
+ }
}
break;