ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.2 by root, Sat Aug 26 23:36:28 2006 UTC

1/* 1/*
2 * static char *rcsid_living_c = 2 * static char *rcsid_living_c =
3 * "$Id: living.C,v 1.1 2006/08/13 17:16:00 elmex Exp $"; 3 * "$Id: living.C,v 1.2 2006/08/26 23:36:28 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
1083 } 1083 }
1084 /* If there is desire that two handed weapons should do 1084 /* If there is desire that two handed weapons should do
1085 * extra strength damage, this is where the code should 1085 * extra strength damage, this is where the code should
1086 * go. 1086 * go.
1087 */ 1087 */
1088 evt = find_event(tmp,EVENT_ATTACK);
1089 if (evt != NULL) {
1090 if (op->current_weapon_script)
1091 free_string(op->current_weapon_script);
1092 op->current_weapon_script=add_string(query_name(tmp));
1093 }
1094 op->current_weapon = tmp; 1088 op->current_weapon = tmp;
1095 if(settings.spell_encumbrance == TRUE && op->type==PLAYER) 1089 if(settings.spell_encumbrance == TRUE && op->type==PLAYER)
1096 op->contr->encumbrance+=(int)3*tmp->weight/1000; 1090 op->contr->encumbrance+=(int)3*tmp->weight/1000;
1097 break; 1091 break;
1098 1092

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines