[Megameknet-cvs] MegaMekNET/src/server/campaign CampaignMain.java,1.122,1.123

[Immanuel S. <im...@us...>]

Update of /cvsroot/megameknet/MegaMekNET/src/server/campaign
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5552/src/server/campaign

Modified Files:
	CampaignMain.java 
Log Message:
Cyclops changes and some minor corrections to the xml loading

Index: CampaignMain.java
===================================================================
RCS file: /cvsroot/megameknet/MegaMekNET/src/server/campaign/CampaignMain.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** CampaignMain.java	29 Mar 2005 20:10:38 -0000	1.122
--- CampaignMain.java	9 Apr 2005 09:47:46 -0000	1.123
***************
*** 433,443 ****
  			}
  			
! 			try {
! 				// saving in fresh xml format for the next run to make it better :)
! 				// yea, I know. Not the fine english way to do the save, but this
! 				// is temporary anyway.
! 				new SaveCampaignCommand().process(new String[]{"xml"}, null);
! 			} catch (Exception e1) {
! 			}
  			
  		} // end loading old .dat file format
--- 433,438 ----
  			}
  			
! 			// saving in fresh xml format for the next run to make it better :)
! 			saveData();
  			
  		} // end loading old .dat file format
***************
*** 1733,1739 ****
  			BlackBoardMessage bbm = (BlackBoardMessage) it.next();
  			if (bbm.decreaseTick())
! 				it.remove();
  		}
! 		
  		// unit rebuild
  		units = new Hashtable();
--- 1728,1734 ----
  			BlackBoardMessage bbm = (BlackBoardMessage) it.next();
  			if (bbm.decreaseTick())
! 				blackBoard.removeMessage(bbm.getTitle());
  		}
! 
  		// unit rebuild
  		units = new Hashtable();