[Exult-cvs-logs] exult ChangeLog,1.1916,1.1917 cheat.cc,1.97,1.98 cheat.h,1.38,1.39 exult.cc,1.475,1.476

[<js...@us...>]

Update of /cvsroot/exult/exult
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745

Modified Files:
	ChangeLog cheat.cc cheat.h exult.cc 
Log Message:
You can now move whole chunks around

Index: ChangeLog
===================================================================
RCS file: /cvsroot/exult/exult/ChangeLog,v
retrieving revision 1.1916
retrieving revision 1.1917
diff -u -d -r1.1916 -r1.1917
--- ChangeLog	13 Mar 2005 06:34:40 -0000	1.1916
+++ ChangeLog	28 Mar 2005 05:11:47 -0000	1.1917
@@ -1,3 +1,8 @@
+2005-03-27    <je...@mi...>
+
+	* cheat.cc (Cheat): Ctrl-arrow keys will move entire chunks when
+	in "Select chunks" mode.
+
 2005-03-12    <je...@mi...>
 
 	* data/exultmsg.txt: Applied "international support" patch from

Index: cheat.cc
===================================================================
RCS file: /cvsroot/exult/exult/cheat.cc,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- cheat.cc	2 Mar 2005 08:01:56 -0000	1.97
+++ cheat.cc	28 Mar 2005 05:11:47 -0000	1.98
@@ -42,6 +42,7 @@
 #include "drag.h"
 #include "effects.h"
 #include "chunks.h"
+#include "objiter.h"
 
 #ifdef USE_EXULTSTUDIO  /* Only needed for exult studio. */
 #include "server.h"
@@ -82,6 +83,8 @@
 
 	browser = NULL;
 	tester = NULL;
+	chunksel_left = chunksel_top = c_num_chunks;
+	chunksel_right = chunksel_bottom = -1;
 }
 
 Cheat::~Cheat() {
@@ -210,7 +213,25 @@
 	gwin->set_all_dirty();
 }
 
+void Cheat::set_edit_mode(Map_editor_mode md) { 
+	edit_mode = md;
+	if (edit_mode != select_chunks) {
+		clear_chunksel();
+		gwin->set_all_dirty();
+	}
+}
+
 void Cheat::clear_chunksel(void) {
+	if (chunksel_right >= 0 && chunksel_bottom >= 0) {
+		int startx = chunksel_left, stopx = chunksel_right + 1;
+		int starty = chunksel_top, stopy = chunksel_bottom + 1;
+		for (int cy = starty; cy != stopy; cy = INCR_CHUNK(cy))
+			for (int cx = startx; cx != stopx; 
+							cx = INCR_CHUNK(cx)) {
+				Map_chunk *chunk = gmap->get_chunk(cx, cy);
+				chunk->set_selected(false);
+			}
+	}
 	chunksel_left = chunksel_top = c_num_chunks;
 	chunksel_right = chunksel_bottom = -1;
 }
@@ -229,6 +250,76 @@
 	// ++++++++LATER:  Handle extend.
 }
 
