| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_map_c = |
2 | * static char *rcsid_map_c = |
| 3 | * "$Id: map.C,v 1.14 2006/08/30 06:06:26 root Exp $"; |
3 | * "$Id: map.C,v 1.15 2006/08/30 08:28:32 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 | |
| … | |
… | |
| 1181 | /* If we get here, we did not find any map */ |
1181 | /* If we get here, we did not find any map */ |
| 1182 | if (count==10) return; |
1182 | if (count==10) return; |
| 1183 | |
1183 | |
| 1184 | object_thawer thawer (firstname); |
1184 | object_thawer thawer (firstname); |
| 1185 | |
1185 | |
|
|
1186 | if (!thawer) |
|
|
1187 | return; |
|
|
1188 | |
| 1186 | m->in_memory=MAP_LOADING; |
1189 | m->in_memory=MAP_LOADING; |
| 1187 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1190 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
| 1188 | delete_unique_items(m); /* original map before, don't duplicate them */ |
1191 | delete_unique_items(m); /* original map before, don't duplicate them */ |
| 1189 | load_object(thawer, NULL, LO_NOREAD,0); |
1192 | load_object(thawer, NULL, LO_NOREAD,0); |
| 1190 | load_objects (m, thawer, 0); |
1193 | load_objects (m, thawer, 0); |
| … | |
… | |
| 1564 | m=load_overlay_map(name, m); |
1567 | m=load_overlay_map(name, m); |
| 1565 | if (m==NULL) |
1568 | if (m==NULL) |
| 1566 | return NULL; |
1569 | return NULL; |
| 1567 | } |
1570 | } |
| 1568 | |
1571 | |
|
|
1572 | if (flags & MAP_PLAYER_UNIQUE) |
|
|
1573 | INVOKE_MAP (SWAPIN, m); |
|
|
1574 | |
| 1569 | } else { |
1575 | } else { |
| 1570 | /* If in this loop, we found a temporary map, so load it up. */ |
1576 | /* If in this loop, we found a temporary map, so load it up. */ |
| 1571 | |
1577 | |
| 1572 | m=load_temporary_map (m); |
1578 | m=load_temporary_map (m); |
| 1573 | if(m==NULL) return NULL; |
1579 | if(m==NULL) return NULL; |
