Fixed a few small conquest bugs

Atlantis-PBEM · Jul 9, 2001 · d9001bb · d9001bb
1 parent 08b1dd7
commit d9001bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/aregion.cpp b/aregion.cpp
@@ -1779,7 +1779,7 @@ void ARegion::WriteReport(Areport * f,Faction * fac,int month,
             f->PutStr(temp);
         }
 
-        if (num == 0) {
+        if (type == R_NEXUS) {
 			int len = strlen(AC_STRING)+2*strlen(Globals->WORLD_NAME);
 			char *nexus_desc = new char[len];
 			sprintf(nexus_desc, AC_STRING, Globals->WORLD_NAME,
@@ -2208,11 +2208,6 @@ int ARegionList::ReadRegions(Ainfile * f,AList * factions, ATL_VER v )
     int num = f->GetInt();
 
     numLevels = f->GetInt();
-	if(numLevels != 2 + Globals->UNDERWORLD_LEVELS +
-			Globals->UNDERDEEP_LEVELS + Globals->ABYSS_LEVEL) {
-		Awrite("Number of regions changed from game file!");
-		return 0;
-	}
     CreateLevels( numLevels );
     int i;
     for( i = 0; i < numLevels; i++ )

diff --git a/conquest/extra.cpp b/conquest/extra.cpp
@@ -210,9 +210,9 @@ void Game::ModifyTablesPerRuleset(void)
 	ModifyTerrainItems(R_ISLAND_PLAIN, 0, I_HORSE, 100, 20);
 
 	ClearTerrainItems(R_ISLAND_SWAMP);
-	ModifyTerrainItems(R_ISLAND_PLAIN, 0, I_WOOD, 100, 10);
+	ModifyTerrainItems(R_ISLAND_SWAMP, 0, I_WOOD, 100, 10);
 
 	ClearTerrainItems(R_ISLAND_MOUNTAIN);
-	ModifyTerrainItems(R_ISLAND_PLAIN, 0, I_IRON, 100, 20);
+	ModifyTerrainItems(R_ISLAND_MOUNTAIN, 0, I_IRON, 100, 20);
 	return;
 }