rpms/nazghul/FC-4 nazghul-0.5.3-diagonalattackfix.patch, NONE, 1.1 nazghul.spec, 1.3, 1.4

[Jason Tibbitts (tibbs)]

Author: tibbs

Update of /cvs/extras/rpms/nazghul/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14175

Modified Files:
	nazghul.spec 
Added Files:
	nazghul-0.5.3-diagonalattackfix.patch 
Log Message:
* Thu Jun  8 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-5
- Add fix for crash when attacking diagonally in the wilderness.


nazghul-0.5.3-diagonalattackfix.patch:

--- NEW FILE nazghul-0.5.3-diagonalattackfix.patch ---
diff -ur nazghul-0.5.3-orig/src/cmd.c nazghul-0.5.3/src/cmd.c
--- nazghul-0.5.3-orig/src/cmd.c	2006-02-04 09:46:23.000000000 -0600
+++ nazghul-0.5.3/src/cmd.c	2006-06-08 08:45:59.425233976 -0500
@@ -1020,6 +1020,16 @@
         info.x = place_wrap_x(info.place, player_party->getX() + info.dx);
         info.y = place_wrap_y(info.place, player_party->getY() + info.dy);
         info.npc_party = place_get_Party(info.place, info.x, info.y);
+
+	if (info.place->wilderness) {
+		// Only allow adjacent attacks in wilderness
+		if (info.dx && info.dy)
+		{
+			cmdwin_print("-adjacent foes only!");
+			return;
+		}
+	}
+
         if (info.npc_party == NULL) {
                 cmdwin_print("-nobody there!");
                 return;


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/FC-4/nazghul.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nazghul.spec	14 Feb 2006 17:21:02 -0000	1.3
+++ nazghul.spec	8 Jun 2006 14:33:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:	haxima.png
 Patch0:		nazghul-haxima-startup.patch
 Patch1:		nazghul-0.5.3-64bit.patch
+Patch2:		nazghul-0.5.3-diagonalattackfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel, desktop-file-utils
@@ -37,6 +38,7 @@
 %setup -q
 %patch0
 %patch1 -b .64bit
+%patch2 -p1 -b .diagonalattackfix
 mv doc/* .
 
 
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Thu Jun  8 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-5
+- Add fix for crash when attacking diagonally in the wilderness.
+
 * Tue Feb 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-4
 - More 64bit fixes.
 - Package additional documentation.