|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-10-24 22:48:06
|
Revision: 12230
http://crossfire.svn.sourceforge.net/crossfire/?rev=12230&view=rev
Author: akirschbaum
Date: 2009-10-24 22:47:59 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
Fix incorrect error message for throwing skill when no throwable object was found.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/server/skills.c
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2009-10-24 22:20:13 UTC (rev 12229)
+++ server/trunk/ChangeLog 2009-10-24 22:47:59 UTC (rev 12230)
@@ -14,6 +14,10 @@
else. With this, include the file(s) that you changed.
------------------------------------------------------------------------------
+Fix incorrect error message for throwing skill when no throwable object
+was found.
+Andreas Kirschbaum 2009-10-25
+
Fix checks for incorrect/missing parameters of 'abil' command.
Andreas Kirschbaum 2009-10-25
Modified: server/trunk/server/skills.c
===================================================================
--- server/trunk/server/skills.c 2009-10-24 22:20:13 UTC (rev 12229)
+++ server/trunk/server/skills.c 2009-10-24 22:47:59 UTC (rev 12230)
@@ -1805,15 +1805,16 @@
/* look through the inventory */
if (tmp == NULL) {
FOR_INV_PREPARE(op, tmp2) {
- tmp = tmp2;
/* can't toss invisible or inv-locked items */
- if (tmp->invisible || QUERY_FLAG(tmp, FLAG_INV_LOCKED))
+ if (tmp2->invisible || QUERY_FLAG(tmp2, FLAG_INV_LOCKED))
continue;
- query_name(tmp, name, MAX_BUF);
+ query_name(tmp2, name, MAX_BUF);
if (!request
|| !strcmp(name, request)
- || !strcmp(tmp->name, request))
+ || !strcmp(tmp2->name, request)) {
+ tmp = tmp2;
break;
+ }
} FOR_INV_FINISH();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|