From 9dcda179785c5c7e382f3daa4555e4268db227ec Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 3 Jul 2020 02:06:46 -0700 Subject: [PATCH] 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 | 116 +++---- desktop_version/src/Finalclass.h | 3 +- desktop_version/src/Labclass.cpp | 94 +++--- desktop_version/src/Labclass.h | 3 +- desktop_version/src/Map.cpp | 37 ++- desktop_version/src/Map.h | 4 +- desktop_version/src/Otherlevel.cpp | 454 +++++++++++++------------- desktop_version/src/Otherlevel.h | 2 +- desktop_version/src/Spacestation2.cpp | 152 ++++----- desktop_version/src/Spacestation2.h | 3 +- desktop_version/src/WarpClass.cpp | 52 +-- desktop_version/src/WarpClass.h | 3 +- desktop_version/src/editor.cpp | 6 +- desktop_version/src/editor.h | 2 +- 14 files changed, 472 insertions(+), 459 deletions(-) diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp index a92f6229..5d78532e 100644 --- a/desktop_version/src/Finalclass.cpp +++ b/desktop_version/src/Finalclass.cpp @@ -2,12 +2,12 @@ #include "MakeAndPlay.h" -std::vector finalclass::loadlevel(int rx, int ry) +const int* finalclass::loadlevel(int rx, int ry) { int t; t = rx + (ry * 100); - std::vector result; + const int* result; coin = 0; rcol = 0; warpx = false; @@ -62,7 +62,7 @@ std::vector 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 finalclass::loadlevel(int rx, int ry) }; roomname = "VVVVV"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1370,7 +1370,7 @@ std::vector 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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; } } diff --git a/desktop_version/src/Finalclass.h b/desktop_version/src/Finalclass.h index d67704a6..32cf56cc 100644 --- a/desktop_version/src/Finalclass.h +++ b/desktop_version/src/Finalclass.h @@ -5,12 +5,11 @@ #include "Entity.h" #include -#include class finalclass { public: - std::vector loadlevel(int rx, int ry); + const int* loadlevel(int rx, int ry); std::string roomname; int coin, rcol; diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp index d27e364a..c2d70f06 100644 --- a/desktop_version/src/Labclass.cpp +++ b/desktop_version/src/Labclass.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector labclass::loadlevel(int rx, int ry) +const int* labclass::loadlevel(int rx, int ry) { int t; @@ -20,7 +20,7 @@ std::vector labclass::loadlevel(int rx, int ry) } t = rx + (ry * 100); - std::vector result; + const int* result; coin = 0; rcol = 0; roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]"; @@ -74,7 +74,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Get Ready To Bounce"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -118,7 +118,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 0; roomname = "It's Perfectly Safe"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -163,7 +163,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 4; roomname = "Rascasse"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -211,7 +211,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 2; roomname = "Keep Going"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -258,7 +258,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=3; roomname = "Single-slit Experiment"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -305,7 +305,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Don't Flip Out"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -355,7 +355,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 1; roomname = "Shuffled Hallway"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -400,7 +400,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 3; roomname = "Double-slit Experiment"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -446,7 +446,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(40, 112, 10, 0, 253511); // (savepoint) rcol = 2; roomname = "They Call Him Flipper"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -490,7 +490,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(64, 164, 11, 200); // (horizontal gravity line) rcol = 4; roomname = "Three's a Crowd"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -536,7 +536,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(80, 96, 10, 1, 252521); // (savepoint) rcol = 2; roomname = "Hitting the Apex"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -584,7 +584,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=0; roomname = "Square Root"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -629,7 +629,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(176, 180, 11, 112); // (horizontal gravity line) rcol = 4; roomname = "Thorny Exchange"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -675,7 +675,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(88, 112, 10, 0, 250510); // (savepoint) roomname = "Brought to you by the letter G"; rcol = 1; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -720,7 +720,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "Free Your Mind"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -763,7 +763,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(80, 180, 11, 248); // (horizontal gravity line) rcol=0; roomname = "I Changed My Mind, Thelma..."; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -808,7 +808,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=4; roomname = "Indirect Jump Vector"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -852,7 +852,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=5; roomname = "In a Single Bound"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -898,7 +898,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Barani, Barani"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -945,7 +945,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "Safety Dance"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -989,7 +989,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=3; roomname = "Heady Heights"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1040,7 +1040,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Entanglement Generator"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1085,7 +1085,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 0; roomname = "Exhausted?"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1131,7 +1131,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 4; roomname = "The Tantalizing Trinket"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1178,7 +1178,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "The Bernoulli Principle"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1224,7 +1224,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Standing Wave"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1270,7 +1270,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Topsy Turvyism"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1322,7 +1322,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Spike Strip Deployed"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1371,7 +1371,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Vibrating String Problem"; rcol = 5; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1420,7 +1420,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Merge"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1470,7 +1470,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Kids His Age Bounce"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1517,7 +1517,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "I'm Sorry"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1563,7 +1563,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=4; roomname = "Please Forgive Me!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1610,7 +1610,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Playing Foosball"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1664,7 +1664,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=5; roomname = "A Difficult Chord"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1712,7 +1712,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 0; roomname = "The Living Dead End"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1754,7 +1754,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=3; roomname = "AAAAAA"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1796,7 +1796,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 2; roomname = "Diode"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1847,7 +1847,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=0; roomname = "Young Man, It's Worth the Challenge"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1890,7 +1890,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 6; roomname = "Anomaly"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1934,7 +1934,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 6; roomname = "Purest Unobtainium"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1979,7 +1979,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "I Smell Ozone"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2031,7 +2031,7 @@ std::vector labclass::loadlevel(int rx, int ry) roomname = "Why So Blue?"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2081,7 +2081,7 @@ std::vector labclass::loadlevel(int rx, int ry) } roomname = "Philadelphia Experiment"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2089,7 +2089,7 @@ std::vector labclass::loadlevel(int rx, int ry) default: { static const int contents[1200] = {0}; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } } diff --git a/desktop_version/src/Labclass.h b/desktop_version/src/Labclass.h index 0ce561d9..da70885d 100644 --- a/desktop_version/src/Labclass.h +++ b/desktop_version/src/Labclass.h @@ -4,13 +4,12 @@ #include "Game.h" #include "Entity.h" -#include #include class labclass { public: - std::vector loadlevel(int rx, int ry); + const int* loadlevel(int rx, int ry); std::string roomname; int coin, rcol; diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 8c30383c..6691fc89 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -57,12 +57,12 @@ mapclass::mapclass() invincibility = false; //We init the lookup table: - for (int i = 0; i < 30; i++) + for (size_t i = 0; i < SDL_arraysize(vmult); i++) { - vmult.push_back(int(i * 40)); + vmult[i] = i * 40; } //We create a blank map - contents.resize(40 * 30); + SDL_memset(contents, 0, sizeof(contents)); SDL_memset(roomdeaths, 0, sizeof(roomdeaths)); SDL_memset(roomdeathsfinal, 0, sizeof(roomdeathsfinal)); @@ -1307,9 +1307,11 @@ void mapclass::loadlevel(int rx, int ry) #if !defined(MAKEANDPLAY) case 0: case 1: //World Map + { tileset = 1; extrarow = 1; - contents = otherlevel.loadlevel(rx, ry); + const int* tmap = otherlevel.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = otherlevel.roomname; tileset = otherlevel.roomtileset; //do the appear/remove roomname here @@ -1329,13 +1331,17 @@ void mapclass::loadlevel(int rx, int ry) hiddenname = "Dimension VVVVVV"; } break; + } case 2: //The Lab - contents = lablevel.loadlevel(rx, ry); + { + const int* tmap = lablevel.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = lablevel.roomname; tileset = 1; background = 2; graphics.rcol = lablevel.rcol; break; + } case 3: //The Tower tdrawback = true; minitowermode = false; @@ -1375,7 +1381,9 @@ void mapclass::loadlevel(int rx, int ry) obj.createentity(280, 3216, 9, 8); // (shiny trinket) break; case 4: //The Warpzone - contents = warplevel.loadlevel(rx, ry); + { + const int* tmap = warplevel.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = warplevel.roomname; tileset = 1; background = 3; @@ -1389,13 +1397,19 @@ void mapclass::loadlevel(int rx, int ry) if (warpx) background = 3; if (warpx && warpy) background = 5; break; + } case 5: //Space station - contents = spacestation2.loadlevel(rx, ry); + { + const int* tmap = spacestation2.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = spacestation2.roomname; tileset = 0; break; + } case 6: //final level - contents = finallevel.loadlevel(finalx, finaly); + { + const int* tmap = finallevel.loadlevel(finalx, finaly); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = finallevel.roomname; tileset = 1; background = 3; @@ -1427,6 +1441,7 @@ void mapclass::loadlevel(int rx, int ry) } } break; + } case 7: //Final Level, Tower 1 tdrawback = true; minitowermode = true; @@ -1565,7 +1580,8 @@ void mapclass::loadlevel(int rx, int ry) break; case 11: //Tower Hallways //Content is held in final level routine { - contents = finallevel.loadlevel(rx, ry); + const int* tmap = finallevel.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomname = finallevel.roomname; tileset = 2; if (rx == 108) @@ -1645,7 +1661,8 @@ void mapclass::loadlevel(int rx, int ry) roomname=ed.level[curlevel].roomname; } extrarow = 1; - contents = ed.loadlevel(rx, ry); + const int* tmap = ed.loadlevel(rx, ry); + SDL_memcpy(contents, tmap, sizeof(contents)); roomtexton = false; diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h index 581f70bb..3c6fa09c 100644 --- a/desktop_version/src/Map.h +++ b/desktop_version/src/Map.h @@ -82,9 +82,9 @@ public: int roomdeaths[20 * 20]; int roomdeathsfinal[20 * 20]; static const int areamap[20 * 20]; - std::vector contents; + int contents[40 * 30]; bool explored[20 * 20]; - std::vector vmult; + int vmult[30]; int background; int rcol; diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp index 68d32533..65395ae0 100644 --- a/desktop_version/src/Otherlevel.cpp +++ b/desktop_version/src/Otherlevel.cpp @@ -11,7 +11,7 @@ void otherlevelclass::addline(std::string t) roomtext.push_back(text); } -std::vector otherlevelclass::loadlevel(int rx, int ry) +const int* otherlevelclass::loadlevel(int rx, int ry) { int t; roomtileset = 1; @@ -19,7 +19,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) rx -= 100; ry -= 100; t = rx + (ry * 100); - std::vector result; + const int* result; roomname = ""; roomtext.clear(); @@ -68,7 +68,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(216, 144, 20, 1); obj.createblock(5, 216-4, 144, 20, 16, 8); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -107,7 +107,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -146,7 +146,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -185,7 +185,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -224,7 +224,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -263,7 +263,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -302,7 +302,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0, 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -341,7 +341,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,623,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,623,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -380,7 +380,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -421,7 +421,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 144, 10, 1, 9000); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -462,7 +462,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(224, 96, 10, 0, 10000); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -504,7 +504,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(56, 32, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -543,7 +543,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -582,7 +582,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -621,7 +621,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -660,7 +660,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,620,0,0,0,0,0,698,0,0,0,0,0,0,0,0,0,0,0,0,698,0,0,0,0,0,0,0,0,0,0,0,0, 498,498,498,498,498,498,498,498,620,0,0,0,0,0,698,0,0,0,0,0,0,0,0,0,0,0,0,698,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -701,7 +701,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(120, 40, 14); //Teleporter! - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -740,7 +740,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -779,7 +779,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -818,7 +818,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -859,7 +859,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(144, 136, 10, 1, 4010); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -900,7 +900,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(88, 104, 10, 1, 106010); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -939,7 +939,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -978,7 +978,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1019,7 +1019,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 64, 10, 0, 9010); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1060,7 +1060,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(208, 120, 9, 15); // (shiny trinket) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1108,7 +1108,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(96, 80, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1147,7 +1147,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1188,7 +1188,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(112, 152, 10, 1, 13010); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1227,7 +1227,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483, 0,0,0,0,0,0,0,0,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1266,7 +1266,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492, 0,0,0,0,0,0,0,0,0,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1307,7 +1307,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(280, 120, 10, 1, 16010); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1348,7 +1348,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(56, 32, 10, 1, 2020); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1387,7 +1387,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1426,7 +1426,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1467,7 +1467,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(40, 88, 10, 1, 6020); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1506,7 +1506,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,695,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,695,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1545,7 +1545,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1611,7 +1611,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) { obj.createblock(1, 304, 0, 16, 240, 48); } - result.insert(result.end(), contents, contents+1200); + result = contents; } else { @@ -1650,7 +1650,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(90, 52, 26, 0); // (super warp) - result.insert(result.end(), contents, contents+1200); + result = contents; } break; @@ -1692,7 +1692,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(64, 64, 14); //Teleporter! - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1731,7 +1731,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1770,7 +1770,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1809,7 +1809,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1850,7 +1850,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(240, 96, 10, 0, 15020); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1891,7 +1891,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 96, 9, 16); // (shiny trinket) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1932,7 +1932,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(24, 192, 10, 1, 3030); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1971,7 +1971,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,680,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,680,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2010,7 +2010,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2049,7 +2049,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2088,7 +2088,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2129,7 +2129,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(248, 168, 10, 1, 9030); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2229,7 +2229,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(152, 40, 21, 0); //Terminal (jukebox instructions) obj.createblock(5, 152 - 4, 40, 20, 16, 24); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2268,7 +2268,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2309,7 +2309,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(128, 160, 10, 1, 113030); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2351,7 +2351,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(192, 96, 10, 0, 114030); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2390,7 +2390,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2429,7 +2429,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2468,7 +2468,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2507,7 +2507,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2546,7 +2546,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 110,110,110,110,110,110,110,151,191,191,191,152,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,230,110,110,110,110, 110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,151,191,191,191,152,110,110,110,110, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2593,7 +2593,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(232, 184, 20, 1); //Terminal obj.createentity(208, 184, 20, 1); //Terminal obj.createblock(5, 208 + 4, 184, 56, 16, 23); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2632,7 +2632,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,238,0,0,0,0,0,0,0,0,0,0,236,116,116,116,116,116,116,116,116,116,116,116, 116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,238,0,0,0,0,0,0,0,0,0,0,236,116,116,116,116,116,116,116,116,116,116,116, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2671,7 +2671,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2712,7 +2712,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(248, 112, 10, 1, 114040); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2753,7 +2753,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(104, 176, 10, 1, 115040); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2794,7 +2794,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(16, 40, 10, 1, 15040); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2833,7 +2833,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2874,7 +2874,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(272, 128, 10, 0, 3050); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2913,7 +2913,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2952,7 +2952,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2991,7 +2991,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3030,7 +3030,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3069,7 +3069,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3108,7 +3108,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 104,104,104,104,104,104,104,104,104,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 104,104,104,104,104,104,104,104,104,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3147,7 +3147,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 104,104,104,104,104,104,104,104,104,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 104,104,104,104,104,104,104,104,104,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3186,7 +3186,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3225,7 +3225,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,680,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,680,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3266,7 +3266,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(184, 176, 10, 1, 13050); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3305,7 +3305,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3347,7 +3347,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(72, 16, 9, 14); // (shiny trinket) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3389,7 +3389,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(224, 160, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3428,7 +3428,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3469,7 +3469,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 152, 10, 0, 103060); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3510,7 +3510,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(128, 120, 10, 1, 4060); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3549,7 +3549,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3588,7 +3588,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3629,7 +3629,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(64, 88, 10, 1, 7060); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3668,7 +3668,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3707,7 +3707,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3748,7 +3748,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 128, 10, 0, 10060); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3787,7 +3787,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3826,7 +3826,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3865,7 +3865,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,527,567,568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3904,7 +3904,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3952,7 +3952,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) } obj.createentity(128, 216, 10, 1, 116061); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3991,7 +3991,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,603,483,483,605,0,0,0,0,603,483,483,605,0,0,0,0,603,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,603,483,483,605,0,0,0,0,603,483,483,605,0,0,0,0,603,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4030,7 +4030,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4072,7 +4072,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(192, 104, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4113,7 +4113,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(88, 136, 10, 0, 103070); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4152,7 +4152,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4193,7 +4193,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(208, 128, 10, 1, 4070); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4232,7 +4232,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480,480,480,480,480,480, 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4271,7 +4271,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4310,7 +4310,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4349,7 +4349,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480, 480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4390,7 +4390,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(64, 112, 14); //Teleporter! - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4429,7 +4429,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,615,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,615,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4468,7 +4468,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4509,7 +4509,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(48, 192, 10, 1, 14070); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4548,7 +4548,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4587,7 +4587,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,690,690,690,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4626,7 +4626,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4665,7 +4665,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4704,7 +4704,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,623,0,0,0,0,0,621,501,501,501,501,501,501,501,501,501,501,501, 501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,501,623,0,0,0,0,0,621,501,501,501,501,501,501,501,501,501,501,501, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4745,7 +4745,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(80, 40, 10, 1, 5080); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4787,7 +4787,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(96, 72, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4826,7 +4826,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492, 492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4865,7 +4865,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4904,7 +4904,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492, 492,492,492,492,492,492,614,0,0,0,0,612,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4948,7 +4948,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(120, 128, 20, 1); // (terminal) obj.createblock(5, 120-4, 128, 20, 16, 7); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -4987,7 +4987,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5026,7 +5026,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5067,7 +5067,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(40, 152, 10, 1, 14080); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5106,7 +5106,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495, 495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5147,7 +5147,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 80, 10, 1, 16080); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5186,7 +5186,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498, 498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5225,7 +5225,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5264,7 +5264,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5303,7 +5303,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5342,7 +5342,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5381,7 +5381,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5420,7 +5420,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5462,7 +5462,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(80, 40, 9, 17); // (shiny trinket) roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5504,7 +5504,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.nearelephant = false; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5545,7 +5545,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5586,7 +5586,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5628,7 +5628,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(184, 176, 10, 1, 12100); // (savepoint) roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5669,7 +5669,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5710,7 +5710,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5749,7 +5749,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5790,7 +5790,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(216, 72, 10, 1, 16100); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5829,7 +5829,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5868,7 +5868,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5909,7 +5909,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(40, 112, 9, 13); // (shiny trinket) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5948,7 +5948,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -5987,7 +5987,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6026,7 +6026,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6065,7 +6065,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6110,7 +6110,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6155,7 +6155,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6196,7 +6196,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6235,7 +6235,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6274,7 +6274,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6313,7 +6313,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6352,7 +6352,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6391,7 +6391,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6430,7 +6430,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6469,7 +6469,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6515,7 +6515,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(240, 72, 10, 1, 8120); // (savepoint) roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6560,7 +6560,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6602,7 +6602,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.nearelephant = false; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6641,7 +6641,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6680,7 +6680,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6719,7 +6719,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, 486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,608,0,0,0,0,0,0,0,0,606,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6758,7 +6758,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6797,7 +6797,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,615,495,495,495,617,0,0,0,0,0,215,95,217,216,216,216,216,216,216, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,615,495,495,495,617,0,0,0,0,0,215,95,217,216,216,216,216,216,216, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6838,7 +6838,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(48, 96, 14); //Teleporter! - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6882,7 +6882,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createblock(5, 280-4, 32, 20, 16, 9); roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6921,7 +6921,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,701,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,701,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -6962,7 +6962,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(80, 104, 10, 1, 16130); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7003,7 +7003,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(240, 128, 10, 1, 17130); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7042,7 +7042,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7081,7 +7081,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7122,7 +7122,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7161,7 +7161,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7200,7 +7200,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7239,7 +7239,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,620,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,620,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7283,7 +7283,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(88, 160, 20, 1);//terminal obj.createblock(5, 88-4, 160, 20, 16, 11); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7324,7 +7324,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7363,7 +7363,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 480,480,480,480,480,480,480,480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7402,7 +7402,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7443,7 +7443,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(88, 96, 10, 0, 18150); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7482,7 +7482,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7524,7 +7524,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(72, 120, 13); //Warp Token - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7566,7 +7566,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) roomtileset = 0; // (Use space station tileset) obj.createentity(176, 152, 10, 1, 14160); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7605,7 +7605,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7644,7 +7644,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7683,7 +7683,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,539,579,579,579,579,579, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7728,7 +7728,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createblock(5, 192-4, 120, 20, 16, 10); roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7769,7 +7769,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7810,7 +7810,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7851,7 +7851,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; roomtileset = 0; // (Use space station tileset) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7890,7 +7890,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7931,7 +7931,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(112, 72, 14); //Teleporter! - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -7970,7 +7970,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8011,7 +8011,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(152, 152, 10, 0, 19170); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8050,7 +8050,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8092,7 +8092,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) roomtileset = 0; // (Use space station tileset) obj.createentity(104, 152, 10, 1, 15180); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8131,7 +8131,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8170,7 +8170,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8211,7 +8211,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(192, 176, 10, 1, 105190); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8252,7 +8252,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(40, 192, 10, 1, 106190); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8292,7 +8292,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,617,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,617,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8333,7 +8333,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(72, 168, 10, 1, 111190); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8372,7 +8372,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8411,7 +8411,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 498,498,498,498,498,498,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8450,7 +8450,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480, 480,480,480,480,480,480,602,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,600,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8491,7 +8491,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(80, 144, 10, 1, 14190); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8530,7 +8530,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8569,7 +8569,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483,483,483,483,483,483,483,483,483, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8610,7 +8610,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) }; obj.createentity(168, 88, 10, 1, 17190); // (savepoint) - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8649,7 +8649,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8688,7 +8688,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, 480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8731,7 +8731,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; - result.insert(result.end(), contents, contents+1200); + result = contents; } else if(obj.altstates==2) { @@ -8769,7 +8769,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; - result.insert(result.end(), contents, contents+1200); + result = contents; } else { @@ -8806,7 +8806,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; - result.insert(result.end(), contents, contents+1200); + result = contents; } break; @@ -8845,7 +8845,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8906,7 +8906,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.entities[obj.getcrewman(1)].tile +=6; obj.createblock(5, 83 - 32, 0, 32 + 32 + 32, 240, 1); } - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -8967,7 +8967,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(192, 128, 25, 0, 11); //Terminal obj.createentity(224, 128, 25, 0, 10); //Terminal obj.createentity(256, 128, 25, 0, 9); //Terminal - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -9009,7 +9009,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(152, 168, 25, 0, 20); //Terminal obj.createentity(152, 168, 25, 0, 19); //Terminal - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -9065,7 +9065,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) //victoria: obj.createentity(193, 89, 18, 16, 0, 18); obj.createblock(5, 193-16, 0, 32+32, 240, 5); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -9117,7 +9117,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) //naughty corner! obj.createblock(1, 30, 0, 20, 50, 15); obj.createblock(1, 90, 0, 20, 50, 16); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -9162,7 +9162,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) obj.createentity(-8, 84-32, 11, 328+8); // (horizontal gravity line) obj.createentity(-8, 148 + 32, 11, 328+8); // (horizontal gravity line) obj.createblock(1, -10, 84 - 16, 340, 32, 9); //start the game - result.insert(result.end(), contents, contents+1200); + result = contents; break; } #endif @@ -9171,7 +9171,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry) { static const int contents[1200] = {0}; //obj.fatal_bottom(); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } } diff --git a/desktop_version/src/Otherlevel.h b/desktop_version/src/Otherlevel.h index b30d9f1b..8fd36322 100644 --- a/desktop_version/src/Otherlevel.h +++ b/desktop_version/src/Otherlevel.h @@ -27,7 +27,7 @@ public: }; void addline(std::string t); - std::vector loadlevel(int rx, int ry); + const int* loadlevel(int rx, int ry); std::string roomname; diff --git a/desktop_version/src/Spacestation2.cpp b/desktop_version/src/Spacestation2.cpp index 1b1b88e1..1aed1434 100644 --- a/desktop_version/src/Spacestation2.cpp +++ b/desktop_version/src/Spacestation2.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector spacestation2class::loadlevel(int rx, int ry) +const int* spacestation2class::loadlevel(int rx, int ry) { int t; rx -= 100; @@ -13,7 +13,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) t = rx + (ry * 100); - std::vector result; + const int* result; roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]"; switch(t) @@ -63,7 +63,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) roomname = "Outer Hull"; //If not yet in level, use "The Space Station"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -104,7 +104,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "The Filter"; //If not yet in level, use "The Space Station" - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -153,7 +153,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(184-24, 96, 1, 1, 4, 160, 88, 256, 192); // Enemy, bounded obj.createentity(256, 8, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Boldly To Go"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -196,7 +196,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 96, 9, 2); // (shiny trinket) roomname = "One Way Room"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -256,7 +256,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 120, 10, 0, 447491); // (savepoint) roomname = "Conveying a New Idea"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -315,7 +315,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 72, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(192, 112, 2, 8, 4); //Threadmill, >>> roomname = "Upstream Downstream"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -364,7 +364,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 112, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded obj.createentity(264, 96, 10, 1, 448500); // (savepoint) roomname = "The High Road is Low"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -412,7 +412,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 8, 2, 11, 4); //Big Threadmill, <<<<<< obj.createentity(288, 8, 2, 9, 4); //Threadmill, <<< roomname = "Give Me A V"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -467,7 +467,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 208, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(128, 208, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Select Track"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -523,7 +523,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 32, 3,10); //Disappearing Platform obj.createentity(224, 32, 3,10); //Disappearing Platform roomname = "You Chose... Poorly"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -574,7 +574,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 112, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(256, 112, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Hyperspace Bypass 5"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -624,7 +624,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(80, 112, 2, 8, 4); //Threadmill, >>> obj.createentity(80, 104, 2, 9, 4); //Threadmill, <<< roomname = "Plain Sailing from Here On"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -675,7 +675,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 16, 2, 8, 4); //Threadmill, >>> obj.createentity(104, 24, 10, 0, 448541); // (savepoint) roomname = "Ha Ha Ha Not Really"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -731,7 +731,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(48, 104, 2, 10, 4); //Big Threadmill, >>>>>> roomname="You Just Keep Coming Back"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -783,7 +783,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(232, 144, 10, 0, 448522); // (savepoint) obj.createentity(72, 144, 10, 0, 448523); // (savepoint) roomname = "Gordian Knot"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -840,7 +840,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(216+16, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded roomname = "Backsliders"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -893,7 +893,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //LIES emitter starts here roomname = "The Cuckoo"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -944,7 +944,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned roomname = "Clarion Call"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -991,7 +991,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(7*8, 2*8, 1, 12, 1); // Enemy //FACTORY emitter starts here roomname = "The Solution is Dilution"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1040,7 +1040,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //FACTORY emitter starts here (manually placed) roomname = "Lighter Than Air"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1096,7 +1096,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(18 * 8, (5 * 8) + 4, 14); //Teleporter! } roomname = "Level Complete!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1137,7 +1137,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; roomname = "Green Grotto"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1185,7 +1185,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(5, 156-4, 40, 20, 16, 15); roomname = "The Hanged Man, Reversed"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1227,7 +1227,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(152, 120, 10, 0, 445530); // (savepoint) roomname = "doomS"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1275,7 +1275,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy roomname = "Chinese Rooms"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1317,7 +1317,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(152, 96, 10, 1, 446530); // (savepoint) roomname = "Swoop"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1363,7 +1363,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(96, 88, 3, 827); //Disappearing Platform obj.createentity(40, 160, 3, 827); //Disappearing Platform roomname = "Manic Mine"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1404,7 +1404,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; roomname = "Sorrow"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1467,7 +1467,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(104, 160, 2, 9, 4); //Threadmill, <<< roomname = "$eeing Dollar $ign$"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1521,7 +1521,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(152, 192, 2, 8, 4); //Threadmill, >>> obj.createentity(240, 88, 2, 9, 4); //Threadmill, <<< roomname = "Parabolica"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1581,7 +1581,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //LIES Emitter, manually positioned roomname = "Spikes Do!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1626,7 +1626,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(248, 72, 3, 707); //Disappearing Platform obj.createentity(184, 200, 3, 707); //Disappearing Platform roomname = "What Lies Beneath?"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1680,7 +1680,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned, collector! roomname = "Chipper Cipher"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1722,7 +1722,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(40, 72, 3, 787); //Disappearing Platform roomname = "If You Fall Up"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1767,7 +1767,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 176, 10, 0, 445550); // (savepoint) obj.createentity(216 - 4, 192, 10, 1, 445551); // (savepoint) roomname = "Just Pick Yourself Down"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1840,7 +1840,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 128, 2, 11, 4); //Big Threadmill, <<<<<< obj.createentity(240, 128, 2, 9, 4); //Threadmill, <<< roomname = "The Warning"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1891,7 +1891,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) roomname = "Getting Here is Half the Fun"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1932,7 +1932,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "Your Bitter Tears... Delicious"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1973,7 +1973,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "Easy Mode Unlocked"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2014,7 +2014,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "Vici!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2055,7 +2055,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "Vidi"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2096,7 +2096,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname="Veni"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2142,7 +2142,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24, 152, 20, 1); // (terminal) obj.createblock(5, 24-4, 152, 20, 16, 16); roomname = "Doing Things The Hard Way"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2193,7 +2193,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.fatal_top(); } roomname = "Exhaust Chute"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2259,7 +2259,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "A Wrinkle in Time"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2311,7 +2311,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(160 - 48, 184 - 8, 1, 3, 5);// , 160, 0, 320, 240); // Enemy, bounded obj.createentity(160 - 28 + 48, 184 - 8, 1, 2, 5);// , 0, 0, 160, 240); // Enemy, bounded roomname = "Brass Sent Us Under The Top"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2360,7 +2360,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(136 + 4, 96, 10, 1, 443541); // (savepoint) roomname = "The Tomb of Mad Carew"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2403,7 +2403,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(56, 144, 10, 0, 443520); // (savepoint) obj.createentity(152, 80, 10, 1, 443521); // (savepoint) roomname = "The Sensible Room"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2445,7 +2445,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(0, -200, 1, 16, 6, -64, -500, 320 + 64, 340); roomname = "B-B-B-Busted"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2494,7 +2494,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 0, 0, 112, 112, 8); } roomname = "V Stitch"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2560,7 +2560,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) { roomname = "Imagine Spikes There, if You Like"; } - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2611,7 +2611,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(120, 144, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(184, 144, 2, 8, 4); //Threadmill, >>> roomname = "A Deception"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2660,7 +2660,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(280, 152, 10, 1, 442481); // (savepoint) roomname = "Down Under"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2705,7 +2705,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(144, 168, 10, 1, 442490); // (savepoint) obj.createentity(24, 112, 10, 0, 442491); // (savepoint) roomname = "Shenanigan"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2756,7 +2756,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "Frown Upside Down"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2803,7 +2803,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 280, 0, 32, 240, 82); } roomname = "Energize"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2847,7 +2847,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(264, 24, 10, 0, 442531); // (savepoint) roomname = "Driller"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2915,7 +2915,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "Quicksand"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -2958,7 +2958,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(144, 40, 3); //Disappearing Platform obj.createentity(200, 128, 3); //Disappearing Platform roomname = "Boo! Think Fast!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3005,7 +3005,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(185, 110, 2, 0, 3, 100, 70, 320, 160); obj.createentity(235, 145, 2, 0, 3, 100, 70, 320, 160); roomname = "Stop and Reflect"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3058,7 +3058,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Trench Warfare"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3108,7 +3108,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 136, 10, 0, 441502); // (savepoint) roomname = "The Yes Men"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3157,7 +3157,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(280, 192, 10, 1, 440501); // (savepoint) roomname = "Gantry and Dolly"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3211,7 +3211,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Comms Relay"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3255,7 +3255,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(168, 104, 10, 1, 439500); // (savepoint) roomname = "Security Sweep"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3303,7 +3303,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(256-4, 200, 20, 1); // (terminal) obj.createblock(5, 256-8, 200, 20, 16, 6); roomname = "Linear Collider"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3346,7 +3346,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 48, 10, 0, 439520); // (savepoint) obj.createentity(112, 160, 10, 1, 439521); // (savepoint) roomname = "Atmospheric Filtering Unit"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3393,7 +3393,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(125, 18, 1, 0, 4); obj.createentity(232, 184, 10, 0, 1); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3433,7 +3433,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 310,310,432,692,692,692,692,692,692,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,812,692,692,692,692,692,692,692,692,692,430,310,310, }; roomname = "Leap of Faith"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3481,7 +3481,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Solitude"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3528,7 +3528,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 10, 0, 60, 240, 22); obj.createblock(1, 280, 0, 320, 240, 21); } - result.insert(result.end(), contents, contents+1200); + result = contents; break; }; @@ -3569,7 +3569,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) }; roomname = "Welcome Aboard"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3613,7 +3613,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(16, 136, 9, 0); // (shiny trinket) roomname = "It's a Secret to Nobody"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -3625,7 +3625,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) static const int contents[1200] = {0}; roomname = "Outer Space"; obj.fatal_bottom(); - result.insert(result.end(), contents, contents+1200); + result = contents; break; } } diff --git a/desktop_version/src/Spacestation2.h b/desktop_version/src/Spacestation2.h index a8f9dfc4..e0704aaf 100644 --- a/desktop_version/src/Spacestation2.h +++ b/desktop_version/src/Spacestation2.h @@ -5,12 +5,11 @@ #include "Entity.h" #include -#include class spacestation2class { public: - std::vector loadlevel(int rx, int ry); + const int* loadlevel(int rx, int ry); std::string roomname; }; diff --git a/desktop_version/src/WarpClass.cpp b/desktop_version/src/WarpClass.cpp index c85cdc71..6d3c16d0 100644 --- a/desktop_version/src/WarpClass.cpp +++ b/desktop_version/src/WarpClass.cpp @@ -2,7 +2,7 @@ #include "MakeAndPlay.h" -std::vector warpclass::loadlevel(int rx, int ry) +const int* warpclass::loadlevel(int rx, int ry) { int t; @@ -12,7 +12,7 @@ std::vector warpclass::loadlevel(int rx, int ry) ry += 49; //warp t = rx + (ry * 100); - std::vector result; + const int* result; coin = 0; rcol = 0; warpx = false; @@ -68,7 +68,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 0; warpy = true; roomname = "This is how it is"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -110,7 +110,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpx = true; roomname = "A Bisected Spiral"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -157,7 +157,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 1; warpy = true; roomname = "Take the Red Pill"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -205,7 +205,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 5; warpx = true; roomname = "Short Circuit"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -249,7 +249,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 4; warpy = true; roomname = "As you like it"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -294,7 +294,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 3; warpx = true; roomname = "Maze With No Entrance"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -338,7 +338,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpy = true; roomname = "As we go up, we go down"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -385,7 +385,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 0; warpx = true; roomname = "Time to get serious"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -432,7 +432,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpy = true; roomname = "Wheeler's Wormhole"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -479,7 +479,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 4; warpx = true; roomname = "Ascending and Descending"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -528,7 +528,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 1; warpy = true; roomname = "Shockwave Rider"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -580,7 +580,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 3; warpx = true; roomname = "Sweeney's Maze"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -635,7 +635,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 5; warpy = true; roomname = "Mind The Gap"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -690,7 +690,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpx = true; roomname = "Edge Games"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -735,7 +735,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "The Brown Gate"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -781,7 +781,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "To The Batcave!"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -827,7 +827,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "This will make you flip"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -873,7 +873,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "Twisty Little Passages"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -923,7 +923,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "That's Why I Have To Kill You"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -974,7 +974,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "I Love You"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1016,7 +1016,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 1; warpy = true; roomname = "Green Dudes Can't Flip"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1068,7 +1068,7 @@ std::vector warpclass::loadlevel(int rx, int ry) } roomname = "Murdering Twinmaker"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1119,7 +1119,7 @@ std::vector warpclass::loadlevel(int rx, int ry) } } roomname = "It's Not Easy Being Green"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } @@ -1129,7 +1129,7 @@ std::vector warpclass::loadlevel(int rx, int ry) { static const int contents[1200] = {0}; //roomname = "Outer Space"; - result.insert(result.end(), contents, contents+1200); + result = contents; break; } } diff --git a/desktop_version/src/WarpClass.h b/desktop_version/src/WarpClass.h index 9de2f5fb..d283fa29 100644 --- a/desktop_version/src/WarpClass.h +++ b/desktop_version/src/WarpClass.h @@ -5,12 +5,11 @@ #include "Entity.h" #include -#include class warpclass { public: - std::vector loadlevel(int rx, int ry); + const int* loadlevel(int rx, int ry); std::string roomname; int coin, rcol; bool warpx, warpy; diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index ddafc36c..229a5d03 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -522,7 +522,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st ed.oldenttext = key.keybuffer; } -std::vector editorclass::loadlevel( int rxi, int ryi ) +const int* editorclass::loadlevel( int rxi, int ryi ) { //Set up our buffer array to be picked up by mapclass rxi -= 100; @@ -532,13 +532,13 @@ std::vector editorclass::loadlevel( int rxi, int ryi ) if(rxi>=mapwidth)rxi-=mapwidth; if(ryi>=mapheight)ryi-=mapheight; - std::vector result; + static int result[1200]; for (int j = 0; j < 30; j++) { for (int i = 0; i < 40; i++) { - result.push_back(contents[i+(rxi*40)+vmult[j+(ryi*30)]]); + result[i + j*40] = contents[i+(rxi*40)+vmult[j+(ryi*30)]]; } } diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h index 95e14078..dd2a4c83 100644 --- a/desktop_version/src/editor.h +++ b/desktop_version/src/editor.h @@ -131,7 +131,7 @@ class editorclass{ void saveconvertor(); void reset(); void getlin(const enum textmode mode, const std::string& prompt, std::string* ptr); - std::vector loadlevel(int rxi, int ryi); + const int* loadlevel(int rxi, int ryi); void placetile(int x, int y, int t);