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

Comparing deliantra/server/random_maps/monster.C (file contents):
Revision 1.7 by root, Sat Dec 30 18:45:28 2006 UTC vs.
Revision 1.8 by root, Sun Dec 31 17:17:23 2006 UTC

41 41
42 x = new_obj->x; 42 x = new_obj->x;
43 y = new_obj->y; 43 y = new_obj->y;
44 old_seg = new_obj; 44 old_seg = new_obj;
45 head = new_obj; 45 head = new_obj;
46
46 for (at = new_obj->arch->more; at != NULL; at = at->more) 47 for (at = new_obj->arch->more; at != NULL; at = at->more)
47 { 48 {
48 object *new_seg; 49 object *new_seg;
49 50
50 new_seg = arch_to_object (at); 51 new_seg = arch_to_object (at);
54 insert_ob_in_map (new_seg, new_seg->map, new_seg, INS_NO_MERGE | INS_NO_WALK_ON); 55 insert_ob_in_map (new_seg, new_seg->map, new_seg, INS_NO_MERGE | INS_NO_WALK_ON);
55 new_seg->head = head; 56 new_seg->head = head;
56 old_seg->more = new_seg; 57 old_seg->more = new_seg;
57 old_seg = new_seg; 58 old_seg = new_seg;
58 } 59 }
60
59 old_seg->more = NULL; 61 old_seg->more = NULL;
60
61
62} 62}
63
64 63
65/* place some monsters into the map. */ 64/* place some monsters into the map. */
66void 65void
67place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params * RP) 66place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params * RP)
68{ 67{
107 for (at = new_monster->arch; at != NULL; at = at->more) 106 for (at = new_monster->arch; at != NULL; at = at->more)
108 number_monsters++; 107 number_monsters++;
109 RP->total_map_hp += new_monster->stats.hp; /* a global count */ 108 RP->total_map_hp += new_monster->stats.hp; /* a global count */
110 } 109 }
111 else 110 else
112 {
113 failed_placements++; 111 failed_placements++;
114 } 112
115 exp_per_sq = (sint64) (((double) 1000 * total_experience) / (map->width * map->height + 1)); 113 exp_per_sq = (sint64) (((double) 1000 * total_experience) / (map->width * map->height + 1));
116 } 114 }
117} 115}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines