Difference for crossedit/Edit.c from version 1.20 to 1.21


version 1.20 version 1.21
Line 57
 
Line 57
   
     memcpy(m2, m1, sizeof(mapstruct));      memcpy(m2, m1, sizeof(mapstruct));
   
   #if 0
       /* I'm really not sure how this is used - in any
        * case, we need to copy the objects now, and
        * I think we'd really need to make a copy of the objects,
        * but I'm not sure of the callback structure of this and
        * where this is used.  Once that is figured out,
        * this can probably be fixed to do the right thing.
        * MSW 2006-03-14
        */
     for(x=0;x<MAP_WIDTH(m1)&&x<MAP_WIDTH(m2);x++)      for(x=0;x<MAP_WIDTH(m1)&&x<MAP_WIDTH(m2);x++)
  for(y=0;y<MAP_HEIGHT(m1)&&y<MAP_HEIGHT(m2);y++) {   for(y=0;y<MAP_HEIGHT(m1)&&y<MAP_HEIGHT(m2);y++) {
      SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,0),0);       SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,0),0);
      SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,1),1);       SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,1),1);
      SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,2),2);       SET_MAP_FACE(m2,x,y,GET_MAP_FACE(m1,x,y,2),2);
  }   }
   #endif
 }  }
   
 /*  /*
Line 201
 
Line 211
     if (above)      if (above)
         above->below = o;          above->below = o;
     else {      else {
  SET_MAP_FACE (emap, o->x, o->y, o->face,0);   SET_MAP_FACE_OBJ (emap, o->x, o->y, o, 0);
     }      }
     if (below)      if (below)
         below->above = o;          below->above = o;


Legend:
line(s) removed in v.1.20 
line(s) changed
 line(s) added in v.1.21

File made using version 1.98 of cvs2html by leaf at 2011-07-21 19:49