|
From: Crossfire C. r. messages.
<cro...@li...> - 2011-06-28 20:23:17
|
Revision: 14732
http://crossfire.svn.sourceforge.net/crossfire/?rev=14732&view=rev
Author: ryo_saeba
Date: 2011-06-28 20:23:11 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Fix crash with detect monster on custom monsters.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/server/spell_effect.c
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2011-06-28 19:32:49 UTC (rev 14731)
+++ server/trunk/ChangeLog 2011-06-28 20:23:11 UTC (rev 14732)
@@ -14,6 +14,10 @@
else. With this, include the file(s) that you changed.
------------------------------------------------------------------------------
+Fix crash with detect monster on custom monsters.
+Reference count wasn't uptodate, thus archetype would be freed.
+Nicolas Weeger 2011-06-28
+
Rewrite picture loading logic to not be dependant on picture number
in the various bmaps and crossfire.x files.
Remove picture number in crossfire.x files.
Modified: server/trunk/server/spell_effect.c
===================================================================
--- server/trunk/server/spell_effect.c 2011-06-28 19:32:49 UTC (rev 14731)
+++ server/trunk/server/spell_effect.c 2011-06-28 20:23:11 UTC (rev 14732)
@@ -2593,9 +2593,11 @@
dx = HEAD(detect)->x;
dy = HEAD(detect)->y;
-
+
detect_ob = object_create_arch(HEAD(detect)->arch);
for (part = detect_ob; part != NULL; part = part->more) {
+ if (part->arch->reference_count > 0)
+ part->arch->reference_count++;
part->last_anim = 0;
part->type = spell->other_arch->clone.type;
for (flag = 0; flag < 4; flag++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|