1
0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-18 10:38:31 +02:00

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.
This commit is contained in:
Misa 2020-07-03 02:06:46 -07:00 committed by Ethan Lee
parent a1d4523177
commit 9dcda17978
14 changed files with 472 additions and 459 deletions

View File

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

View File

@ -5,12 +5,11 @@
#include "Entity.h"
#include <string>
#include <vector>
class finalclass
{
public:
std::vector<int> loadlevel(int rx, int ry);
const int* loadlevel(int rx, int ry);
std::string roomname;
int coin, rcol;

View File

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
std::vector<int> labclass::loadlevel(int rx, int ry)
const int* labclass::loadlevel(int rx, int ry)
{
int t;
@ -20,7 +20,7 @@ std::vector<int> labclass::loadlevel(int rx, int ry)
}
t = rx + (ry * 100);
std::vector<int> result;
const int* result;
coin = 0;
rcol = 0;
roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]";
@ -74,7 +74,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> labclass::loadlevel(int rx, int ry)
default:
{
static const int contents[1200] = {0};
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
}

View File

@ -4,13 +4,12 @@
#include "Game.h"
#include "Entity.h"
#include <vector>
#include <string>
class labclass
{
public:
std::vector<int> loadlevel(int rx, int ry);
const int* loadlevel(int rx, int ry);
std::string roomname;
int coin, rcol;

View File

@ -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;

View File

@ -82,9 +82,9 @@ public:
int roomdeaths[20 * 20];
int roomdeathsfinal[20 * 20];
static const int areamap[20 * 20];
std::vector <int> contents;
int contents[40 * 30];
bool explored[20 * 20];
std::vector <int> vmult;
int vmult[30];
int background;
int rcol;

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@ public:
};
void addline(std::string t);
std::vector<int> loadlevel(int rx, int ry);
const int* loadlevel(int rx, int ry);
std::string roomname;

View File

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
std::vector<int> spacestation2class::loadlevel(int rx, int ry)
const int* spacestation2class::loadlevel(int rx, int ry)
{
int t;
rx -= 100;
@ -13,7 +13,7 @@ std::vector<int> spacestation2class::loadlevel(int rx, int ry)
t = rx + (ry * 100);
std::vector<int> result;
const int* result;
roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]";
switch(t)
@ -63,7 +63,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> spacestation2class::loadlevel(int rx, int ry)
};
roomname = "Vici!";
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
@ -2055,7 +2055,7 @@ std::vector<int> spacestation2class::loadlevel(int rx, int ry)
};
roomname = "Vidi";
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
@ -2096,7 +2096,7 @@ std::vector<int> spacestation2class::loadlevel(int rx, int ry)
};
roomname="Veni";
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
@ -2142,7 +2142,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> spacestation2class::loadlevel(int rx, int ry)
}
}
roomname = "Quicksand";
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
@ -2958,7 +2958,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> spacestation2class::loadlevel(int rx, int ry)
}
roomname = "Solitude";
result.insert(result.end(), contents, contents+1200);
result = contents;
break;
}
@ -3528,7 +3528,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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;
}
}

View File

@ -5,12 +5,11 @@
#include "Entity.h"
#include <string>
#include <vector>
class spacestation2class
{
public:
std::vector<int> loadlevel(int rx, int ry);
const int* loadlevel(int rx, int ry);
std::string roomname;
};

View File

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
std::vector<int> warpclass::loadlevel(int rx, int ry)
const int* warpclass::loadlevel(int rx, int ry)
{
int t;
@ -12,7 +12,7 @@ std::vector<int> warpclass::loadlevel(int rx, int ry)
ry += 49; //warp
t = rx + (ry * 100);
std::vector<int> result;
const int* result;
coin = 0;
rcol = 0;
warpx = false;
@ -68,7 +68,7 @@ std::vector<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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<int> 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;
}
}

View File

@ -5,12 +5,11 @@
#include "Entity.h"
#include <string>
#include <vector>
class warpclass
{
public:
std::vector<int> loadlevel(int rx, int ry);
const int* loadlevel(int rx, int ry);
std::string roomname;
int coin, rcol;
bool warpx, warpy;

View File

@ -522,7 +522,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st
ed.oldenttext = key.keybuffer;
}
std::vector<int> 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<int> editorclass::loadlevel( int rxi, int ryi )
if(rxi>=mapwidth)rxi-=mapwidth;
if(ryi>=mapheight)ryi-=mapheight;
std::vector<int> 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)]];
}
}

View File

@ -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<int> loadlevel(int rxi, int ryi);
const int* loadlevel(int rxi, int ryi);
void placetile(int x, int y, int t);