wxString Spring::GetSPScriptTxt( SinglePlayerBattle& battle )
{
  wxString s;
<<<<<<< HEAD:src/spring.cpp
  int AllyConv[16] = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
=======
  std::vector<int> AllyConv;

>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp
  int NumAllys = 0;
  int PlayerTeam = -1;
<<<<<<< HEAD:src/spring.cpp
  int starttype;

  if ( usync()->VersionSupports( GF_XYStartPos ) ) starttype = 3;
  else starttype = 0;

  wxLogMessage( _T("StartPosType=") + WX_STRING( i2s( starttype ) ) );
=======
>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp

  for ( unsigned int i = 0; i < battle.GetNumBots(); i++ ) {
<<<<<<< HEAD:src/spring.cpp
    BattleBot* bot;
    if ( starttype == 3) bot = battle.GetBot( i );
=======
    BattleBot* bot = battle.GetBotByStartPosition( i );
>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp
    ASSERT_LOGIC( bot != 0, _T("bot == 0") );
    if ( bot->aidll == "" ) PlayerTeam = i;
<<<<<<< HEAD:src/spring.cpp
    if ( AllyConv[bot->bs.ally] == -1 ) AllyConv[bot->bs.ally] = NumAllys++;
=======
    if(bot->bs.ally>int(AllyConv.size())-1){
      AllyConv.resize(bot->bs.ally+1,-1);
    }
    if( AllyConv[bot->bs.ally] == -1 ) AllyConv[bot->bs.ally] = NumAllys++;
>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp
  }