Merge pull request Atlantis-PBEM#13 from ennorehling/static-analysis

some small bugs in standard game
hdclearman · Nov 15, 2015 · 9e90ec2 · 9e90ec2
2 parents b8b9a6c + edb936e
commit 9e90ec2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/standard/extra.cpp b/standard/extra.cpp
@@ -97,25 +97,21 @@ int Game::SetupFaction( Faction *pFac )
 
 Faction *Game::CheckVictory()
 {
-	ARegion *reg;
 	forlist(&regions) {
 		ARegion *r = (ARegion *)elem;
 		forlist(&r->objects) {
 			Object *obj = (Object *)elem;
 			if (obj->type != O_BKEEP) continue;
 			if (obj->units.Num()) return NULL;
-			reg = r;
-			break;
-		}
-	}
-	{
-		// Now see find the first faction guarding the region
-		forlist(&reg->objects) {
-			Object *o = reg->GetDummy();
-			forlist(&o->units) {
-				Unit *u = (Unit *)elem;
-				if (u->guard == GUARD_GUARD) return u->faction;
+			// Now see find the first faction guarding the region
+			forlist(&reg->objects) {
+				Object *o = reg->GetDummy();
+				forlist(&o->units) {
+					Unit *u = (Unit *)elem;
+					if (u->guard == GUARD_GUARD) return u->faction;
+				}
 			}
+			break;
 		}
 	}
 	return NULL;

diff --git a/standard/map.cpp b/standard/map.cpp
@@ -484,7 +484,7 @@ void ARegionList::MakeLand(ARegionArray *pRegs, int percentOcean,
 			}
 			for (int i=0; i<sz; i++) {
 				int dir = getrandom(NDIRS);
-				if ((reg->yloc < yoff*2) && ((dir < 2) || (dir = NDIRS-1))
+				if ((reg->yloc < yoff*2) && ((dir < 2) || (dir == NDIRS-1))
 					&& (getrandom(4) < 3)) continue;
 				if ((reg->yloc > (yband+yoff)*2) && ((dir < 5) && (dir > 1))
 					&& (getrandom(4) < 3)) continue;				
@@ -837,7 +837,7 @@ void ARegionList::MakeUWMaze(ARegionArray *pArr)
 			ARegion *reg = pArr->GetRegion(x, y);
 			if (!reg) continue;
 
-			for (int i=D_NORTH; i<= NDIRS; i++) {
+			for (int i=D_NORTH; i< NDIRS; i++) {
 				int count = 0;
 				for (int j=D_NORTH; j< NDIRS; j++)
 					if (reg->neighbors[j]) count++;
@@ -1217,5 +1217,5 @@ void ARegionList::FinalSetupGates()
 			r->gatemonth = getrandom(12);;
 		}
 	}
-	delete used;
+	delete[] used;
 }