Turn map.contents into a plain array

map.contents always has 1200 tiles in it, there's no reason it should be
a vector.

This is a big commit because it requires changing all the level classes
to return a pointer to an array instead of returning a vector. Which
took a while for me to figure out, but eventually I did it. I tested to
make sure and there's no problems.

desktop_version/src/Finalclass.cpp

@@ -2,12 +2,12 @@
 
 #include "MakeAndPlay.h"
 
-std::vector<int> finalclass::loadlevel(int rx, int ry)
+const int* finalclass::loadlevel(int rx, int ry)
 {
 	int t;
 
 	t = rx + (ry * 100);
-	std::vector<int> result;
+	const int* result;
 	coin = 0;
 	rcol = 0;
 	warpx = false;
@@ -62,7 +62,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpx = true;
 		roomname = "1954 World Cup Vinyl";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -110,7 +110,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(256, 128, 10, 0, 51503);  // (savepoint)
 		warpy = true;
 		roomname = "The V Stooges";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -158,7 +158,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "glitch";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -208,7 +208,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "glitch";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -256,7 +256,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "change";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -306,7 +306,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "change";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -353,7 +353,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "change";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -410,7 +410,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "Vertigo";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -464,7 +464,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "The Voon Show";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -510,7 +510,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "glitch";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -559,7 +559,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpx = true;
 		roomname = "1950 Silverstone Grand V";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -618,7 +618,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		warpx = true;
 		warpy = true;
 		roomname = "DIY V Repair";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	};
 
@@ -658,7 +658,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		740,740,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740,
 		};
 		roomname = "Party Time!";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -706,7 +706,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(96, 88, 1, 3, 8);  // Enemy
 		obj.createentity(72, 32, 10, 0, 52431);  // (savepoint)
 		roomname = "Upstairs, Downstairs";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -763,7 +763,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		//obj.createentity(224, 168, 1, 1, 5, 0, 120, 320, 200);  // Enemy, bounded
 		obj.createentity(24, 184, 10, 1, 52440);  // (savepoint)
 		roomname = "Timeslip";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -808,7 +808,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(128, 88, 10, 1, 52451);  // (savepoint)
 		obj.createentity(160, 76, 11, 96);  // (horizontal gravity line)
 		roomname = "Three's Company";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -855,7 +855,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(120, 192, 2, 3, 6);  // Platform
 		obj.createentity(264, 48, 2, 2, 6);  // Platform
 		roomname = "Cosmic Creepers";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	};
 
@@ -903,7 +903,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(123, 128, 12, 88);  // (vertical gravity line)
 
 		roomname = "The Villi People";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -956,7 +956,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpx = true;
 		roomname = "change";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1006,7 +1006,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpx = true;
 		roomname = "change";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1056,7 +1056,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(272, 80, 3);  //Disappearing Platform
 		obj.createentity(304, 80, 3);  //Disappearing Platform
 		roomname = "The Last Straw";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1107,7 +1107,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(128, 88, 3);  //Disappearing Platform
 		obj.createentity(160, 88, 3);  //Disappearing Platform
 		roomname = "W";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1153,7 +1153,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(120, 128, 9, 19);  // (shiny trinket)
 
 		roomname="V";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1194,7 +1194,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
 		};
 		roomname = "VV";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1235,7 +1235,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
 		};
 		roomname = "VVV";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1276,7 +1276,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
 		};
 		roomname = "VVVV";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1317,7 +1317,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		};
 
 		roomname = "VVVVV";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1370,7 +1370,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 			obj.createblock(1, 0, 0, 320, 120, 3500); //Game complete
 		}
 		roomname = "VVVVVV";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1414,7 +1414,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		rcol = 6;
 		warpy = true;
 		roomname = "Temporary Fault...";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1455,7 +1455,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		};
 		warpy = true;
 		roomname = "Do Not Adjust the V-hold";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1503,7 +1503,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "Regular Service Will Return Shortly";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1546,7 +1546,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(120, 116, 11, 80);  // (horizontal gravity line)
 		warpy = true;
 		roomname = "Origami Room";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1591,7 +1591,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		obj.createentity(40, 80, 10, 1, 50500);  // (savepoint)
 
 		roomname = "Teleporter Divot";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1642,7 +1642,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 				obj.createblock(1, 26*8, 0, 32, 240, 36);
 			}
 		}
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1689,7 +1689,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		{
 			obj.createblock(1, 40, 0, 32, 240, 82);
 		}
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1732,7 +1732,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Whee Sports";
 		warpx = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1774,7 +1774,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Whizz Down The Shaft";
 		warpx = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1821,7 +1821,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "The Gravitron";
 		warpx = true; //warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1891,7 +1891,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		warpx = true;
 
 		game.swnmode = false;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1936,7 +1936,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "House of Mirrors";
 		warpx = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -1982,7 +1982,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "Now Take My Lead";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2031,7 +2031,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "What Are You Waiting For?";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2081,7 +2081,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "Don't Get Ahead of Yourself!";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2131,7 +2131,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Very Good";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2177,7 +2177,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		roomname = "Must I Do Everything For You?";
 		warpy = true;
 
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2226,7 +2226,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Now Stay Close To Me...";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2270,7 +2270,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "...But Not Too Close";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2312,7 +2312,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		warpy = true;
 		roomname = "Don't Be Afraid";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2359,7 +2359,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		}
 		warpy = true;
 		roomname = "Do as I Say...";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2405,7 +2405,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "...Not as I Do";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2452,7 +2452,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 		}
 		warpy = true;
 		roomname = "Mind Your Head";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2502,7 +2502,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Do Try To Keep Up";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2546,7 +2546,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "You're Falling Behind";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2595,7 +2595,7 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 		roomname = "Class Dismissed!";
 		warpy = true;
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 
@@ -2604,12 +2604,12 @@ std::vector<int> finalclass::loadlevel(int rx, int ry)
 
 	default:
 	{
-		const int contents[1200] = {0};
+		static const int contents[1200] = {0};
 		roomname = "Outer Space";
 
 		//game.test = true;
 		//game.teststring = "ERROR: Map not found in Final Area";
-		result.insert(result.end(), contents, contents+1200);
+		result = contents;
 		break;
 	}
 	}