[Freeciv-Dev] (PR#40568) [Editor] Copy and paste icons

[Madeline Book]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40568 >

I fashioned two icons representing "copy" and "paste" out of
one of pep's (!= pepeto) editor icons. Attached is the new
editor.png and a patch to make the icons usable in the code.

Also, I originally made a mistake in the spec file (off by 1
error ;)) which the patch fixes.


-----------------------------------------------------------------------
じゃあ、諸悪の根源は無知だという訳か。

diff --git a/client/tilespec.c b/client/tilespec.c
index 79631e0..927f37c 100644
--- a/client/tilespec.c
+++ b/client/tilespec.c
@@ -2306,6 +2306,8 @@ static void tileset_lookup_sprite_tags(struct tileset *t)
 #define SET_EDITOR_SPRITE(x) SET_SPRITE(editor.x, "editor." #x)
   SET_EDITOR_SPRITE(erase);
   SET_EDITOR_SPRITE(brush);
+  SET_EDITOR_SPRITE(copy);
+  SET_EDITOR_SPRITE(paste);
   SET_EDITOR_SPRITE(startpos);
   SET_EDITOR_SPRITE(terrain);
   SET_EDITOR_SPRITE(terrain_resource);
diff --git a/client/tilespec.h b/client/tilespec.h
index e1d9fbd..a1123e3 100644
--- a/client/tilespec.h
+++ b/client/tilespec.h
@@ -225,6 +225,8 @@ struct editor_sprites {
   struct sprite
     *erase,
     *brush,
+    *copy,
+    *paste,
     *startpos,
     *terrain,
     *terrain_resource,
diff --git a/data/misc/editor.spec b/data/misc/editor.spec
index 113d62e..1693980 100644
--- a/data/misc/editor.spec
+++ b/data/misc/editor.spec
@@ -78,7 +78,7 @@ tiles = { "row", "column", "tag"
 [grid_extra]
 
 x_top_left = 1
-y_top_left = 143
+y_top_left = 142
 dx = 30
 dy = 30
 pixel_border = 1
@@ -89,4 +89,6 @@ tiles = { "row", "column", "tag"
   0,  2, "editor.tiny_brush"
   0,  3, "editor.type_paint"
   0,  4, "editor.bitmap_to_map"
+  0,  5, "editor.copy"
+  0,  6, "editor.paste"
 }

<<inline: editor_with_copy_paste.png>>

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev