Copy over entire map functions

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
master
sigonasr2 2 years ago
parent f975a30925
commit f85a6c8a3b
  1. BIN
      C++ProjectTemplate
  2. 36
      test/test.cpp

Binary file not shown.

@ -114,9 +114,6 @@ bool ValidateEntireMap(std::vector<std::vector<TILE*>>&mapref1,std::vector<std::
for (int x=0;x<mapref1.size();x++) { for (int x=0;x<mapref1.size();x++) {
for (int y=0;y<mapref1[x].size();y++) { for (int y=0;y<mapref1[x].size();y++) {
if (mapref2[x][y]!=mapref1[x][y]) { if (mapref2[x][y]!=mapref1[x][y]) {
std::cout<<x<<","<<y<<" failed:"<<std::endl;
std::cout<<" "<<mapref2[x][y].tileX<<"|"<<mapref2[x][y].tileY<<"|"<<std::to_string(mapref2[x][y].tileDegree)<<std::endl;
std::cout<<" "<<mapref1[x][y]->tileX<<"|"<<mapref1[x][y]->tileY<<"|"<<std::to_string(mapref1[x][y]->tileDegree)<<std::endl;
return false; return false;
} }
} }
@ -729,6 +726,39 @@ bool SeasonI::OnUserCreate(){
ValidateEntireMap(MAP4,TEMPMAP4)&& ValidateEntireMap(MAP4,TEMPMAP4)&&
ValidateEntireMap(MAP5,TEMPMAP5)&& ValidateEntireMap(MAP5,TEMPMAP5)&&
ValidateEntireMap(MAP6,TEMPMAP6)); ValidateEntireMap(MAP6,TEMPMAP6));
TILE prevTile1=TEMPMAP[6][4];
TILE prevTile2=TEMPMAP2[2][0];
TILE prevTile3=TEMPMAP3[7][2];
TILE prevTile4=TEMPMAP4[1][14];
TILE prevTile5=TEMPMAP5[7][2];
TILE prevTile6=TEMPMAP6[9][6];
TEMPMAP[6][4]=TILE(9,4,0);
TEMPMAP2[2][0]=TILE(4,7,0);
TEMPMAP3[7][2]=TILE(4,9,0);
TEMPMAP4[1][14]=TILE(1,2,-1);
TEMPMAP5[7][2]=TILE(6,8,0);
TEMPMAP6[9][6]=TILE(4,17,0);
Test("After modifications, some parts of the map should no longer be equal",
!ValidateEntireMap(MAP,TEMPMAP)&&
!ValidateEntireMap(MAP2,TEMPMAP2)&&
!ValidateEntireMap(MAP3,TEMPMAP3)&&
!ValidateEntireMap(MAP4,TEMPMAP4)&&
!ValidateEntireMap(MAP5,TEMPMAP5)&&
!ValidateEntireMap(MAP6,TEMPMAP6));
TEMPMAP[6][4]=prevTile1;
TEMPMAP2[2][0]=prevTile2;
TEMPMAP3[7][2]=prevTile3;
TEMPMAP4[1][14]=prevTile4;
TEMPMAP5[7][2]=prevTile5;
TEMPMAP6[9][6]=prevTile6;
LoadMap(MAPS[MapName::TEST]);
Test("Upon reloading a map every tile should match up once again",
ValidateEntireMap(MAP,TEMPMAP)&&
ValidateEntireMap(MAP2,TEMPMAP2)&&
ValidateEntireMap(MAP3,TEMPMAP3)&&
ValidateEntireMap(MAP4,TEMPMAP4)&&
ValidateEntireMap(MAP5,TEMPMAP5)&&
ValidateEntireMap(MAP6,TEMPMAP6));
return true; return true;
} }

Loading…
Cancel
Save