| version 1.6 | | version 1.7 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_wall_c = | | * static char *rcsid_wall_c = |
| * "$Id: wall.c,v 1.6 2001/05/31 22:46:37 mardahl Exp $"; | | * "$Id: wall.c,v 1.7 2001/07/14 04:08:06 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | | |
| | | Copyright (C) 2001 Mark Wedel |
| Copyright (C) 1992 Frank Tore Johansen | | Copyright (C) 1992 Frank Tore Johansen |
| | | |
| This program is free software; you can redistribute it and/or modify | | This program is free software; you can redistribute it and/or modify |
| | |
| along with this program; if not, write to the Free Software | | along with this program; if not, write to the Free Software |
| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| | | |
| The author can be reached via e-mail to mark@pyramid.com | | The author can be reached via e-mail to mwedel@scruz.net |
| */ | | */ |
| | | |
| | | |
| | |
| thiswall->x = i; thiswall->y = j; | | thiswall->x = i; thiswall->y = j; |
| SET_FLAG(thiswall,FLAG_NO_PASS); /* make SURE it's a wall */ | | SET_FLAG(thiswall,FLAG_NO_PASS); /* make SURE it's a wall */ |
| wall(map,i,j); | | wall(map,i,j); |
| insert_ob_in_map_simple(thiswall,map); | | insert_ob_in_map(thiswall,map,thiswall,INS_NO_MERGE | INS_NO_WALK_ON); |
| } | | } |
| } | | } |
| } | | } |
| | |
| free_object(the_wall); | | free_object(the_wall); |
| } | | } |
| SET_FLAG(new_wall,FLAG_NO_PASS); /* make SURE it's a wall */ | | SET_FLAG(new_wall,FLAG_NO_PASS); /* make SURE it's a wall */ |
| insert_ob_in_map_simple(new_wall,the_map); | | insert_ob_in_map(new_wall,the_map,new_wall,INS_NO_MERGE | INS_NO_WALK_ON); |
| } | | } |
| else | | else |
| nroferrors--; /* it's OK not to find an arch. */ | | nroferrors--; /* it's OK not to find an arch. */ |