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


version 1.19 version 1.20
Line 40
 
Line 40
 #include "Str.h"  #include "Str.h"
 #include "Bitmaps.h"  #include "Bitmaps.h"
   
   #include "libproto.h"
   #include "proto.h"
   
 /*  /*
  * This function relinks all _pointers_ to the objects from   * This function relinks all _pointers_ to the objects from
Line 50
 
Line 52
  * moved to Edit.c from common/map.c since Edit.c is the only file that uses it.   * moved to Edit.c from common/map.c since Edit.c is the only file that uses it.
  */   */
   
 void copy_map(mapstruct *m1, mapstruct *m2) {  static void copy_map(mapstruct *m1, mapstruct *m2) {
     int x,y;      int x,y;
   
     memcpy(m2, m1, sizeof(mapstruct));      memcpy(m2, m1, sizeof(mapstruct));
Line 71
 
Line 73
  * dx    : positive translate to right   * dx    : positive translate to right
  * dy    : positive translate to down   * dy    : positive translate to down
  */   */
 mapstruct *MapMoveScrollResize(mapstruct *source,   static mapstruct *MapMoveScrollResize(mapstruct *source,
  int width, int height, int dx, int dy)    int width, int height, int dx, int dy)
 {  {
     mapstruct *target;      mapstruct *target;
Line 160
 
Line 162
 }  }
   
   
 object * MapGetRealObject (mapstruct * emap, int x, int y, int z)  static object * MapGetRealObject (mapstruct * emap, int x, int y, int z)
 {  {
     object *tmp = MapGetObjectZ (emap, x, y, z);      object *tmp = MapGetObjectZ (emap, x, y, z);
     return tmp ? (tmp->head ? tmp->head : tmp) : tmp;      return tmp ? (tmp->head ? tmp->head : tmp) : tmp;
 }  }
   
 int MapInsertObjectZ(mapstruct *emap,object *o,int x, int y, int z)  static int MapInsertObjectZ(mapstruct *emap,object *o,int x, int y, int z)
 {  {
     object *op, *above, *below;      object *op, *above, *below;
   
Line 209
 
Line 211
     return (0);      return (0);
 }  }
   
 int MapObjectOut (mapstruct *target, object *obj, int x, int y) {  static int MapObjectOut (mapstruct *target, object *obj, int x, int y) {
     object *tmp;      object *tmp;
     for(tmp = obj; tmp; tmp = tmp->more)      for(tmp = obj; tmp; tmp = tmp->more)
         if(OUT_OF_REAL_MAP(target,x + tmp->x,y + tmp->y)) return 1;          if(OUT_OF_REAL_MAP(target,x + tmp->x,y + tmp->y)) return 1;


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

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