[Timewarp-commit] source/melee mfleet.cpp,1.21,1.22

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

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164/source/melee

Modified Files:
	mfleet.cpp 
Log Message:
Setting $(NAME) dependences in makefile properly. Fixed compilation problem without jgmod library.

Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mfleet.cpp	1 Feb 2004 08:35:15 -0000	1.21
--- mfleet.cpp	4 Feb 2004 21:12:00 -0000	1.22
***************
*** 15,18 ****
--- 15,19 ----
  #include <string.h>
  #include <stdio.h>
+ #include <ctype.h>
  #include <stdlib.h>
  #include <allegro.h>
***************
*** 482,491 ****
      int Fleet::getNextFleetEntryByCharacter(int currentShip, char c) {
          
!         ASSERT(ships.at(currentShip) != null);
          ASSERT(currentShip < ships.size());
          ASSERT(currentShip >=0);
          c = toupper(c);
! 
!         for (int i=currentShip+1; i<ships.size(); i++) {
              MyFleetShipType temp = ships.at(i);
              ASSERT(temp!=NULL);
--- 483,493 ----
      int Fleet::getNextFleetEntryByCharacter(int currentShip, char c) {
          
!         ASSERT(ships.at(currentShip) != NULL);
          ASSERT(currentShip < ships.size());
          ASSERT(currentShip >=0);
          c = toupper(c);
! 	
! 	int i;
!         for (i=currentShip+1; i<ships.size(); i++) {
              MyFleetShipType temp = ships.at(i);
              ASSERT(temp!=NULL);