Menu
▾
▴
[Crossfire-cvs] CVS commit: crossfire
|
From: <cro...@li...> - 2002-12-21 08:02:36
|
Module Name: crossfire
Committed By: mwedel
Date: Sat Dec 21 08:02:35 UTC 2002
Modified Files:
crossfire: ChangeLog
crossfire/common: living.c
crossfire/server: apply.c monster.c spell_effect.c weather.c
Log Message:
Various bug fixes:
common/living.c: Reset glow_radius for players, so they stop glowing
after they snuff out their torch or whatever.
server/apply.c: Fix message about improving armour so that it is now
accurate.
server/monster.c: Add some debug lines that may show cause of excess
monster hp.
server/spell_effect.c: fix compile warning in summon_pet(). Clean up
indentation of alchemy functions, but functional changes is to
insert gold nuggets below player (so more of the actions work),
as well as to reset the view position, so that it won't have the
'previous 50' object selection. Add suggested parens in
cast_detection.
server/weather.c: Fix crash in weather code if snow was only object
on space.
MSW 2002-12-20
The following files had too many changes to show the context diffs here:
cvs rdiff -r1.86 -r1.87 crossfire/server/spell_effect.c
Start of context diffs
Index: crossfire/ChangeLog
diff -c crossfire/ChangeLog:1.24 crossfire/ChangeLog:1.25
*** crossfire/ChangeLog:1.24 Sun Dec 8 20:59:38 2002
--- crossfire/ChangeLog Sat Dec 21 00:02:32 2002
***************
*** 17,22 ****
--- 17,40 ----
------------------------------------------------------------------------------
Changes for CVS:
+ Various bug fixes:
+ common/living.c: Reset glow_radius for players, so they stop glowing
+ after they snuff out their torch or whatever.
+ server/apply.c: Fix message about improving armour so that it is now
+ accurate.
+ server/monster.c: Add some debug lines that may show cause of excess
+ monster hp.
+ server/spell_effect.c: fix compile warning in summon_pet(). Clean up
+ indentation of alchemy functions, but functional changes is to
+ insert gold nuggets below player (so more of the actions work),
+ as well as to reset the view position, so that it won't have the
+ 'previous 50' object selection. Add suggested parens in
+ cast_detection.
+ server/weather.c: Fix crash in weather code if snow was only object
+ on space.
+ MSW 2002-12-20
+
+ +++
server/weather.c:
More weather routines:
***************
*** 38,43 ****
--- 56,62 ----
Some of the conditions for the various tiles really need to be looked at,
and fiddled with.
garbled 2002-12-08
+ +++
common/exp.c: Fix bug were drain attacks added exp.
MSW 2002-12-05
Index: crossfire/common/living.c
diff -c crossfire/common/living.c:1.45 crossfire/common/living.c:1.46
*** crossfire/common/living.c:1.45 Thu Dec 5 21:36:28 2002
--- crossfire/common/living.c Sat Dec 21 00:02:33 2002
***************
*** 1,6 ****
/*
* static char *rcsid_living_c =
! * "$Id: living.c,v 1.45 2002/12/06 05:36:28 mwedel Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_living_c =
! * "$Id: living.c,v 1.46 2002/12/21 08:02:33 mwedel Exp $";
*/
/*
***************
*** 796,801 ****
--- 796,802 ----
op->path_attuned=op->arch->clone.path_attuned;
op->path_repelled=op->arch->clone.path_repelled;
op->path_denied=op->arch->clone.path_denied;
+ op->glow_radius=op->arch->clone.glow_radius;
/* initializing resistances from the values in player/monster's
* archetype clone
Index: crossfire/server/apply.c
diff -c crossfire/server/apply.c:1.72 crossfire/server/apply.c:1.73
*** crossfire/server/apply.c:1.72 Thu Dec 12 15:48:10 2002
--- crossfire/server/apply.c Sat Dec 21 00:02:33 2002
***************
*** 1,6 ****
/*
* static char *rcsid_apply_c =
! * "$Id: apply.c,v 1.72 2002/12/12 23:48:10 garbled Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
/*
* static char *rcsid_apply_c =
! * "$Id: apply.c,v 1.73 2002/12/21 08:02:33 mwedel Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
***************
*** 610,616 ****
{
int i;
! i = armour->magic * op->level;
if (i > new_armour) new_armour=i;
new_draw_info_format(NDI_UNIQUE, 0,op,"You need to be level %d", new_armour);
--- 610,616 ----
{
int i;
! i = armour->magic * 10;
if (i > new_armour) new_armour=i;
new_draw_info_format(NDI_UNIQUE, 0,op,"You need to be level %d", new_armour);
Index: crossfire/server/monster.c
diff -c crossfire/server/monster.c:1.55 crossfire/server/monster.c:1.56
*** crossfire/server/monster.c:1.55 Mon Dec 2 23:40:18 2002
--- crossfire/server/monster.c Sat Dec 21 00:02:34 2002
***************
*** 1,6 ****
/*
* static char *rcsid_monster_c =
! * "$Id: monster.c,v 1.55 2002/12/03 07:40:18 mwedel Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_monster_c =
! * "$Id: monster.c,v 1.56 2002/12/21 08:02:34 mwedel Exp $";
*/
/*
***************
*** 348,353 ****
--- 348,359 ----
op->last_heal+= (int)((float)(8*op->stats.Con)/FABS(op->speed));
op->stats.hp+=op->last_heal/32; /* causes Con/4 hp/tick */
+
+ /* Try to track down bug of really high hp in mosnters */
+ if (op->stats.hp > op->stats.maxhp)
+ LOG(llevDebug,"Creatures hp exceeds in maxhp (%d > %d), last_heal=%d\n",
+ op->stats.hp, op->stats.maxhp, op->last_heal);
+
op->last_heal%=32;
/* So if the monster has gained enough HP that they are no longer afraid */
Index: crossfire/server/weather.c
diff -c crossfire/server/weather.c:1.20 crossfire/server/weather.c:1.21
*** crossfire/server/weather.c:1.20 Wed Dec 11 11:54:52 2002
--- crossfire/server/weather.c Sat Dec 21 00:02:35 2002
***************
*** 1,6 ****
/*
* static char *rcsid_weather_c =
! * "$Id: weather.c,v 1.20 2002/12/11 19:54:52 garbled Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
/*
* static char *rcsid_weather_c =
! * "$Id: weather.c,v 1.21 2002/12/21 08:02:35 mwedel Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
***************
*** 1622,1630 ****
if (!strcmp(oldsnow->arch->name, at->name))
at = NULL;
else {
- remove_ob(oldsnow);
- free_object(oldsnow);
tmp=GET_MAP_OB(m, x, y);
/* clean up the trees we put over the snow */
found = 0;
doublestack2 = NULL;
--- 1622,1629 ----
if (!strcmp(oldsnow->arch->name, at->name))
at = NULL;
else {
tmp=GET_MAP_OB(m, x, y);
+ remove_ob(oldsnow);
/* clean up the trees we put over the snow */
found = 0;
doublestack2 = NULL;
***************
*** 1645,1650 ****
--- 1644,1650 ----
break;
}
}
+ free_object(oldsnow);
if (tmp != NULL && doublestack2 != NULL)
if (strcmp(tmp->arch->name, doublestack2) == 0) {
remove_ob(tmp);
|
