xconq ./ChangeLog kernel/combat.c kernel/conq. ...

[shebs@sourceware.cygnus.com]

CVSROOT:	/cvs/xconq
Module name:	xconq
Changes by:	shebs@sources.redhat.com	2000-12-08 09:10:10

Modified files:
	.              : ChangeLog 
	kernel         : combat.c conq.h history.def nlang.c ui.c ui.h 
	mac            : maccmd.c macmouse.c 
	tcltk          : tkcmd.c tkmap.c 
	curses         : cconq.c 

Log message:
	Add player feedback for out-of-ammo and other action failures.
	(Still missing Mac interface version, more complicated because
	of multi-unit selections.)
	* history.def (zz-undefined): New hevt type, flag value.
	(insufficient-ammo): New hevt type, distinguishes missing
	ammo from other types of missing material.
	* combat.c (check_attack_action, check_overrun_action,
	check_fire_at_action, check_fire_into_action): Return
	A_ANY_NO_AMMO instead of A_ANY_NO_MATERIAL
	* nlang.c (action_result_desc): Add case for A_ANY_NO_AMMO,
	improve the default case.
	(advance_failure_desc): New function, describes reason for
	failure to advance into a cell.
	* conq.h (advance_failure_desc): Declare.
	* ui.c (advance_into_cell): Add failure code argument, rewrite
	cases to use it.
	* ui.h (advance_into_cell): Update decl.
	
	* maccmd.c (do_one_dir_move): Add argument to advance_into_cell.
	* macmouse.c (move_the_selected_unit): Ditto.
	* tkcmd.c (aux_move_dir): Ditto, plus notify of failure reason.
	* tkmap.c (move_the_selected_unit): Ditto.
	* cconq.c (do_dir_2): Ditto.