xconq ./ChangeLog kernel/ui.c kernel/ui.h lib/ ...

xconq ./ChangeLog kernel/ui.c kernel/ui.h lib/ ...

[shebs]

CVSROOT:	/cvs/xconq
Module name:	xconq
Changes by:	shebs@sources.redhat.com	2001-01-23 08:25:09

Modified files:
	.              : ChangeLog 
	kernel         : ui.c ui.h 
	lib            : terrain.imf imf.dir 
	sdl            : sdlcmd.c sdlconq.h sdlimf.c sdlinit.c sdlmain.c 
	                 sdlmap.c 
Added files:
	images         : misc44x48.gif 

Log message:
	Clean up SDL declarations, add display of country borders
	and hex grid.
	* ui.c, ui.h (unit_could_attack): Move to here from sdlmain.c,
	was called could_attack.
	
	* sdlconq.h: Add many decls.
	(struct a_real_ui): New fields grids, no_grid_available,
	country_boundaries, no_country_boundary_available.
	(Map draw_grid): New field.
	* sdlcmd.c (do_fire): Remove unused arg, uncomment code.
	(do_refresh): Comment out call to update_contour_intervals.
	* sdlimf.c: Declare random_color.
	(sdl_interp_image): Eliminate special cases of subimage
	iteration.
	(sdl_copy_color_image): Move mask blackening in here, reorg,
	add some comments.
	* sdlinit.c (hexagon_w1, hexagon_w2): New globals.
	(init_other_images): Collect image families for them.
	* sdlmain.c: Make many functions static, add decls for them.
	(set_current_unit): Call update_map.
	(handle_mouse_down): Add button argument.
	(interp_key): Enable code to set mouse position when key pressed.
	(ui_update_state): Comment out.
	(interp_unix_ui_data): Comment in, remove leftover tcl calls.
	(set_show_all): Add arguments.
	(exit_xconq): Remove unused argument.
	* sdlcmd.c (do_quit, aux_quit_exit, etc): Change callers.
	* sdlmap.c: Fix up decls.
	(draw_terrain_grid, get_grid_surface, draw_country_boundary_line,
	get_country_boundary_surface, hex_face_rect): New functions.
	(open_sdl_window): Use full area for map, set smap->draw_grid.
	(draw_map_overhead): Enable grid-drawing code.
	(draw_terrain_row): Remove unused dogrid local.
	(draw_people): Enable boundary-drawing code.
	(update_at_cell, update_at_unit): Call update_map.
	
	* images/misc44x48.gif: New file, misc shapes.
	* terrain.imf, imf.dir (hexagon-w1, hexagon-w2): New images,
	borders of hexagons.