| … | |
… | |
| 48 | for (at = new_obj->arch->more; at != NULL; at = at->more) |
48 | for (at = new_obj->arch->more; at != NULL; at = at->more) |
| 49 | { |
49 | { |
| 50 | object *new_seg; |
50 | object *new_seg; |
| 51 | |
51 | |
| 52 | new_seg = arch_to_object (at); |
52 | new_seg = arch_to_object (at); |
| 53 | new_seg->x = x + at->clone.x; |
53 | new_seg->x = x + at->x; |
| 54 | new_seg->y = y + at->clone.y; |
54 | new_seg->y = y + at->y; |
| 55 | new_seg->map = old_seg->map; |
55 | new_seg->map = old_seg->map; |
| 56 | insert_ob_in_map (new_seg, new_seg->map, new_seg, INS_NO_MERGE | INS_NO_WALK_ON); |
56 | insert_ob_in_map (new_seg, new_seg->map, new_seg, INS_NO_MERGE | INS_NO_WALK_ON); |
| 57 | new_seg->head = head; |
57 | new_seg->head = head; |
| 58 | old_seg->more = new_seg; |
58 | old_seg->more = new_seg; |
| 59 | old_seg = new_seg; |
59 | old_seg = new_seg; |
| … | |
… | |
| 83 | total_experience = 0; |
83 | total_experience = 0; |
| 84 | failed_placements = 0; |
84 | failed_placements = 0; |
| 85 | exp_per_sq = 0; |
85 | exp_per_sq = 0; |
| 86 | while (exp_per_sq <= level_exp (difficulty, 1.0) && failed_placements < 100 && number_monsters < (RP->Xsize * RP->Ysize) / 8) |
86 | while (exp_per_sq <= level_exp (difficulty, 1.0) && failed_placements < 100 && number_monsters < (RP->Xsize * RP->Ysize) / 8) |
| 87 | { |
87 | { |
| 88 | object *this_monster = pick_random_object (style_map); |
88 | object *this_monster = style_map->pick_random_object (); |
| 89 | int x, y, freeindex; |
89 | int x, y, freeindex; |
| 90 | |
90 | |
| 91 | if (this_monster == NULL) |
91 | if (this_monster == NULL) |
| 92 | return; /* no monster?? */ |
92 | return; /* no monster?? */ |
| 93 | |
93 | |
| 94 | x = RANDOM () % RP->Xsize; |
94 | x = rndm (RP->Xsize); |
| 95 | y = RANDOM () % RP->Ysize; |
95 | y = rndm (RP->Ysize); |
| 96 | freeindex = find_first_free_spot (this_monster, map, x, y); |
96 | freeindex = find_first_free_spot (this_monster, map, x, y); |
| 97 | if (freeindex != -1) |
97 | if (freeindex != -1) |
| 98 | { |
98 | { |
| 99 | object *new_monster = arch_to_object (this_monster->arch); |
99 | object *new_monster = arch_to_object (this_monster->arch); |
| 100 | |
100 | |
| … | |
… | |
| 102 | y += freearr_y[freeindex]; |
102 | y += freearr_y[freeindex]; |
| 103 | copy_object_with_inv (this_monster, new_monster); |
103 | copy_object_with_inv (this_monster, new_monster); |
| 104 | new_monster->x = x; |
104 | new_monster->x = x; |
| 105 | new_monster->y = y; |
105 | new_monster->y = y; |
| 106 | insert_multisquare_ob_in_map (new_monster, map); |
106 | insert_multisquare_ob_in_map (new_monster, map); |
| 107 | total_experience += this_monster->stats.exp; |
|
|
| 108 | |
107 | |
| 109 | for (at = new_monster->arch; at; at = at->more) |
108 | if (new_monster->is_alive ()) |
| 110 | number_monsters++; |
109 | { |
|
|
110 | total_experience += this_monster->stats.exp; |
| 111 | |
111 | |
|
|
112 | for (at = new_monster->arch; at; at = at->more) |
|
|
113 | number_monsters++; |
|
|
114 | |
|
|
115 | assert (new_monster->stats.hp >= 0); |
| 112 | RP->total_map_hp += new_monster->stats.hp; /* a global count */ |
116 | RP->total_map_hp += new_monster->stats.hp; /* a global count */ |
|
|
117 | } |
|
|
118 | else |
|
|
119 | failed_placements++; |
| 113 | } |
120 | } |
| 114 | else |
121 | else |
| 115 | failed_placements++; |
122 | failed_placements++; |
| 116 | |
123 | |
| 117 | exp_per_sq = (sint64) (((double) 1000 * total_experience) / (map->width * map->height + 1)); |
124 | exp_per_sq = (sint64) (((double) 1000 * total_experience) / (map->width * map->height + 1)); |
