Difference for main/physics.c from version 1.2 to 1.3


version 1.2 version 1.3
Line 19
 
Line 19
  * Code for flying through the mines   * Code for flying through the mines
  *    *
  * $Log$   * $Log$
    * Revision 1.3  2000/06/25 08:34:29  sekmu
    * file-line for segfault info
    *
  * Revision 1.2  2000/01/19 04:48:37  sekmu   * Revision 1.2  2000/01/19 04:48:37  sekmu
  * added debug info for illegal side type   * added debug info for illegal side type
  *   *
Line 634
 
Line 637
  }   }
   
  //check for correct object segment    //check for correct object segment
  if(!get_seg_masks(&obj->pos,obj->segnum,0).centermask==0) {          if(!get_seg_masks(&obj->pos,obj->segnum,0,__FILE__,__LINE__).centermask==0) {
  #ifndef NDEBUG   #ifndef NDEBUG
  mprintf((0,"Warning: object %d not in given seg!\n",objnum));   mprintf((0,"Warning: object %d not in given seg!\n",objnum));
  #endif   #endif
Line 765
 
Line 768
  if (obj->type == OBJ_PLAYER)   if (obj->type == OBJ_PLAYER)
  fq.flags |= FQ_GET_SEGLIST;   fq.flags |= FQ_GET_SEGLIST;
   
 //@@ if (get_seg_masks(&obj->pos,obj->segnum,0).centermask!=0)  //@@                    if (get_seg_masks(&obj->pos,obj->segnum,0,__FILE__,__LINE__).centermask!=0)
 //@@ Int3();  //@@ Int3();
   
 save_p0 = *fq.p0;  save_p0 = *fq.p0;
Line 842
 
Line 845
  obj_relink(objnum, iseg );   obj_relink(objnum, iseg );
   
  //if start point not in segment, move object to center of segment   //if start point not in segment, move object to center of segment
  if (get_seg_masks(&obj->pos,obj->segnum,0).centermask!=0) {                  if (get_seg_masks(&obj->pos,obj->segnum,0,__FILE__,__LINE__).centermask!=0) {
  int n;   int n;
   
  if ((n=find_object_seg(obj))==-1) {   if ((n=find_object_seg(obj))==-1) {
Line 1121
 
Line 1124
   
 //--WE ALWYS WANT THIS IN, MATT AND MIKE DECISION ON 12/10/94, TWO MONTHS AFTER FINAL #ifndef NDEBUG  //--WE ALWYS WANT THIS IN, MATT AND MIKE DECISION ON 12/10/94, TWO MONTHS AFTER FINAL #ifndef NDEBUG
  //if end point not in segment, move object to last pos, or segment center   //if end point not in segment, move object to last pos, or segment center
  if (get_seg_masks(&obj->pos,obj->segnum,0).centermask!=0) {          if (get_seg_masks(&obj->pos,obj->segnum,0,__FILE__,__LINE__).centermask!=0) {
  if (find_object_seg(obj)==-1) {   if (find_object_seg(obj)==-1) {
  int n;   int n;
   

Legend:
line(s) removed in v.1.2 
line(s) changed
 line(s) added in v.1.3