| version 1.10 | | version 1.11 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_c_misc_c = | | * static char *rcsid_c_misc_c = |
| * "$Id: c_misc.c,v 1.10 2001/05/09 06:58:12 mwedel Exp $"; | | * "$Id: c_misc.c,v 1.11 2001/06/04 06:41:02 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++); | | for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++); |
| for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++) | | for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++) |
| if(m->in_memory == MAP_IN_MEMORY) | | if(m->in_memory == MAP_IN_MEMORY) |
| mapmem+=m->mapx*m->mapy*(sizeof(object *)+sizeof(MapLook *)*3), | | mapmem+=m->map_object->x*m->map_object->y*(sizeof(object *)+sizeof(MapLook *)*3), |
| nrm++; | | nrm++; |
| sprintf(errmsg,"Sizeof: object=%ld player=%ld map=%ld", | | sprintf(errmsg,"Sizeof: object=%ld player=%ld map=%ld", |
| (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct)); | | (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct)); |
| | |
| new_draw_info_format(NDI_UNIQUE, 0, op, | | new_draw_info_format(NDI_UNIQUE, 0, op, |
| "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", | | "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", |
| m->players, m->difficulty, | | m->players, m->difficulty, |
| m->mapx, m->mapy, | | m->map_object->x, m->map_object->y, |
| EXIT_X(m->map_object), EXIT_Y(m->map_object), | | EXIT_X(m->map_object), EXIT_Y(m->map_object), |
| MAP_TIMEOUT(m)); | | MAP_TIMEOUT(m)); |
| | | |
| | |
| | | |
| for (mp = styles; mp!=NULL; mp=mp->next) { | | for (mp = styles; mp!=NULL; mp=mp->next) { |
| maps_used++; | | maps_used++; |
| mapmem += mp->mapx*mp->mapy*(sizeof(object *)+sizeof(MapLook *)*3) + sizeof(mapstruct); | | mapmem += mp->map_object->x*mp->map_object->y*(sizeof(object *)+sizeof(MapLook *)*3) + sizeof(mapstruct); |
| for (x=0; x<mp->mapx; x++) { | | for (x=0; x<mp->map_object->x; x++) { |
| for (y=0; y<mp->mapy; y++) { | | for (y=0; y<mp->map_object->y; y++) { |
| for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) | | for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) |
| objects_used++; | | objects_used++; |
| } | | } |