[Timewarp-commit] source/melee mfleet.cpp,1.13,1.14 moptions.cpp,1.8,1.9

[<yu...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source/melee

Modified Files:
	mfleet.cpp moptions.cpp 
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships

Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mfleet.cpp	12 Nov 2003 17:35:30 -0000	1.13
--- mfleet.cpp	15 Nov 2003 20:48:06 -0000	1.14
***************
*** 182,186 ****
              return NULL;
  
!         return ships.at(slot);
      }
  
--- 182,186 ----
              return NULL;
  
!         return ships[slot];
      }
  

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** moptions.cpp	15 Nov 2003 12:24:46 -0000	1.8
--- moptions.cpp	15 Nov 2003 20:48:06 -0000	1.9
***************
*** 204,208 ****
  
          //set index for resolution
!         int x, y, x2, y2, i, bpp, bpp2, fs;
          x2 = videosystem.width;
          y2 = videosystem.height;
--- 204,208 ----
  
          //set index for resolution
!         int x=-1, y=-1, x2, y2, i, bpp, bpp2, fs;
          x2 = videosystem.width;
          y2 = videosystem.height;
***************
*** 212,217 ****
              if ((x == x2) && (y == y2)) break;
          }
          video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
-         
          //set index for bpp
          bpp = videosystem.bpp;
--- 212,219 ----
              if ((x == x2) && (y == y2)) break;
          }
+         if(!resolution[0])
+         	tw_error("Resolution error");
+         	
          video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
          //set index for bpp
          bpp = videosystem.bpp;