+/*	Move a given chunk. */
+void Cheat::move_chunk(Map_chunk *chunk, int dx, int dy) {
+					// Figure dest. with wrapping.
+	int tox = (chunk->get_cx() + dx + c_num_chunks)%c_num_chunks;
+	int toy = (chunk->get_cy() + dy + c_num_chunks)%c_num_chunks;
+	Map_chunk *tochunk = gmap->get_chunk(tox, toy);
+	Game_object_vector tmplist;	// Delete objs. in 'tochunk'.
+	Game_object *obj;
+
+	{				// Iterator needs its own scope.
+		Object_iterator toiter(tochunk->get_objects());
+		while ((obj = toiter.get_next()) != 0)
+			if (!obj->as_npc())
+				tmplist.push_back(obj);
+	}
+	for (Game_object_vector::const_iterator it=tmplist.begin(); 
+						it!=tmplist.end(); ++it)
+		(*it)->remove_this();
+	tmplist.clear();
+					// Copy terrain into new chunk.
+	tochunk->set_terrain(chunk->get_terrain());
+	{
+		Object_iterator fromiter(chunk->get_objects());
+		while ((obj = fromiter.get_next()) != 0)
+			if (!obj->as_terrain())
+				tmplist.push_back(obj);
+	}
+	dx *= c_tiles_per_chunk;
+	dy *= c_tiles_per_chunk;
+	for (Game_object_vector::const_iterator it=tmplist.begin(); 
+						it!=tmplist.end(); ++it) {
+		obj = *it;
+		Tile_coord t = obj->get_tile();
+		// Got to move objects legally.
+		obj->move((t.tx + dx + c_num_tiles)%c_num_tiles,
+			  (t.ty + dy + c_num_tiles)%c_num_tiles, t.tz);
+	}
+					// For now, set terrain to #0.
+	chunk->set_terrain(gmap->get_terrain(0));
+	chunk->set_selected(false);
+	tochunk->set_selected(true);
+}
+
+/*	Move all the selected chunks. */
+void Cheat::move_selected_chunks(int dx, int dy) {
+	int startx, stopx, dirx, starty, stopy, diry;
+
+	if (dx <= 0) {
+		startx = chunksel_left; stopx = chunksel_right + 1; dirx = 1;
+	} else {
+		startx = chunksel_right; stopx = chunksel_left - 1; dirx = -1;
+	}
+	if (dy <= 0) {
+		starty = chunksel_top; stopy = chunksel_bottom + 1; diry = 1;
+	} else {
+		starty = chunksel_bottom; stopy = chunksel_top - 1; diry = -1;
+	}
+	for (int cy = starty; cy != stopy; cy += diry)
+		for (int cx = startx; cx != stopx; cx += dirx) {
+			Map_chunk *chunk = gmap->get_chunk(cx, cy);
+			if (chunk->is_selected())
+				move_chunk(chunk, dx, dy);
+		}
+	gwin->set_all_dirty();
+	chunksel_left = (chunksel_left + dx + c_num_chunks)%c_num_chunks;
+	chunksel_right = (chunksel_right + dx + c_num_chunks)%c_num_chunks;
+	chunksel_top = (chunksel_top + dy + c_num_chunks)%c_num_chunks;
+	chunksel_bottom = (chunksel_bottom + dy + c_num_chunks)%c_num_chunks;
+}
+
 void Cheat::set_edit_lift(int lift) {
 	if (!enabled) return;
 	edit_lift = lift;
@@ -481,7 +572,7 @@
  *	Move the selected objects by given #tiles.  Objects inside another are
  *	treated as being at the location of their owner.
  */
-void Cheat::move_selected(int dx, int dy, int dz) {
+void Cheat::move_selected_objs(int dx, int dy, int dz) {
 	if (selected.empty())
 		return;			// Nothing to do.
 	std::vector<Tile_coord> tiles;	// Store locations here.
@@ -521,6 +612,14 @@
 		}
 	}
 
+/*	Move selected objects/chunks. */
+void Cheat::move_selected(int dx, int dy, int dz) {
+	if (edit_mode == select_chunks)
+		move_selected_chunks(dx, dy);
+	else
+		move_selected_objs(dx, dy, dz);
+}
+
 /*
  *	Want lowest, southmost, then eastmost first.
  */

Index: cheat.h
===================================================================
RCS file: /cvsroot/exult/exult/cheat.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cheat.h	2 Mar 2005 08:01:56 -0000	1.38
+++ cheat.h	28 Mar 2005 05:11:48 -0000	1.39
@@ -96,9 +96,11 @@
   void set_wizard (bool wizard) { wizard_mode = wizard; }
   void toggle_map_editor (void);
   void toggle_tile_grid (void);
-  void set_edit_mode(Map_editor_mode md) { edit_mode = md; }
+  void set_edit_mode(Map_editor_mode md);
   void clear_chunksel();
   void add_chunksel(Map_chunk *chunk, bool extend = false);
+  void Cheat::move_chunk(Map_chunk *chunk, int dx, int dy);
+  void Cheat::move_selected_chunks(int dx, int dy);
   void set_edit_lift(int lift);
   void set_edit_shape(int sh, int fr);
   void set_edit_chunknum(int chnum) { edit_chunknum = chnum; }
@@ -131,6 +133,7 @@
   void toggle_selected(Game_object *obj);
   void clear_selected();
   void delete_selected();
+  void move_selected_objs(int dx, int dy, int dz);
   void move_selected(int dx, int dy, int dz);
   const Game_object_vector& get_selected() const
 	{ return selected; }

Index: exult.cc
===================================================================
RCS file: /cvsroot/exult/exult/exult.cc,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- exult.cc	13 Mar 2005 10:14:41 -0000	1.475
+++ exult.cc	28 Mar 2005 05:11:48 -0000	1.476
@@ -912,9 +912,14 @@
 	lastcx = cx; lastcy = cy;
 	Map_chunk *chunk = gwin->get_map()->get_chunk(cx, cy);
 	if (toggle)
-		chunk->set_selected(!chunk->is_selected());
+		{
+		if (!chunk->is_selected())
+			cheat.add_chunksel(chunk);
+		else
+			chunk->set_selected(false);
+		}
 	else
-		chunk->set_selected(true);
+		cheat.add_chunksel(chunk);
 	gwin->set_all_dirty();
 	}