From cac1a9e3ab9505dbd1f9e1c9b44fe467e0175534 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 30 Mar 2020 17:46:36 -0700 Subject: [PATCH] Remove global args from entityclass This commit removes all global args from functions on the entityclass object, and updates the callers of those functions in other files accordingly (most significantly, the game level files Finalclass.cpp, Labclass.cpp, Otherlevel.cpp, Spacestation2.cpp, WarpClass.cpp, due to them using createentity()), as well as renaming all instances of 'dwgfx' in Entity.cpp to 'graphics'. --- desktop_version/src/Entity.cpp | 254 ++++---- desktop_version/src/Entity.h | 44 +- desktop_version/src/Finalclass.cpp | 362 +++++------ desktop_version/src/Labclass.cpp | 262 ++++---- desktop_version/src/Logic.cpp | 110 ++-- desktop_version/src/Map.cpp | 144 ++--- desktop_version/src/Otherlevel.cpp | 316 +++++----- desktop_version/src/Script.cpp | 64 +- desktop_version/src/Spacestation2.cpp | 848 +++++++++++++------------- desktop_version/src/WarpClass.cpp | 150 ++--- desktop_version/src/titlerender.cpp | 12 +- 11 files changed, 1280 insertions(+), 1286 deletions(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 82a1d34a..2aff5771 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -3,7 +3,7 @@ #include "Map.h" #include "UtilityClass.h" -bool entityclass::checktowerspikes(int t, mapclass& map) +bool entityclass::checktowerspikes(int t) { tempx = entities[t].xp + entities[t].cx; tempy = entities[t].yp + entities[t].cy; @@ -210,19 +210,19 @@ void entityclass::swnenemiescol( int t ) } } -void entityclass::gravcreate( Game& game, int ypos, int dir, int xoff /*= 0*/, int yoff /*= 0*/ ) +void entityclass::gravcreate( int ypos, int dir, int xoff /*= 0*/, int yoff /*= 0*/ ) { if (dir == 0) { - createentity(game, -150 - xoff, 58 + (ypos * 20)+yoff, 23, 0, 0); + createentity(-150 - xoff, 58 + (ypos * 20)+yoff, 23, 0, 0); } else { - createentity(game, 320+150 + xoff, 58 + (ypos * 20)+yoff, 23, 1, 0); + createentity(320+150 + xoff, 58 + (ypos * 20)+yoff, 23, 1, 0); } } -void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) +void entityclass::generateswnwave( int t ) { //generate a wave for the SWN game if(game.swndelay<=0) @@ -308,7 +308,7 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) if (game.deathcounts - game.swndeaths > 25) game.swndelay += 4; break; case 1: - createentity(game, -150, 58 + (int(fRandom() * 6) * 20), 23, 0, 0); + createentity(-150, 58 + (int(fRandom() * 6) * 20), 23, 0, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state break; @@ -331,52 +331,52 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2++; } } - createentity(game, -150, 58 + (int(game.swnstate2) * 20), 23, 0, 0); + createentity(-150, 58 + (int(game.swnstate2) * 20), 23, 0, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state break; case 3: - createentity(game, 320+150, 58 + (int(fRandom() * 6) * 20), 23, 1, 0); + createentity(320+150, 58 + (int(fRandom() * 6) * 20), 23, 1, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state break; case 4: //left and right compliments game.swnstate2 = int(fRandom() * 6); - createentity(game, -150, 58 + (game.swnstate2 * 20), 23, 0, 0); - createentity(game, 320+150, 58 + ((5-game.swnstate2) * 20), 23, 1, 0); + createentity(-150, 58 + (game.swnstate2 * 20), 23, 0, 0); + createentity(320+150, 58 + ((5-game.swnstate2) * 20), 23, 1, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state game.swnstate2 = 0; break; case 5: //Top and bottom - createentity(game, -150, 58, 23, 0, 0); - createentity(game, -150, 58 + (5 * 20), 23, 0, 0); + createentity(-150, 58, 23, 0, 0); + createentity(-150, 58 + (5 * 20), 23, 0, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state game.swnstate2 = 1; break; case 6: //Middle - createentity(game, -150, 58 + (2 * 20), 23, 0, 0); - createentity(game, -150, 58 + (3 * 20), 23, 0, 0); + createentity(-150, 58 + (2 * 20), 23, 0, 0); + createentity(-150, 58 + (3 * 20), 23, 0, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state game.swnstate2 = 0; break; case 7: //Top and bottom - createentity(game, 320+150, 58, 23, 1, 0); - createentity(game, 320+150, 58 + (5 * 20), 23, 1, 0); + createentity(320+150, 58, 23, 1, 0); + createentity(320+150, 58 + (5 * 20), 23, 1, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state game.swnstate2 = 1; break; case 8: //Middle - createentity(game, 320+150, 58 + (2 * 20), 23, 1, 0); - createentity(game, 320+150, 58 + (3 * 20), 23, 1, 0); + createentity(320+150, 58 + (2 * 20), 23, 1, 0); + createentity(320+150, 58 + (3 * 20), 23, 1, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state game.swnstate2 = 0; @@ -400,7 +400,7 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2++; } } - createentity(game, 320 + 150, 58 + (int(game.swnstate2) * 20), 23, 1, 0); + createentity(320 + 150, 58 + (int(game.swnstate2) * 20), 23, 1, 0); game.swnstate = 0; game.swndelay = 0; //return to decision state break; @@ -567,16 +567,16 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2 = 0; break; case 10: - gravcreate(game, 0, 0); - gravcreate(game, 1, 0); - gravcreate(game, 2, 0); + gravcreate(0, 0); + gravcreate(1, 0); + gravcreate(2, 0); game.swnstate++; game.swndelay = 10; //return to decision state break; case 11: - gravcreate(game, 3, 0); - gravcreate(game, 4, 0); - gravcreate(game, 5, 0); + gravcreate(3, 0); + gravcreate(4, 0); + gravcreate(5, 0); game.swnstate2++; if(game.swnstate2==3) { @@ -590,16 +590,16 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) } break; case 12: - gravcreate(game, 0, 1); - gravcreate(game, 1, 1); - gravcreate(game, 2, 1); + gravcreate(0, 1); + gravcreate(1, 1); + gravcreate(2, 1); game.swnstate++; game.swndelay = 10; //return to decision state break; case 13: - gravcreate(game, 3, 1); - gravcreate(game, 4, 1); - gravcreate(game, 5, 1); + gravcreate(3, 1); + gravcreate(4, 1); + gravcreate(5, 1); game.swnstate2++; if(game.swnstate2==3) { @@ -613,43 +613,43 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) } break; case 14: - gravcreate(game, 0, 0, 0); - gravcreate(game, 5, 1, 0); + gravcreate(0, 0, 0); + gravcreate(5, 1, 0); game.swnstate++; game.swndelay = 20; //return to decision state break; case 15: - gravcreate(game, 1, 0); - gravcreate(game, 4, 1); + gravcreate(1, 0); + gravcreate(4, 1); game.swnstate++; game.swndelay = 20; //return to decision state break; case 16: - gravcreate(game, 2, 0); - gravcreate(game, 3, 1); + gravcreate(2, 0); + gravcreate(3, 1); game.swnstate++; game.swndelay = 20; //return to decision state break; case 17: - gravcreate(game, 3, 0); - gravcreate(game, 2, 1); + gravcreate(3, 0); + gravcreate(2, 1); game.swnstate++; game.swndelay = 20; //return to decision state break; case 18: - gravcreate(game, 4, 0); - gravcreate(game, 1, 1); + gravcreate(4, 0); + gravcreate(1, 1); game.swnstate++; game.swndelay = 20; //return to decision state break; case 19: - gravcreate(game, 5, 0); - gravcreate(game, 0, 1); + gravcreate(5, 0); + gravcreate(0, 1); game.swnstate=0; game.swndelay = 20; //return to decision state @@ -674,7 +674,7 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2++; } } - createentity(game, -150, 58 + (int(game.swnstate2) * 20), 23, 0, 0); + createentity(-150, 58 + (int(game.swnstate2) * 20), 23, 0, 0); if(game.swnstate4<=6) { game.swnstate = 20; @@ -706,7 +706,7 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2++; } } - createentity(game, 320+150, 58 + (int(game.swnstate2) * 20), 23, 1, 0); + createentity(320+150, 58 + (int(game.swnstate2) * 20), 23, 1, 0); if(game.swnstate4<=6) { game.swnstate = 21; @@ -722,8 +722,8 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate4++; //left and right compliments game.swnstate2 = int(fRandom() * 6); - createentity(game, -150, 58 + (game.swnstate2 * 20), 23, 0, 0); - createentity(game, 320 + 150, 58 + ((5 - game.swnstate2) * 20), 23, 1, 0); + createentity(-150, 58 + (game.swnstate2 * 20), 23, 0, 0); + createentity(320 + 150, 58 + ((5 - game.swnstate2) * 20), 23, 1, 0); if(game.swnstate4<=12) { game.swnstate = 22; @@ -737,53 +737,53 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) game.swnstate2 = 0; break; case 23: - gravcreate(game, 1, 0); - gravcreate(game, 2, 0, 15); - gravcreate(game, 2, 0, -15); - gravcreate(game, 3, 0, 15); - gravcreate(game, 3, 0, -15); - gravcreate(game, 4, 0); + gravcreate(1, 0); + gravcreate(2, 0, 15); + gravcreate(2, 0, -15); + gravcreate(3, 0, 15); + gravcreate(3, 0, -15); + gravcreate(4, 0); game.swnstate = 0; game.swndelay = 15; //return to decision state break; case 24: - gravcreate(game, 1, 1); - gravcreate(game, 2, 1, 15); - gravcreate(game, 2, 1, -15); - gravcreate(game, 3, 1, 15); - gravcreate(game, 3, 1, -15); - gravcreate(game, 4, 1); + gravcreate(1, 1); + gravcreate(2, 1, 15); + gravcreate(2, 1, -15); + gravcreate(3, 1, 15); + gravcreate(3, 1, -15); + gravcreate(4, 1); game.swnstate = 0; game.swndelay = 15; //return to decision state break; case 25: - gravcreate(game, 0, 0); - gravcreate(game, 1, 1,0,10); - gravcreate(game, 4, 1,0,-10); - gravcreate(game, 5, 0); + gravcreate(0, 0); + gravcreate(1, 1,0,10); + gravcreate(4, 1,0,-10); + gravcreate(5, 0); game.swnstate = 0; game.swndelay = 20; //return to decision state break; case 26: - gravcreate(game, 0, 1, 0); - gravcreate(game, 1, 1, 10); - gravcreate(game, 4, 1, 40); - gravcreate(game, 5, 1, 50); + gravcreate(0, 1, 0); + gravcreate(1, 1, 10); + gravcreate(4, 1, 40); + gravcreate(5, 1, 50); game.swnstate = 0; game.swndelay = 20; //return to decision state break; case 27: - gravcreate(game, 0, 0, 0); - gravcreate(game, 1, 0, 10); - gravcreate(game, 4, 0, 40); - gravcreate(game, 5, 0, 50); + gravcreate(0, 0, 0); + gravcreate(1, 0, 10); + gravcreate(4, 0, 40); + gravcreate(5, 0, 50); game.swnstate = 0; game.swndelay = 20; //return to decision state break; case 28: game.swnstate4++; game.swnstate2 = int(fRandom() * 6); - createentity(game, -150, 58 + (game.swnstate2 * 20), 23, 0, 0); + createentity(-150, 58 + (game.swnstate2 * 20), 23, 0, 0); if(game.swnstate4<=6) { game.swnstate = 28; @@ -799,7 +799,7 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) case 29: game.swnstate4++; game.swnstate2 = int(fRandom() * 6); - gravcreate(game, game.swnstate2, 1); + gravcreate(game.swnstate2, 1); if(game.swnstate4<=6) { game.swnstate = 29; @@ -815,8 +815,8 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) case 30: game.swnstate4++; game.swnstate2 = int(fRandom() * 3); - gravcreate(game, game.swnstate2, 0); - gravcreate(game, 5-game.swnstate2, 0); + gravcreate(game.swnstate2, 0); + gravcreate(5-game.swnstate2, 0); if(game.swnstate4<=2) { game.swnstate = 30; @@ -832,8 +832,8 @@ void entityclass::generateswnwave( Game& game, UtilityClass& help, int t ) case 31: game.swnstate4++; game.swnstate2 = int(fRandom() * 3); - gravcreate(game, game.swnstate2, 1); - gravcreate(game, 5-game.swnstate2, 1); + gravcreate(game.swnstate2, 1); + gravcreate(5-game.swnstate2, 1); if(game.swnstate4<=2) { game.swnstate = 31; @@ -1769,7 +1769,7 @@ void entityclass::settreadmillcolour( int t, int rx, int ry ) } } -void entityclass::createentity( Game& game, float xp, float yp, int t, float vx /*= 0*/, float vy /*= 0*/, int p1 /*= 0*/, int p2 /*= 0*/, int p3 /*= 320*/, int p4 /*= 240 */ ) +void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, float vy /*= 0*/, int p1 /*= 0*/, int p2 /*= 0*/, int p3 /*= 320*/, int p4 /*= 240 */ ) { //Find the first inactive case z that we can use to index the new entity if (nentity == 0) @@ -2764,7 +2764,7 @@ void entityclass::createentity( Game& game, float xp, float yp, int t, float vx } } -bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musicclass& music ) +bool entityclass::updateentities( int i ) { if(entities[i].active) { @@ -2785,7 +2785,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[i].state == 0) //Init { entities[i].state = 3; - updateentities(i, help, game, music); + updateentities(i); } else if (entities[i].state == 1) { @@ -2808,7 +2808,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[i].state == 0) //Init { entities[i].state = 2; - updateentities(i, help, game, music); + updateentities(i); } else if (entities[i].state == 1) { @@ -2831,7 +2831,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[i].state == 0) //Init { entities[i].state = 3; - updateentities(i, help, game, music); + updateentities(i); } else if (entities[i].state == 1) { @@ -2854,7 +2854,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[i].state == 0) //Init { entities[i].state = 3; - updateentities(i, help, game, music); + updateentities(i); } else if (entities[i].state == 1) { @@ -2932,7 +2932,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl //Emitter: shoot an enemy every so often if (entities[i].state == 0) { - createentity(game, entities[i].xp+28, entities[i].yp, 1, 10, 1); + createentity(entities[i].xp+28, entities[i].yp, 1, 10, 1); entities[i].state = 1; entities[i].statedelay = 12; } @@ -2961,7 +2961,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl //Emitter: shoot an enemy every so often (up) if (entities[i].state == 0) { - createentity(game, entities[i].xp, entities[i].yp, 1, 12, 1); + createentity(entities[i].xp, entities[i].yp, 1, 12, 1); entities[i].state = 1; entities[i].statedelay = 16; } @@ -2994,7 +2994,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[j].type == 2 && entities[j].state== 3 && entities[j].xp == (entities[i].xp-32) ) { entities[i].state = 3; - updateentities(i, help, game, music); + updateentities(i); } } } @@ -3023,7 +3023,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl if (entities[j].type == 2 && entities[j].state==3 && entities[j].xp==entities[i].xp+32) { entities[i].state = 3; - updateentities(i, help, game, music); + updateentities(i); } } } @@ -3064,14 +3064,14 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl //approach from the left entities[i].xp = -64; entities[i].state = 2; - updateentities(i, help, game, music); //right + updateentities(i); //right } else { //approach from the left entities[i].xp = 320; entities[i].state = 3; - updateentities(i, help, game, music); //left + updateentities(i); //left } } @@ -3931,7 +3931,7 @@ bool entityclass::updateentities( int i, UtilityClass& help, Game& game, musiccl return true; } -void entityclass::animateentities( int _i, Game& game, UtilityClass& help ) +void entityclass::animateentities( int _i ) { if(entities[_i].active) { @@ -4692,7 +4692,7 @@ bool entityclass::checkblocks() return false; } -bool entityclass::checkwall( mapclass& map ) +bool entityclass::checkwall() { //Returns true if entity setup in temprect collides with a wall //used for proper collision functions; you can't just, like, call it @@ -4882,7 +4882,7 @@ bool entityclass::entitywarpvlinecollide(int t, int l) { return false; } -float entityclass::entitycollideplatformroof( mapclass& map, int t ) +float entityclass::entitycollideplatformroof( int t ) { tempx = entities[t].xp + entities[t].cx; tempy = entities[t].yp + entities[t].cy -1; @@ -4898,7 +4898,7 @@ float entityclass::entitycollideplatformroof( mapclass& map, int t ) return -1000; } -float entityclass::entitycollideplatformfloor( mapclass& map, int t ) +float entityclass::entitycollideplatformfloor( int t ) { tempx = entities[t].xp + entities[t].cx; tempy = entities[t].yp + entities[t].cy + 1; @@ -4914,7 +4914,7 @@ float entityclass::entitycollideplatformfloor( mapclass& map, int t ) return -1000; } -bool entityclass::entitycollidefloor( mapclass& map, int t ) +bool entityclass::entitycollidefloor( int t ) { //see? like here, for example! tempx = entities[t].xp + entities[t].cx; @@ -4923,11 +4923,11 @@ bool entityclass::entitycollidefloor( mapclass& map, int t ) temph = entities[t].h; rectset(tempx, tempy, tempw, temph); - if (checkwall(map)) return true; + if (checkwall()) return true; return false; } -bool entityclass::entitycollideroof( mapclass& map, int t ) +bool entityclass::entitycollideroof( int t ) { //and here! tempx = entities[t].xp + entities[t].cx; @@ -4936,11 +4936,11 @@ bool entityclass::entitycollideroof( mapclass& map, int t ) temph = entities[t].h; rectset(tempx, tempy, tempw, temph); - if (checkwall(map)) return true; + if (checkwall()) return true; return false; } -bool entityclass::testwallsx( int t, mapclass& map, int tx, int ty ) +bool entityclass::testwallsx( int t, int tx, int ty ) { tempx = tx + entities[t].cx; tempy = ty + entities[t].cy; @@ -4963,19 +4963,19 @@ bool entityclass::testwallsx( int t, mapclass& map, int tx, int ty ) dr = entities[t].rule; //Ok, now we check walls - if (checkwall(map)) + if (checkwall()) { if (entities[t].vx > 1.0f) { entities[t].vx--; entities[t].newxp = entities[t].xp + entities[t].vx; - return testwallsx(t, map, entities[t].newxp, entities[t].yp); + return testwallsx(t, entities[t].newxp, entities[t].yp); } else if (entities[t].vx < -1.0f) { entities[t].vx++; entities[t].newxp = entities[t].xp + entities[t].vx; - return testwallsx(t, map, entities[t].newxp, entities[t].yp); + return testwallsx(t, entities[t].newxp, entities[t].yp); } else { @@ -4986,7 +4986,7 @@ bool entityclass::testwallsx( int t, mapclass& map, int tx, int ty ) return true; } -bool entityclass::testwallsy( int t, mapclass& map, float tx, float ty ) +bool entityclass::testwallsy( int t, float tx, float ty ) { tempx = static_cast(tx) + entities[t].cx; tempy = static_cast(ty) + entities[t].cy; @@ -5010,19 +5010,19 @@ bool entityclass::testwallsy( int t, mapclass& map, float tx, float ty ) dr = entities[t].rule; //Ok, now we check walls - if (checkwall(map)) + if (checkwall()) { if (entities[t].vy > 1) { entities[t].vy--; entities[t].newyp = int(entities[t].yp + entities[t].vy); - return testwallsy(t, map, entities[t].xp, entities[t].newyp); + return testwallsy(t, entities[t].xp, entities[t].newyp); } else if (entities[t].vy < -1) { entities[t].vy++; entities[t].newyp = int(entities[t].yp + entities[t].vy); - return testwallsy(t, map, entities[t].xp, entities[t].newyp); + return testwallsy(t, entities[t].xp, entities[t].newyp); } else { @@ -5073,7 +5073,7 @@ void entityclass::cleanup() } } -void entityclass::updateentitylogic( int t, Game& game ) +void entityclass::updateentitylogic( int t ) { entities[t].oldxp = entities[t].xp; entities[t].oldyp = entities[t].yp; @@ -5110,9 +5110,9 @@ void entityclass::updateentitylogic( int t, Game& game ) entities[t].newyp = entities[t].yp + entities[t].vy; } -void entityclass::entitymapcollision( int t, mapclass& map ) +void entityclass::entitymapcollision( int t ) { - if (testwallsx(t, map, entities[t].newxp, entities[t].yp)) + if (testwallsx(t, entities[t].newxp, entities[t].yp)) { entities[t].xp = entities[t].newxp; } @@ -5121,7 +5121,7 @@ void entityclass::entitymapcollision( int t, mapclass& map ) if (entities[t].onwall > 0) entities[t].state = entities[t].onwall; if (entities[t].onxwall > 0) entities[t].state = entities[t].onxwall; } - if (testwallsy(t, map, entities[t].xp, entities[t].newyp)) + if (testwallsy(t, entities[t].xp, entities[t].newyp)) { entities[t].yp = entities[t].newyp; } @@ -5133,7 +5133,7 @@ void entityclass::entitymapcollision( int t, mapclass& map ) } } -void entityclass::movingplatformfix( int t, mapclass& map ) +void entityclass::movingplatformfix( int t ) { //If this intersects the player, then we move the player along it int j = getplayer(); @@ -5146,7 +5146,7 @@ void entityclass::movingplatformfix( int t, mapclass& map ) entities[j].yp = entities[j].yp - int(entities[j].vy); entities[j].vy = entities[t].vy; entities[j].newyp = entities[j].yp + int(entities[j].vy); - if (testwallsy(j, map, entities[j].xp, entities[j].newyp)) + if (testwallsy(j, entities[j].xp, entities[j].newyp)) { if (entities[t].vy > 0) { @@ -5169,7 +5169,7 @@ void entityclass::movingplatformfix( int t, mapclass& map ) } } -void entityclass::scmmovingplatformfix( int t, mapclass& map ) +void entityclass::scmmovingplatformfix( int t ) { //If this intersects the SuperCrewMate, then we move them along it int j = getscm(); @@ -5182,7 +5182,7 @@ void entityclass::scmmovingplatformfix( int t, mapclass& map ) entities[j].yp = entities[j].yp - (entities[j].vy); entities[j].vy = entities[t].vy; entities[j].newyp = static_cast(entities[j].yp) + entities[j].vy; - if (testwallsy(j, map, entities[j].xp, entities[j].newyp)) + if (testwallsy(j, entities[j].xp, entities[j].newyp)) { if (entities[t].vy > 0) { @@ -5205,7 +5205,7 @@ void entityclass::scmmovingplatformfix( int t, mapclass& map ) } } -void entityclass::hormovingplatformfix( int t, mapclass& map ) +void entityclass::hormovingplatformfix( int t ) { //If this intersects the player, then we move the player along it //for horizontal platforms, this is simplier @@ -5248,7 +5248,7 @@ void entityclass::customwarplinecheck(int i) { } } -void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& map, musicclass& music ) +void entityclass::entitycollisioncheck() { for (int i = 0; i < nentity; i++) { @@ -5271,10 +5271,10 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m colpoint1.y = entities[i].yp; colpoint2.x = entities[j].xp; colpoint2.y = entities[j].yp; - if (dwgfx.flipmode) + if (graphics.flipmode) { - if (dwgfx.Hitest(dwgfx.flipsprites[entities[i].drawframe], - colpoint1, 1, dwgfx.flipsprites[entities[j].drawframe], colpoint2, 1)) + if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe], + colpoint1, 1, graphics.flipsprites[entities[j].drawframe], colpoint2, 1)) { //Do the collision stuff game.deathseq = 30; @@ -5282,8 +5282,8 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m } else { - if (dwgfx.Hitest(dwgfx.sprites[entities[i].drawframe], - colpoint1, 1, dwgfx.sprites[entities[j].drawframe], colpoint2, 1) ) + if (graphics.Hitest(graphics.sprites[entities[i].drawframe], + colpoint1, 1, graphics.sprites[entities[j].drawframe], colpoint2, 1) ) { //Do the collision stuff game.deathseq = 30; @@ -5399,10 +5399,10 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m colpoint1.y = entities[i].yp; colpoint2.x = entities[j].xp; colpoint2.y = entities[j].yp; - if (dwgfx.flipmode) + if (graphics.flipmode) { - if (dwgfx.Hitest(dwgfx.flipsprites[entities[i].drawframe], - colpoint1, 1, dwgfx.flipsprites[entities[j].drawframe], colpoint2, 1)) + if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe], + colpoint1, 1, graphics.flipsprites[entities[j].drawframe], colpoint2, 1)) { //Do the collision stuff game.deathseq = 30; @@ -5411,8 +5411,8 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m } else { - if (dwgfx.Hitest(dwgfx.sprites[entities[i].drawframe], - colpoint1, 1, dwgfx.sprites[entities[j].drawframe], colpoint2, 1)) + if (graphics.Hitest(graphics.sprites[entities[i].drawframe], + colpoint1, 1, graphics.sprites[entities[j].drawframe], colpoint2, 1)) { //Do the collision stuff game.deathseq = 30; @@ -5449,7 +5449,7 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m //can't have the player being stuck... int j = getplayer(); skipdirblocks = true; - if (!testwallsx(j, map, entities[j].xp, entities[j].yp)) + if (!testwallsx(j, entities[j].xp, entities[j].yp)) { //Let's try to get out... if (entities[j].rule == 0) @@ -5471,7 +5471,7 @@ void entityclass::entitycollisioncheck( Graphics& dwgfx, Game& game, mapclass& m { j = getscm(); skipdirblocks = true; - if (!testwallsx(j, map, entities[j].xp, entities[j].yp)) + if (!testwallsx(j, entities[j].xp, entities[j].yp)) { //Let's try to get out... if(game.gravitycontrol==0) diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h index f314c62d..fc3e2c0d 100644 --- a/desktop_version/src/Entity.h +++ b/desktop_version/src/Entity.h @@ -20,12 +20,6 @@ enum ACTIVITY = 5 }; -class mapclass; -class musicclass; -class Graphics; -class Game; -class UtilityClass; - class entityclass { public: @@ -66,9 +60,9 @@ public: void swnenemiescol(int t); - void gravcreate(Game& game, int ypos, int dir, int xoff = 0, int yoff = 0); + void gravcreate(int ypos, int dir, int xoff = 0, int yoff = 0); - void generateswnwave(Game& game, UtilityClass& help, int t); + void generateswnwave(int t); void createblock(int t, int xp, int yp, int w, int h, int trig = 0); @@ -94,12 +88,12 @@ public: void settreadmillcolour(int t, int rx, int ry); - void createentity(Game& game, float xp, float yp, int t, float vx = 0, float vy = 0, + void createentity(float xp, float yp, int t, float vx = 0, float vy = 0, int p1 = 0, int p2 = 0, int p3 = 320, int p4 = 240 ); - bool updateentities(int i, UtilityClass& help, Game& game, musicclass& music); + bool updateentities(int i); - void animateentities(int i, Game& game, UtilityClass& help); + void animateentities(int i); bool gettype(int t); @@ -142,9 +136,9 @@ public: bool checkblocks(); - bool checktowerspikes(int t, mapclass& map); + bool checktowerspikes(int t); - bool checkwall(mapclass& map); + bool checkwall(); float hplatformat(); @@ -159,17 +153,17 @@ public: void customwarplinecheck(int i); - float entitycollideplatformroof(mapclass& map, int t); + float entitycollideplatformroof(int t); - float entitycollideplatformfloor(mapclass& map, int t); + float entitycollideplatformfloor(int t); - bool entitycollidefloor(mapclass& map, int t); + bool entitycollidefloor(int t); - bool entitycollideroof(mapclass& map, int t); + bool entitycollideroof(int t); - bool testwallsx(int t, mapclass& map, int tx, int ty); + bool testwallsx(int t, int tx, int ty); - bool testwallsy(int t, mapclass& map, float tx, float ty); + bool testwallsy(int t, float tx, float ty); void fixfriction(int t, float xfix, float xrate, float yrate); @@ -177,18 +171,18 @@ public: void cleanup(); - void updateentitylogic(int t, Game& game); + void updateentitylogic(int t); - void entitymapcollision(int t, mapclass& map); + void entitymapcollision(int t); - void movingplatformfix(int t, mapclass& map); + void movingplatformfix(int t); - void scmmovingplatformfix(int t, mapclass& map); + void scmmovingplatformfix(int t); - void hormovingplatformfix(int t, mapclass& map); + void hormovingplatformfix(int t); - void entitycollisioncheck(Graphics& dwgfx, Game& game, mapclass& map, musicclass& music); + void entitycollisioncheck(); std::vector entities; diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp index b8f3831a..054c772a 100644 --- a/desktop_version/src/Finalclass.cpp +++ b/desktop_version/src/Finalclass.cpp @@ -50,11 +50,11 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98"); tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98"); - obj.createentity(game, 163, 32, 12, 168); // (vertical gravity line) - obj.createentity(game, 99, 32, 12, 168); // (vertical gravity line) - obj.createentity(game, 227, 32, 12, 168); // (vertical gravity line) - obj.createentity(game, 35, 32, 12, 168); // (vertical gravity line) - obj.createentity(game, 291, 32, 12, 168); // (vertical gravity line) + obj.createentity(163, 32, 12, 168); // (vertical gravity line) + obj.createentity(99, 32, 12, 168); // (vertical gravity line) + obj.createentity(227, 32, 12, 168); // (vertical gravity line) + obj.createentity(35, 32, 12, 168); // (vertical gravity line) + obj.createentity(291, 32, 12, 168); // (vertical gravity line) warpx = true; roomname = "1954 World Cup Vinyl"; @@ -92,12 +92,12 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,178,179,179,180,0,0,0,0,0,0,0,178,179,179,180,0,0,0,0,0,0,0,178,179,179,180,0,0,0,0,0,0,0,218,98,220,740"); tmap.push_back("0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,220,740"); - obj.createentity(game, -8, 116, 11, 40); // (horizontal gravity line) - obj.createentity(game, 48, 116, 11, 184); // (horizontal gravity line) - obj.createentity(game, 32, 88, 10, 1, 51500); // (savepoint) - obj.createentity(game, 32, 128, 10, 0, 51501); // (savepoint) - obj.createentity(game, 256, 88, 10, 1, 51502); // (savepoint) - obj.createentity(game, 256, 128, 10, 0, 51503); // (savepoint) + obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) + obj.createentity(48, 116, 11, 184); // (horizontal gravity line) + obj.createentity(32, 88, 10, 1, 51500); // (savepoint) + obj.createentity(32, 128, 10, 0, 51501); // (savepoint) + obj.createentity(256, 88, 10, 1, 51502); // (savepoint) + obj.createentity(256, 128, 10, 0, 51503); // (savepoint) warpy = true; roomname = "The V Stooges"; break; @@ -135,10 +135,10 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,50,178,179,179,180,49,0,0,0,0,0,0,0,0,50,178,179,179,180,49,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 116, 11, 40); // (horizontal gravity line) - obj.createentity(game, 288, 116, 11, 32); // (horizontal gravity line) - obj.createentity(game, 64, 116, 11, 64); // (horizontal gravity line) - obj.createentity(game, 192, 116, 11, 64); // (horizontal gravity line) + obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) + obj.createentity(288, 116, 11, 32); // (horizontal gravity line) + obj.createentity(64, 116, 11, 64); // (horizontal gravity line) + obj.createentity(192, 116, 11, 64); // (horizontal gravity line) warpy = true; roomname = "glitch"; @@ -176,13 +176,13 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 116, 11, 40); // (horizontal gravity line) - obj.createentity(game, 48, 116, 11, 224); // (horizontal gravity line) - obj.createentity(game, 288, 116, 11, 32); // (horizontal gravity line) - obj.createentity(game, 56, 88, 1, 3, 10); // Enemy - obj.createentity(game, 248-16, 128, 1, 2, 10); // Enemy - obj.createentity(game, 272, 168, 10, 0, 51480); // (savepoint) - obj.createentity(game, 32, 48, 10, 1, 51481); // (savepoint) + obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) + obj.createentity(48, 116, 11, 224); // (horizontal gravity line) + obj.createentity(288, 116, 11, 32); // (horizontal gravity line) + obj.createentity(56, 88, 1, 3, 10); // Enemy + obj.createentity(248-16, 128, 1, 2, 10); // Enemy + obj.createentity(272, 168, 10, 0, 51480); // (savepoint) + obj.createentity(32, 48, 10, 1, 51481); // (savepoint) warpy = true; roomname = "glitch"; @@ -220,11 +220,11 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 148, 11, 104); // (horizontal gravity line) - obj.createentity(game, -8, 84, 11, 80); // (horizontal gravity line) - obj.createentity(game, 176, 116, 11, 144); // (horizontal gravity line) - obj.createentity(game, 128, 96, 10, 0, 51470); // (savepoint) - obj.createentity(game, 128, 56, 10, 1, 51471); // (savepoint) + obj.createentity(-8, 148, 11, 104); // (horizontal gravity line) + obj.createentity(-8, 84, 11, 80); // (horizontal gravity line) + obj.createentity(176, 116, 11, 144); // (horizontal gravity line) + obj.createentity(128, 96, 10, 0, 51470); // (savepoint) + obj.createentity(128, 56, 10, 1, 51471); // (savepoint) warpy = true; roomname = "change"; @@ -262,13 +262,13 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 84, 11, 328); // (horizontal gravity line) - obj.createentity(game, -8, 148, 11, 328); // (horizontal gravity line) - obj.createentity(game, 96, 120, 1, 2, 4); // Enemy - obj.createentity(game, 144, 96, 1, 2, 4); // Enemy - obj.createentity(game, 192, 120, 1, 2, 4); // Enemy - obj.createentity(game, 240, 96, 1, 2, 4); // Enemy - obj.createentity(game, 288, 120, 1, 2, 4); // Enemy + obj.createentity(-8, 84, 11, 328); // (horizontal gravity line) + obj.createentity(-8, 148, 11, 328); // (horizontal gravity line) + obj.createentity(96, 120, 1, 2, 4); // Enemy + obj.createentity(144, 96, 1, 2, 4); // Enemy + obj.createentity(192, 120, 1, 2, 4); // Enemy + obj.createentity(240, 96, 1, 2, 4); // Enemy + obj.createentity(288, 120, 1, 2, 4); // Enemy warpy = true; roomname = "change"; @@ -306,10 +306,10 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 248, 84, 11, 72); // (horizontal gravity line) - obj.createentity(game, 224, 148, 11, 96); // (horizontal gravity line) - obj.createentity(game, 176, 56, 10, 1, 51450); // (savepoint) - obj.createentity(game, 176, 96, 10, 0, 51451); // (savepoint) + obj.createentity(248, 84, 11, 72); // (horizontal gravity line) + obj.createentity(224, 148, 11, 96); // (horizontal gravity line) + obj.createentity(176, 56, 10, 1, 51450); // (savepoint) + obj.createentity(176, 96, 10, 0, 51451); // (savepoint) warpy = true; roomname = "change"; @@ -348,19 +348,19 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 64+32-8, 32-16, 1, 0, 7, 0, -48, 320, 312); // Enemy, bounded - obj.createentity(game, 96+32-8, 32-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded - obj.createentity(game, 128+32-8, 32-16, 1, 0, 7, 0, -40, 320, 320); // Enemy, bounded - obj.createentity(game, 160+32-8, 32-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded - obj.createentity(game, 192+32-8, 32-16, 1, 0, 7, 0, -64, 320, 336); // Enemy, bounded - obj.createentity(game, 64+32-8, 64-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded - obj.createentity(game, 64+32-8, 96-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded - obj.createentity(game, 64+32-8, 128-16, 1, 0, 7, 0, -64, 320, 320); // Enemy, bounded - obj.createentity(game, 64+32-8, 160-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded - obj.createentity(game, 192+32-8, 128-16+8, 1, 0, 7, 0, -64, 320, 320); // Enemy, bounded - obj.createentity(game, 192+32-8, 160-16+8, 1, 0, 7, 0, -80, 320, 320); // Enemy, bounded - obj.createentity(game, 192+32-8, 192-16+8, 1, 0, 7, 0, -80, 320, 304); // Enemy, bounded - obj.createentity(game, 192+32-8, 192+24, 1, 0, 7, 0, -80, 320, 304); // Enemy, bounded + obj.createentity(64+32-8, 32-16, 1, 0, 7, 0, -48, 320, 312); // Enemy, bounded + obj.createentity(96+32-8, 32-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded + obj.createentity(128+32-8, 32-16, 1, 0, 7, 0, -40, 320, 320); // Enemy, bounded + obj.createentity(160+32-8, 32-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded + obj.createentity(192+32-8, 32-16, 1, 0, 7, 0, -64, 320, 336); // Enemy, bounded + obj.createentity(64+32-8, 64-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded + obj.createentity(64+32-8, 96-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded + obj.createentity(64+32-8, 128-16, 1, 0, 7, 0, -64, 320, 320); // Enemy, bounded + obj.createentity(64+32-8, 160-16, 1, 0, 7, 0, -56, 320, 320); // Enemy, bounded + obj.createentity(192+32-8, 128-16+8, 1, 0, 7, 0, -64, 320, 320); // Enemy, bounded + obj.createentity(192+32-8, 160-16+8, 1, 0, 7, 0, -80, 320, 320); // Enemy, bounded + obj.createentity(192+32-8, 192-16+8, 1, 0, 7, 0, -80, 320, 304); // Enemy, bounded + obj.createentity(192+32-8, 192+24, 1, 0, 7, 0, -80, 320, 304); // Enemy, bounded warpy = true; roomname = "Vertigo"; @@ -398,17 +398,17 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 155, 24, 12, 184); // (vertical gravity line) - obj.createentity(game, 120, 152, 1, 1, 8, 0, -56, 320, 296); // Enemy, bounded - obj.createentity(game, 104, 136, 1, 1, 8, 0, -64, 320, 296); // Enemy, bounded - obj.createentity(game, 88, 120, 1, 1, 8, 0, -56, 320, 312); // Enemy, bounded - obj.createentity(game, 72, 104, 1, 1, 8, 0, -56, 320, 296); // Enemy, bounded - obj.createentity(game, 56, 88, 1, 1, 8, 0, -48, 320, 328); // Enemy, bounded - obj.createentity(game, 176, 56, 1, 0, 8, 0, -64, 320, 288); // Enemy, bounded - obj.createentity(game, 192, 72, 1, 0, 8, 0, -48, 320, 296); // Enemy, bounded - obj.createentity(game, 208, 88, 1, 0, 8, 0, -72, 320, 296); // Enemy, bounded - obj.createentity(game, 224, 104, 1, 0, 8, 0, -56, 320, 296); // Enemy, bounded - obj.createentity(game, 240, 120, 1, 0, 8, 0, -48, 320, 296); // Enemy, bounded + obj.createentity(155, 24, 12, 184); // (vertical gravity line) + obj.createentity(120, 152, 1, 1, 8, 0, -56, 320, 296); // Enemy, bounded + obj.createentity(104, 136, 1, 1, 8, 0, -64, 320, 296); // Enemy, bounded + obj.createentity(88, 120, 1, 1, 8, 0, -56, 320, 312); // Enemy, bounded + obj.createentity(72, 104, 1, 1, 8, 0, -56, 320, 296); // Enemy, bounded + obj.createentity(56, 88, 1, 1, 8, 0, -48, 320, 328); // Enemy, bounded + obj.createentity(176, 56, 1, 0, 8, 0, -64, 320, 288); // Enemy, bounded + obj.createentity(192, 72, 1, 0, 8, 0, -48, 320, 296); // Enemy, bounded + obj.createentity(208, 88, 1, 0, 8, 0, -72, 320, 296); // Enemy, bounded + obj.createentity(224, 104, 1, 0, 8, 0, -56, 320, 296); // Enemy, bounded + obj.createentity(240, 120, 1, 0, 8, 0, -48, 320, 296); // Enemy, bounded warpy = true; roomname = "The Voon Show"; @@ -446,9 +446,9 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 168, 72, 10, 0, 51420); // (savepoint) - obj.createentity(game, 24, 60, 11, 120); // (horizontal gravity line) - obj.createentity(game, 24, 148, 11, 120); // (horizontal gravity line) + obj.createentity(168, 72, 10, 0, 51420); // (savepoint) + obj.createentity(24, 60, 11, 120); // (horizontal gravity line) + obj.createentity(24, 148, 11, 120); // (horizontal gravity line) warpy = true; roomname = "glitch"; @@ -487,11 +487,11 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,218,98,220,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,740,218,98,220,0,0,0,0,0,218,220,178,179,179,179,179,179,179,179,179,179,180,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 280, 120, 10, 1, 51410); // (savepoint) - obj.createentity(game, 40, 28, 11, 192); // (horizontal gravity line) - obj.createentity(game, 96, 204, 11, 88); // (horizontal gravity line) - obj.createentity(game, 144, 156, 11, 88); // (horizontal gravity line) - obj.createentity(game, 96, 92, 11, 88); // (horizontal gravity line) + obj.createentity(280, 120, 10, 1, 51410); // (savepoint) + obj.createentity(40, 28, 11, 192); // (horizontal gravity line) + obj.createentity(96, 204, 11, 88); // (horizontal gravity line) + obj.createentity(144, 156, 11, 88); // (horizontal gravity line) + obj.createentity(96, 92, 11, 88); // (horizontal gravity line) warpx = true; roomname = "1950 Silverstone Grand V"; @@ -530,8 +530,8 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 264, 168, 10, 1, 52410); // (savepoint) - obj.createentity(game, 152, 112, 20, 1); // (terminal) + obj.createentity(264, 168, 10, 1, 52410); // (savepoint) + obj.createentity(152, 112, 20, 1); // (terminal) if(obj.flags[72] == 0) { @@ -617,12 +617,12 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,178,179,179,180,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220"); tmap.push_back("218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220"); - obj.createentity(game, 264, 176, 10, 1, 52430); // (savepoint) - obj.createentity(game, 96, 180, 11, 96); // (horizontal gravity line) - obj.createentity(game, 160, 52, 11, 96); // (horizontal gravity line) - obj.createentity(game, 240, 136, 1, 2, 8); // Enemy - obj.createentity(game, 96, 88, 1, 3, 8); // Enemy - obj.createentity(game, 72, 32, 10, 0, 52431); // (savepoint) + obj.createentity(264, 176, 10, 1, 52430); // (savepoint) + obj.createentity(96, 180, 11, 96); // (horizontal gravity line) + obj.createentity(160, 52, 11, 96); // (horizontal gravity line) + obj.createentity(240, 136, 1, 2, 8); // Enemy + obj.createentity(96, 88, 1, 3, 8); // Enemy + obj.createentity(72, 32, 10, 0, 52431); // (savepoint) roomname = "Upstairs, Downstairs"; break; @@ -659,21 +659,21 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98"); tmap.push_back("98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98"); - obj.createentity(game, 64, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 32, 112, 2, 9, 4); //Threadmill, <<< + obj.createentity(64, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(32, 112, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 0, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 104, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 104, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 80+8, 128, 1, 0, 5, 0, 120, 320, 200); // Enemy, bounded - obj.createentity(game, 128+16, 168, 1, 1, 5, 0, 120, 320, 200); // Enemy, bounded - obj.createentity(game, 176+24, 128, 1, 0, 5, 0, 120, 320, 200); // Enemy, bounded - //obj.createentity(game, 224, 168, 1, 1, 5, 0, 120, 320, 200); // Enemy, bounded - obj.createentity(game, 24, 184, 10, 1, 52440); // (savepoint) + obj.createentity(80+8, 128, 1, 0, 5, 0, 120, 320, 200); // Enemy, bounded + obj.createentity(128+16, 168, 1, 1, 5, 0, 120, 320, 200); // Enemy, bounded + obj.createentity(176+24, 128, 1, 0, 5, 0, 120, 320, 200); // Enemy, bounded + //obj.createentity(224, 168, 1, 1, 5, 0, 120, 320, 200); // Enemy, bounded + obj.createentity(24, 184, 10, 1, 52440); // (savepoint) roomname = "Timeslip"; break; @@ -709,10 +709,10 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,218,98,220,218,98,220,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740"); tmap.push_back("740,218,98,220,218,98,220,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740"); - obj.createentity(game, 40, 176, 10, 1, 52450); // (savepoint) - obj.createentity(game, 80, 156, 11, 176); // (horizontal gravity line) - obj.createentity(game, 128, 88, 10, 1, 52451); // (savepoint) - obj.createentity(game, 160, 76, 11, 96); // (horizontal gravity line) + obj.createentity(40, 176, 10, 1, 52450); // (savepoint) + obj.createentity(80, 156, 11, 176); // (horizontal gravity line) + obj.createentity(128, 88, 10, 1, 52451); // (savepoint) + obj.createentity(160, 76, 11, 96); // (horizontal gravity line) roomname = "Three's Company"; break; @@ -748,12 +748,12 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,218,98,220,178,179,179,179,179,179,179,179,180,218,220,178,179,179,179,179,179,179,179,179,179,179,179,180,218,98,220,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,218,98,220,218,98,98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 68-4, 56, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 132-4, 56, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 44, 192, 3); //Disappearing Platform - obj.createentity(game, 92, 104, 3); //Disappearing Platform - obj.createentity(game, 120, 192, 2, 3, 6); // Platform - obj.createentity(game, 264, 48, 2, 2, 6); // Platform + obj.createentity(68-4, 56, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(132-4, 56, 2, 9, 4); //Threadmill, <<< + obj.createentity(44, 192, 3); //Disappearing Platform + obj.createentity(92, 104, 3); //Disappearing Platform + obj.createentity(120, 192, 2, 3, 6); // Platform + obj.createentity(264, 48, 2, 2, 6); // Platform roomname = "Cosmic Creepers"; break; @@ -789,12 +789,12 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("179,179,179,179,179,179,179,179,179,180,6,6,6,6,6,6,6,6,6,6,6,6,178,179,180,6,6,6,6,6,6,6,6,6,6,6,6,178,179,179"); tmap.push_back("98,98,98,98,98,98,98,98,98,220,178,179,179,179,179,179,179,179,179,179,179,180,218,98,220,178,179,179,179,179,179,179,179,179,179,179,180,218,98,98"); - obj.createentity(game, 16, 112, 10, 1, 52480); // (savepoint) - obj.createentity(game, 67, 24, 12, 96); // (vertical gravity line) - obj.createentity(game, 243, 112, 12, 104); // (vertical gravity line) - obj.createentity(game, 288, 104, 10, 0, 52481); // (savepoint) - obj.createentity(game, 187, 24, 12, 80); // (vertical gravity line) - obj.createentity(game, 123, 128, 12, 88); // (vertical gravity line) + obj.createentity(16, 112, 10, 1, 52480); // (savepoint) + obj.createentity(67, 24, 12, 96); // (vertical gravity line) + obj.createentity(243, 112, 12, 104); // (vertical gravity line) + obj.createentity(288, 104, 10, 0, 52481); // (savepoint) + obj.createentity(187, 24, 12, 80); // (vertical gravity line) + obj.createentity(123, 128, 12, 88); // (vertical gravity line) roomname = "The Villi People"; break; @@ -831,16 +831,16 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,220,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98"); tmap.push_back("98,220,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98"); - obj.createentity(game, 192, 56, 10, 1, 53500); // (savepoint) - obj.createentity(game, 288, 104, 10, 0, 53501); // (savepoint) + obj.createentity(192, 56, 10, 1, 53500); // (savepoint) + obj.createentity(288, 104, 10, 0, 53501); // (savepoint) - obj.createentity(game, 168, 96, 1, 0, 5); // Enemy - obj.createentity(game, 184+2, 104, 1, 0, 5); // Enemy - obj.createentity(game, 200+4, 112, 1, 0, 5); // Enemy + obj.createentity(168, 96, 1, 0, 5); // Enemy + obj.createentity(184+2, 104, 1, 0, 5); // Enemy + obj.createentity(200+4, 112, 1, 0, 5); // Enemy - obj.createentity(game, 88, 176-4, 1, 1, 5); // Enemy - obj.createentity(game, 104+2, 168-4, 1, 1, 5); // Enemy - obj.createentity(game, 120 + 4, 160 - 4, 1, 1, 5); // Enemy + obj.createentity(88, 176-4, 1, 1, 5); // Enemy + obj.createentity(104+2, 168-4, 1, 1, 5); // Enemy + obj.createentity(120 + 4, 160 - 4, 1, 1, 5); // Enemy warpx = true; roomname = "change"; @@ -878,13 +878,13 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 24, 88, 10, 1, 54500); // (savepoint) - obj.createentity(game, 280, 184, 10, 1, 54501); // (savepoint) - obj.createentity(game, 56, 44, 11, 56); // (horizontal gravity line) - obj.createentity(game, 131, 72, 12, 64); // (vertical gravity line) - obj.createentity(game, 144, 36, 11, 48); // (horizontal gravity line) - obj.createentity(game, 211, 80, 12, 56); // (vertical gravity line) - obj.createentity(game, 224, 52, 11, 80); // (horizontal gravity line) + obj.createentity(24, 88, 10, 1, 54500); // (savepoint) + obj.createentity(280, 184, 10, 1, 54501); // (savepoint) + obj.createentity(56, 44, 11, 56); // (horizontal gravity line) + obj.createentity(131, 72, 12, 64); // (vertical gravity line) + obj.createentity(144, 36, 11, 48); // (horizontal gravity line) + obj.createentity(211, 80, 12, 56); // (vertical gravity line) + obj.createentity(224, 52, 11, 80); // (horizontal gravity line) warpx = true; roomname = "change"; @@ -923,14 +923,14 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 16, 48, 10, 1, 53520); // (savepoint) - obj.createentity(game, 96, 144, 3); //Disappearing Platform - obj.createentity(game, 128, 144, 3); //Disappearing Platform - obj.createentity(game, 160, 144, 3); //Disappearing Platform - obj.createentity(game, 208, 80, 3); //Disappearing Platform - obj.createentity(game, 240, 80, 3); //Disappearing Platform - obj.createentity(game, 272, 80, 3); //Disappearing Platform - obj.createentity(game, 304, 80, 3); //Disappearing Platform + obj.createentity(16, 48, 10, 1, 53520); // (savepoint) + obj.createentity(96, 144, 3); //Disappearing Platform + obj.createentity(128, 144, 3); //Disappearing Platform + obj.createentity(160, 144, 3); //Disappearing Platform + obj.createentity(208, 80, 3); //Disappearing Platform + obj.createentity(240, 80, 3); //Disappearing Platform + obj.createentity(272, 80, 3); //Disappearing Platform + obj.createentity(304, 80, 3); //Disappearing Platform roomname = "The Last Straw"; break; @@ -966,16 +966,16 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,6,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 0, 80, 3); //Disappearing Platform - obj.createentity(game, 288, 88, 3); //Disappearing Platform - obj.createentity(game, 32, 80, 3); //Disappearing Platform - obj.createentity(game, 64, 136, 3); //Disappearing Platform - obj.createentity(game, 96, 136, 3); //Disappearing Platform - obj.createentity(game, 224, 144, 3); //Disappearing Platform - obj.createentity(game, 192, 144, 3); //Disappearing Platform - obj.createentity(game, 256, 88, 3); //Disappearing Platform - obj.createentity(game, 128, 88, 3); //Disappearing Platform - obj.createentity(game, 160, 88, 3); //Disappearing Platform + obj.createentity(0, 80, 3); //Disappearing Platform + obj.createentity(288, 88, 3); //Disappearing Platform + obj.createentity(32, 80, 3); //Disappearing Platform + obj.createentity(64, 136, 3); //Disappearing Platform + obj.createentity(96, 136, 3); //Disappearing Platform + obj.createentity(224, 144, 3); //Disappearing Platform + obj.createentity(192, 144, 3); //Disappearing Platform + obj.createentity(256, 88, 3); //Disappearing Platform + obj.createentity(128, 88, 3); //Disappearing Platform + obj.createentity(160, 88, 3); //Disappearing Platform roomname = "W"; break; @@ -1011,10 +1011,10 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); tmap.push_back("740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740"); - obj.createentity(game, 0, 88, 3); //Disappearing Platform - obj.createentity(game, 32, 88, 3); //Disappearing Platform - obj.createentity(game, 64, 88, 3); //Disappearing Platform - obj.createentity(game, 120, 128, 9, 19); // (shiny trinket) + obj.createentity(0, 88, 3); //Disappearing Platform + obj.createentity(32, 88, 3); //Disappearing Platform + obj.createentity(64, 88, 3); //Disappearing Platform + obj.createentity(120, 128, 9, 19); // (shiny trinket) roomname="V"; break; @@ -1311,7 +1311,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,180,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740"); - obj.createentity(game, 264, 32, 10, 0, 54480); // (savepoint) + obj.createentity(264, 32, 10, 0, 54480); // (savepoint) /*if(!game.nocutscenes && obj.flags[71]==0){ obj.createblock(1, 72, 0, 320, 240, 49); @@ -1353,7 +1353,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("740,740,740,218,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98"); tmap.push_back("740,740,740,218,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98"); - obj.createentity(game, 120, 116, 11, 80); // (horizontal gravity line) + obj.createentity(120, 116, 11, 80); // (horizontal gravity line) warpy = true; roomname = "Origami Room"; break; @@ -1392,7 +1392,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("12,12,12,12,12,12,12,15,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,12"); tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12"); - obj.createentity(game, 40, 80, 10, 1, 50500); // (savepoint) + obj.createentity(40, 80, 10, 1, 50500); // (savepoint) roomname = "Teleporter Divot"; break; @@ -1429,14 +1429,14 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12"); tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12"); - obj.createentity(game, 16, 112, 10, 1, 50520); // (savepoint) + obj.createentity(16, 112, 10, 1, 50520); // (savepoint) roomname = "Seeing Red"; if(!game.intimetrial) { if(game.companion==0 && obj.flags[8]==0 && !game.crewstats[3]) //also need to check if he's rescued in a previous game { - obj.createentity(game, 264, 185, 18, 15, 1, 17, 0); + obj.createentity(264, 185, 18, 15, 1, 17, 0); obj.createblock(1, 26*8, 0, 32, 240, 36); } } @@ -1474,7 +1474,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12"); tmap.push_back("12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12"); - obj.createentity(game, 128-16, 80-32, 14); //Teleporter! + obj.createentity(128-16, 80-32, 14); //Teleporter! roomname = "Building Apport"; if(game.intimetrial) @@ -1589,8 +1589,8 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - //obj.createentity(game, -8, 84-32, 11, 328); // (horizontal gravity line) - obj.createentity(game, -8, 148 + 32, 11, 328); // (horizontal gravity line) + //obj.createentity(-8, 84-32, 11, 328); // (horizontal gravity line) + obj.createentity(-8, 148 + 32, 11, 328); // (horizontal gravity line) obj.createblock(1, -10, 84 - 16, 340, 32, 10); //create the second line! @@ -1630,28 +1630,28 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); tmap.push_back("219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, 264, 176, 10, 1, 51530); // (savepoint) + obj.createentity(264, 176, 10, 1, 51530); // (savepoint) if(game.companion==0) //also need to check if he's rescued in a previous game { if (game.lastsaved == 2) { - obj.createentity(game, 112, 169, 18, 14, 0, 17, 1); + obj.createentity(112, 169, 18, 14, 0, 17, 1); obj.createblock(1, 22 * 8, 16*8, 32, 240, 37); } else if (game.lastsaved ==3) { - obj.createentity(game, 112, 169, 18, 15, 0, 17, 1); + obj.createentity(112, 169, 18, 15, 0, 17, 1); obj.createblock(1, 22 * 8, 16*8, 32, 240, 38); } else if (game.lastsaved == 4) { - obj.createentity(game, 112, 169, 18, 13, 0, 17, 1); + obj.createentity(112, 169, 18, 13, 0, 17, 1); obj.createblock(1, 22 * 8, 16*8, 32, 240, 39); } else { - obj.createentity(game, 112, 169, 18, 16, 1, 17, 1); + obj.createentity(112, 169, 18, 16, 1, 17, 1); obj.createblock(1, 22 * 8, 16*8, 32, 240, 40); } } @@ -1695,7 +1695,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); tmap.push_back("219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, (22 * 8)+4, (9 * 8) + 4, 14); //Teleporter! + obj.createentity((22 * 8)+4, (9 * 8) + 4, 14); //Teleporter! roomname = "House of Mirrors"; warpx = true; @@ -1735,7 +1735,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219"); tmap.push_back("219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219"); - //obj.createentity(game, 164, 96, 10, 1, 56410); // (savepoint) + //obj.createentity(164, 96, 10, 1, 56410); // (savepoint) warpy = true; roomname = "Now Take My Lead"; @@ -1820,9 +1820,9 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit { obj.createblock(1, 20, 0, 32, 240, 13); //scene 2 } - obj.createentity(game, 104, 120, 1, 0, 3); // Enemy - obj.createentity(game, 168, 176, 1, 1, 3); // Enemy - obj.createentity(game, 232, 120, 1, 0, 3); // Enemy + obj.createentity(104, 120, 1, 0, 3); // Enemy + obj.createentity(168, 176, 1, 1, 3); // Enemy + obj.createentity(232, 120, 1, 0, 3); // Enemy warpy = true; roomname = "Don't Get Ahead of Yourself!"; @@ -1860,7 +1860,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,100,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98"); tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); - obj.createentity(game, 144, 40, 10, 1, 56440); // (savepoint) + obj.createentity(144, 40, 10, 1, 56440); // (savepoint) if(!game.nodeathmode) { @@ -1904,8 +1904,8 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98"); tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); - obj.createentity(game, 104, 152, 1, 0, 3); // Enemy - obj.createentity(game, 200, 152, 1, 0, 3); // Enemy + obj.createentity(104, 152, 1, 0, 3); // Enemy + obj.createentity(200, 152, 1, 0, 3); // Enemy roomname = "Must I Do Everything For You?"; warpy = true; @@ -1944,7 +1944,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98"); tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); - obj.createentity(game, 56, 192, 10, 1, 56460); // (savepoint) + obj.createentity(56, 192, 10, 1, 56460); // (savepoint) if(!game.nodeathmode) { @@ -1987,7 +1987,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,6,6,6,6,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219"); tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,100,98,220,178,179,179,180,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, 144, 64, 2, 0, 2, 144, 64, 176, 216); // Platform, bounded + obj.createentity(144, 64, 2, 0, 2, 144, 64, 176, 216); // Platform, bounded roomname = "...But Not Too Close"; warpy = true; @@ -2061,7 +2061,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, 152, 176, 10, 1, 56490); // (savepoint) + obj.createentity(152, 176, 10, 1, 56490); // (savepoint) if(!game.nodeathmode) { obj.createblock(1, 200, 0, 32, 240, 44); //scene 3 @@ -2102,9 +2102,9 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,219,218,98,220,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,218,98,98,220,218,98"); tmap.push_back("219,219,219,219,219,219,218,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,98,220,218,98"); - obj.createentity(game, 88, 200, 2, 1, 4, 88, 128, 216, 208); // Platform, bounded - obj.createentity(game, 136, 136, 2, 0, 4, 88, 128, 216, 208); // Platform, bounded - obj.createentity(game, 184, 200, 2, 1, 4, 88, 128, 216, 208); // Platform, bounded + obj.createentity(88, 200, 2, 1, 4, 88, 128, 216, 208); // Platform, bounded + obj.createentity(136, 136, 2, 0, 4, 88, 128, 216, 208); // Platform, bounded + obj.createentity(184, 200, 2, 1, 4, 88, 128, 216, 208); // Platform, bounded roomname = "...Not as I Do"; warpy = true; @@ -2142,7 +2142,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, 192, 136, 10, 1, 56510); // (savepoint) + obj.createentity(192, 136, 10, 1, 56510); // (savepoint) if(!game.nodeathmode) { obj.createblock(1, 80, 0, 32, 240, 45); //scene 3 @@ -2183,13 +2183,13 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,218,98,220,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,218,98,220,219"); tmap.push_back("219,218,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,220,219"); - obj.createentity(game, 48, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 80, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 112, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 144, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 176, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 208, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded - obj.createentity(game, 240, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(48, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(80, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(112, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(144, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(176, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(208, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded + obj.createentity(240, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded roomname = "Do Try To Keep Up"; warpy = true; @@ -2227,7 +2227,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("219,219,219,219,219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); tmap.push_back("219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, 72, 72, 10, 1, 56530); // (savepoint) + obj.createentity(72, 72, 10, 1, 56530); // (savepoint) roomname = "You're Falling Behind"; warpy = true; @@ -2265,7 +2265,7 @@ std::vector finalclass::loadlevel(int rx, int ry, Game& game, entit tmap.push_back("259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259"); tmap.push_back("219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219"); - obj.createentity(game, (18 * 8) + 4, (10 * 8) + 4, 14); //Teleporter! + obj.createentity((18 * 8) + 4, (10 * 8) + 4, 14); //Teleporter! if(!game.nodeathmode) { diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp index defa7a21..31c6fc54 100644 --- a/desktop_version/src/Labclass.cpp +++ b/desktop_version/src/Labclass.cpp @@ -61,7 +61,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("283,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283"); - obj.createentity(game, 232, 24, 10, 0, 250500); // (savepoint) + obj.createentity(232, 24, 10, 0, 250500); // (savepoint) if(game.intimetrial) { @@ -104,7 +104,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("280,280,280,280,280,280,280,280,280,280,280,280,280,321,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280"); tmap.push_back("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"); - obj.createentity(game, 112, 180, 11, 192); // (horizontal gravity line) + obj.createentity(112, 180, 11, 192); // (horizontal gravity line) rcol = 0; roomname = "It's Perfectly Safe"; @@ -142,8 +142,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292"); - obj.createentity(game, 96, 124, 11, 120); // (horizontal gravity line) - obj.createentity(game, 248, 48, 10, 0, 251490); // (savepoint) + obj.createentity(96, 124, 11, 120); // (horizontal gravity line) + obj.createentity(248, 48, 10, 0, 251490); // (savepoint) rcol = 4; roomname = "Rascasse"; @@ -181,11 +181,11 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("286,286,286,286,286,286,286,327,367,367,367,367,367,367,367,367,328,286,286,327,367,367,367,367,367,367,367,367,328,286,286,286,286,286,286,286,286,286,286,286"); tmap.push_back("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"); - obj.createentity(game, 248, 136, 10, 1, 252490); // (savepoint) - obj.createentity(game, 16, 68, 11, 64); // (horizontal gravity line) - obj.createentity(game, 112, 68, 11, 64); // (horizontal gravity line) - obj.createentity(game, 64, 164, 11, 64); // (horizontal gravity line) - obj.createentity(game, 160, 164, 11, 64); // (horizontal gravity line) + obj.createentity(248, 136, 10, 1, 252490); // (savepoint) + obj.createentity(16, 68, 11, 64); // (horizontal gravity line) + obj.createentity(112, 68, 11, 64); // (horizontal gravity line) + obj.createentity(64, 164, 11, 64); // (horizontal gravity line) + obj.createentity(160, 164, 11, 64); // (horizontal gravity line) rcol = 2; roomname = "Keep Going"; @@ -223,10 +223,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,330,370,370,370,370,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); tmap.push_back("289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); - obj.createentity(game, 280, 136, 10, 1, 252480); // (savepoint) - obj.createentity(game, 48, 52, 11, 104); // (horizontal gravity line) - obj.createentity(game, 192, 52, 11, 104); // (horizontal gravity line) - obj.createentity(game, 152, 196, 11, 40); // (horizontal gravity line) + obj.createentity(280, 136, 10, 1, 252480); // (savepoint) + obj.createentity(48, 52, 11, 104); // (horizontal gravity line) + obj.createentity(192, 52, 11, 104); // (horizontal gravity line) + obj.createentity(152, 196, 11, 40); // (horizontal gravity line) rcol=3; roomname = "Single-slit Experiment"; @@ -265,9 +265,9 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); - obj.createentity(game, 32, 128, 10, 1, 253480); // (savepoint) - obj.createentity(game, 187, 88, 12, 56); // (vertical gravity line) - obj.createentity(game, 107, 88, 12, 56); // (vertical gravity line) + obj.createentity(32, 128, 10, 1, 253480); // (savepoint) + obj.createentity(187, 88, 12, 56); // (vertical gravity line) + obj.createentity(107, 88, 12, 56); // (vertical gravity line) rcol = 5; roomname = "Don't Flip Out"; @@ -305,12 +305,12 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 43, 88, 12, 56); // (vertical gravity line) - obj.createentity(game, 123, 88, 12, 56); // (vertical gravity line) - obj.createentity(game, 203, 88, 12, 56); // (vertical gravity line) - obj.createentity(game, 283, 88, 12, 56); // (vertical gravity line) + obj.createentity(43, 88, 12, 56); // (vertical gravity line) + obj.createentity(123, 88, 12, 56); // (vertical gravity line) + obj.createentity(203, 88, 12, 56); // (vertical gravity line) + obj.createentity(283, 88, 12, 56); // (vertical gravity line) - obj.createentity(game, 156, 128, 20, 1); // (terminal) + obj.createentity(156, 128, 20, 1); // (terminal) obj.createblock(5, 156-8, 128, 20, 16, 19); rcol = 1; @@ -349,8 +349,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,69,69,69,69,69,69,69,69"); tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,370,370,370,370,370,370,370"); - obj.createentity(game, 96, 192, 10, 1, 253500); // (savepoint) - obj.createentity(game, 163, 32, 12, 168); // (vertical gravity line) + obj.createentity(96, 192, 10, 1, 253500); // (savepoint) + obj.createentity(163, 32, 12, 168); // (vertical gravity line) rcol = 3; roomname = "Double-slit Experiment"; @@ -388,10 +388,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286"); tmap.push_back("367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,328,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286"); - obj.createentity(game, 264, 104, 10, 1, 253510); // (savepoint) - obj.createentity(game, 131, 120, 12, 96); // (vertical gravity line) - obj.createentity(game, 187, 16, 12, 96); // (vertical gravity line) - obj.createentity(game, 40, 112, 10, 0, 253511); // (savepoint) + obj.createentity(264, 104, 10, 1, 253510); // (savepoint) + obj.createentity(131, 120, 12, 96); // (vertical gravity line) + obj.createentity(187, 16, 12, 96); // (vertical gravity line) + obj.createentity(40, 112, 10, 0, 253511); // (savepoint) rcol = 2; roomname = "They Call Him Flipper"; break; @@ -428,8 +428,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,333,373,373,373,373,373,334,292,292,292,333,373,373,373,373,373,334,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 24, 184, 10, 1, 253520); // (savepoint) - obj.createentity(game, 64, 164, 11, 200); // (horizontal gravity line) + obj.createentity(24, 184, 10, 1, 253520); // (savepoint) + obj.createentity(64, 164, 11, 200); // (horizontal gravity line) rcol = 4; roomname = "Three's a Crowd"; break; @@ -466,10 +466,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("286,286,286,286,286,286,286,408,0,0,0,0,0,0,366,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,328,286,286,286,286,286"); tmap.push_back("286,286,286,286,286,286,286,408,0,0,0,0,0,0,406,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"); - obj.createentity(game, 195, 24, 12, 80); // (vertical gravity line) - obj.createentity(game, 195, 128, 12, 80); // (vertical gravity line) - obj.createentity(game, 80, 120, 10, 0, 252520); // (savepoint) - obj.createentity(game, 80, 96, 10, 1, 252521); // (savepoint) + obj.createentity(195, 24, 12, 80); // (vertical gravity line) + obj.createentity(195, 128, 12, 80); // (vertical gravity line) + obj.createentity(80, 120, 10, 0, 252520); // (savepoint) + obj.createentity(80, 96, 10, 1, 252521); // (savepoint) rcol = 2; roomname = "Hitting the Apex"; break; @@ -506,10 +506,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("280,321,362,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,360,322,280,280,280,280,280,280,280"); tmap.push_back("280,280,321,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280,280,280,280,280,280,280,280"); - obj.createentity(game, 24, 188, 11, 224); // (horizontal gravity line) - obj.createentity(game, 280, 96, 10, 1, 252510); // (savepoint) + obj.createentity(24, 188, 11, 224); // (horizontal gravity line) + obj.createentity(280, 96, 10, 1, 252510); // (savepoint) - obj.createentity(game, 204, 32, 20, 0); // (terminal) + obj.createentity(204, 32, 20, 0); // (terminal) obj.createblock(5, 204-8, 32, 20, 16, 20); rcol=0; @@ -549,8 +549,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,333,373,373,373,373,373,373,373,373,373,373,373,373,373,373,334,292,292,292"); tmap.push_back("292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 24, 44, 11, 112); // (horizontal gravity line) - obj.createentity(game, 176, 180, 11, 112); // (horizontal gravity line) + obj.createentity(24, 44, 11, 112); // (horizontal gravity line) + obj.createentity(176, 180, 11, 112); // (horizontal gravity line) rcol = 4; roomname = "Thorny Exchange"; break; @@ -587,10 +587,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("283,283,324,365,65,65,65,65,65,65,65,65,65,65,65,65,65,65,363,325,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283"); tmap.push_back("283,283,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283"); - obj.createentity(game, 32, 28, 11, 296); // (horizontal gravity line) - obj.createentity(game, 32, 196, 11, 112); // (horizontal gravity line) - obj.createentity(game, 128, 100, 11, 160); // (horizontal gravity line) - obj.createentity(game, 88, 112, 10, 0, 250510); // (savepoint) + obj.createentity(32, 28, 11, 296); // (horizontal gravity line) + obj.createentity(32, 196, 11, 112); // (horizontal gravity line) + obj.createentity(128, 100, 11, 160); // (horizontal gravity line) + obj.createentity(88, 112, 10, 0, 250510); // (savepoint) roomname = "Brought to you by the letter G"; rcol = 1; break; @@ -627,8 +627,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 28, 11, 336); // (horizontal gravity line) - obj.createentity(game, 32, 72, 10, 1, 250520); // (savepoint) + obj.createentity(-8, 28, 11, 336); // (horizontal gravity line) + obj.createentity(32, 72, 10, 1, 250520); // (savepoint) rcol=2; roomname = "Free Your Mind"; @@ -666,7 +666,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 80, 180, 11, 248); // (horizontal gravity line) + obj.createentity(80, 180, 11, 248); // (horizontal gravity line) rcol=0; roomname = "I Changed My Mind, Thelma..."; break; @@ -703,8 +703,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, -8, 180, 11, 208); // (horizontal gravity line) - obj.createentity(game, 240, 180, 11, 88); // (horizontal gravity line) + obj.createentity(-8, 180, 11, 208); // (horizontal gravity line) + obj.createentity(240, 180, 11, 88); // (horizontal gravity line) rcol=4; roomname = "Indirect Jump Vector"; @@ -742,7 +742,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 28, 11, 336); // (horizontal gravity line) + obj.createentity(-8, 28, 11, 336); // (horizontal gravity line) rcol=5; roomname = "In a Single Bound"; @@ -780,9 +780,9 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 28, 11, 80); // (horizontal gravity line) - obj.createentity(game, 112, 28, 11, 96); // (horizontal gravity line) - obj.createentity(game, 248, 28, 11, 80); // (horizontal gravity line) + obj.createentity(-8, 28, 11, 80); // (horizontal gravity line) + obj.createentity(112, 28, 11, 96); // (horizontal gravity line) + obj.createentity(248, 28, 11, 80); // (horizontal gravity line) rcol=1; roomname = "Barani, Barani"; @@ -821,9 +821,9 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, -8, 180, 11, 80); // (horizontal gravity line) - obj.createentity(game, 112, 180, 11, 96); // (horizontal gravity line) - obj.createentity(game, 248, 180, 11, 80); // (horizontal gravity line) + obj.createentity(-8, 180, 11, 80); // (horizontal gravity line) + obj.createentity(112, 180, 11, 96); // (horizontal gravity line) + obj.createentity(248, 180, 11, 80); // (horizontal gravity line) rcol=2; roomname = "Safety Dance"; @@ -861,7 +861,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289"); - obj.createentity(game, -8, 28, 11, 40); // (horizontal gravity line) + obj.createentity(-8, 28, 11, 40); // (horizontal gravity line) rcol=3; roomname = "Heady Heights"; @@ -900,13 +900,13 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("295,295,295,295,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295"); - obj.createentity(game, 160, 176, 10, 0, 249550); // (savepoint) - obj.createentity(game, 224, 68, 11, 72); // (horizontal gravity line) + obj.createentity(160, 176, 10, 0, 249550); // (savepoint) + obj.createentity(224, 68, 11, 72); // (horizontal gravity line) - //obj.createentity(game, 224, 192, 10, 0, 249550); // (savepoint) + //obj.createentity(224, 192, 10, 0, 249550); // (savepoint) - if(!game.intimetrial) obj.createentity(game, (12 * 8)-4, (6 * 8) + 4, 14); //Teleporter! + if(!game.intimetrial) obj.createentity((12 * 8)-4, (6 * 8) + 4, 14); //Teleporter! rcol = 5; roomname = "Entanglement Generator"; @@ -945,7 +945,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("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,402,0,0,0,0,0,0,400,280,280,280"); tmap.push_back("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,402,0,0,0,0,0,0,400,280,280,280"); - obj.createentity(game, -8, 180, 11, 224); // (horizontal gravity line) + obj.createentity(-8, 180, 11, 224); // (horizontal gravity line) rcol = 0; roomname = "Exhausted?"; @@ -984,8 +984,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292"); - obj.createentity(game, 32, 64, 9, 10); // (shiny trinket) - obj.createentity(game, 120, 72, 10, 1, 252550); // (savepoint) + obj.createentity(32, 64, 9, 10); // (shiny trinket) + obj.createentity(120, 72, 10, 1, 252550); // (savepoint) rcol = 4; roomname = "The Tantalizing Trinket"; @@ -1023,10 +1023,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("283,283,283,283,283,283,283,283,324,365,65,65,65,65,65,65,65,65,0,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,324,364,364,364,364,364,364,364,365,53,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283"); - obj.createentity(game, 272, 144, 10, 1, 253550); // (savepoint) - obj.createentity(game, 152, 116, 11, 56); // (horizontal gravity line) - obj.createentity(game, 139, 16, 12, 72); // (vertical gravity line) - obj.createentity(game, 139, 144, 12, 72); // (vertical gravity line) + obj.createentity(272, 144, 10, 1, 253550); // (savepoint) + obj.createentity(152, 116, 11, 56); // (horizontal gravity line) + obj.createentity(139, 16, 12, 72); // (vertical gravity line) + obj.createentity(139, 144, 12, 72); // (vertical gravity line) rcol=1; roomname = "The Bernoulli Principle"; @@ -1064,9 +1064,9 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); - obj.createentity(game, 216, 144, 10, 1, 254550); // (savepoint) - obj.createentity(game, -8, 60, 11, 136); // (horizontal gravity line) - obj.createentity(game, -8, 172, 11, 136); // (horizontal gravity line) + obj.createentity(216, 144, 10, 1, 254550); // (savepoint) + obj.createentity(-8, 60, 11, 136); // (horizontal gravity line) + obj.createentity(-8, 172, 11, 136); // (horizontal gravity line) rcol = 5; roomname = "Standing Wave"; @@ -1104,8 +1104,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286"); - obj.createentity(game, -8, 60, 11, 336); // (horizontal gravity line) - obj.createentity(game, -8, 172, 11, 336); // (horizontal gravity line) + obj.createentity(-8, 60, 11, 336); // (horizontal gravity line) + obj.createentity(-8, 172, 11, 336); // (horizontal gravity line) rcol=2; obj.fatal_top(); @@ -1144,14 +1144,14 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 60, 11, 120); // (horizontal gravity line) - obj.createentity(game, -8, 172, 11, 40); // (horizontal gravity line) - obj.createentity(game, 264, 72, 10, 0, 254530); // (savepoint) - obj.createentity(game, 40, 144, 10, 1, 254531); // (savepoint) - obj.createentity(game, 160, 60, 11, 48); // (horizontal gravity line) - obj.createentity(game, 288, 60, 11, 40); // (horizontal gravity line) - obj.createentity(game, 112, 172, 11, 48); // (horizontal gravity line) - obj.createentity(game, 208, 172, 11, 120); // (horizontal gravity line) + obj.createentity(-8, 60, 11, 120); // (horizontal gravity line) + obj.createentity(-8, 172, 11, 40); // (horizontal gravity line) + obj.createentity(264, 72, 10, 0, 254530); // (savepoint) + obj.createentity(40, 144, 10, 1, 254531); // (savepoint) + obj.createentity(160, 60, 11, 48); // (horizontal gravity line) + obj.createentity(288, 60, 11, 40); // (horizontal gravity line) + obj.createentity(112, 172, 11, 48); // (horizontal gravity line) + obj.createentity(208, 172, 11, 120); // (horizontal gravity line) rcol=3; obj.fatal_top(); @@ -1190,11 +1190,11 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 60, 11, 336); // (horizontal gravity line) - obj.createentity(game, -8, 172, 11, 336); // (horizontal gravity line) - obj.createentity(game, 72, 64, 1, 0, 8, 72, 64, 248, 168); // Enemy, bounded - obj.createentity(game, 232, 64, 1, 0, 8, 72, 64, 248, 168); // Enemy, bounded - obj.createentity(game, 152, 152, 1, 1, 8, 72, 64, 248, 168); // Enemy, bounded + obj.createentity(-8, 60, 11, 336); // (horizontal gravity line) + obj.createentity(-8, 172, 11, 336); // (horizontal gravity line) + obj.createentity(72, 64, 1, 0, 8, 72, 64, 248, 168); // Enemy, bounded + obj.createentity(232, 64, 1, 0, 8, 72, 64, 248, 168); // Enemy, bounded + obj.createentity(152, 152, 1, 1, 8, 72, 64, 248, 168); // Enemy, bounded obj.fatal_top(); roomname = "Vibrating String Problem"; @@ -1233,11 +1233,11 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 176, 60, 11, 152); // (horizontal gravity line) - obj.createentity(game, 176, 172, 11, 152); // (horizontal gravity line) - obj.createentity(game, -8, 84, 11, 160); // (horizontal gravity line) - obj.createentity(game, -8, 148, 11, 160); // (horizontal gravity line) - obj.createentity(game, 160-4, 120, 10, 1, 254510); // (savepoint) + obj.createentity(176, 60, 11, 152); // (horizontal gravity line) + obj.createentity(176, 172, 11, 152); // (horizontal gravity line) + obj.createentity(-8, 84, 11, 160); // (horizontal gravity line) + obj.createentity(-8, 148, 11, 160); // (horizontal gravity line) + obj.createentity(160-4, 120, 10, 1, 254510); // (savepoint) rcol=1; obj.fatal_top(); @@ -1276,11 +1276,11 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, -8, 84, 11, 336); // (horizontal gravity line) - obj.createentity(game, -8, 148, 11, 336); // (horizontal gravity line) - obj.createentity(game, 88, 96, 1, 3, 3); // Enemy - obj.createentity(game, 40, 120, 1, 3, 3); // Enemy - obj.createentity(game, 136, 120, 1, 3, 3); // Enemy + obj.createentity(-8, 84, 11, 336); // (horizontal gravity line) + obj.createentity(-8, 148, 11, 336); // (horizontal gravity line) + obj.createentity(88, 96, 1, 3, 3); // Enemy + obj.createentity(40, 120, 1, 3, 3); // Enemy + obj.createentity(136, 120, 1, 3, 3); // Enemy rcol = 0; obj.fatal_top(); @@ -1320,10 +1320,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 264, 84, 11, 64); // (horizontal gravity line) - obj.createentity(game, 240+4, 96, 10, 0, 254490); // (savepoint) - obj.createentity(game, 48, 28, 11, 192); // (horizontal gravity line) - obj.createentity(game, 120, 148, 11, 208); // (horizontal gravity line) + obj.createentity(264, 84, 11, 64); // (horizontal gravity line) + obj.createentity(240+4, 96, 10, 0, 254490); // (savepoint) + obj.createentity(48, 28, 11, 192); // (horizontal gravity line) + obj.createentity(120, 148, 11, 208); // (horizontal gravity line) rcol=2; roomname = "I'm Sorry"; @@ -1362,8 +1362,8 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 48, 156, 11, 200); // (horizontal gravity line) - obj.createentity(game, 216, 56, 10, 0, 255490); // (savepoint) + obj.createentity(48, 156, 11, 200); // (horizontal gravity line) + obj.createentity(216, 56, 10, 0, 255490); // (savepoint) rcol=4; roomname = "Please Forgive Me!"; @@ -1401,10 +1401,10 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 131, 48, 12, 152); // (vertical gravity line) - obj.createentity(game, 179, 48, 12, 152); // (vertical gravity line) - obj.createentity(game, 227, 48, 12, 152); // (vertical gravity line) - obj.createentity(game, 275, 48, 12, 152); // (vertical gravity line) + obj.createentity(131, 48, 12, 152); // (vertical gravity line) + obj.createentity(179, 48, 12, 152); // (vertical gravity line) + obj.createentity(227, 48, 12, 152); // (vertical gravity line) + obj.createentity(275, 48, 12, 152); // (vertical gravity line) rcol=1; roomname = "Playing Foosball"; @@ -1442,17 +1442,17 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); - obj.createentity(game, 91, 168, 12, 32); // (vertical gravity line) - obj.createentity(game, 139, 80, 12, 120); // (vertical gravity line) - obj.createentity(game, 235, 104, 12, 96); // (vertical gravity line) - obj.createentity(game, 187, 144, 12, 56); // (vertical gravity line) - obj.createentity(game, 43, 48, 12, 152); // (vertical gravity line) - obj.createentity(game, 91, 48, 12, 112); // (vertical gravity line) - obj.createentity(game, 139, 48, 12, 24); // (vertical gravity line) - obj.createentity(game, 187, 48, 12, 88); // (vertical gravity line) - obj.createentity(game, 235, 48, 12, 48); // (vertical gravity line) - obj.createentity(game, 283, 48, 12, 152); // (vertical gravity line) - obj.createentity(game, 8, 48, 10, 0, 255510); // (savepoint) + obj.createentity(91, 168, 12, 32); // (vertical gravity line) + obj.createentity(139, 80, 12, 120); // (vertical gravity line) + obj.createentity(235, 104, 12, 96); // (vertical gravity line) + obj.createentity(187, 144, 12, 56); // (vertical gravity line) + obj.createentity(43, 48, 12, 152); // (vertical gravity line) + obj.createentity(91, 48, 12, 112); // (vertical gravity line) + obj.createentity(139, 48, 12, 24); // (vertical gravity line) + obj.createentity(187, 48, 12, 88); // (vertical gravity line) + obj.createentity(235, 48, 12, 48); // (vertical gravity line) + obj.createentity(283, 48, 12, 152); // (vertical gravity line) + obj.createentity(8, 48, 10, 0, 255510); // (savepoint) rcol=5; roomname = "A Difficult Chord"; @@ -1490,11 +1490,11 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280"); tmap.push_back("280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280"); - obj.createentity(game, 16, 184, 10, 1, 255520); // (savepoint) - obj.createentity(game, 131, 88, 12, 96); // (vertical gravity line) - obj.createentity(game, 208, 180, 11, 40); // (horizontal gravity line) - obj.createentity(game, 67, 56, 12, 80); // (vertical gravity line) - obj.createentity(game, 195, 56, 12, 80); // (vertical gravity line) + obj.createentity(16, 184, 10, 1, 255520); // (savepoint) + obj.createentity(131, 88, 12, 96); // (vertical gravity line) + obj.createentity(208, 180, 11, 40); // (horizontal gravity line) + obj.createentity(67, 56, 12, 80); // (vertical gravity line) + obj.createentity(195, 56, 12, 80); // (vertical gravity line) rcol = 0; roomname = "The Living Dead End"; @@ -1605,13 +1605,13 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("280,280,280,280,280,280,280,280,402,0,0,0,0,0,400,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"); tmap.push_back("280,280,280,280,280,280,280,280,402,0,0,0,0,0,400,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"); - obj.createentity(game, 267, 24, 12, 184); // (vertical gravity line) - obj.createentity(game, 16, 24, 9, 9); // (shiny trinket) - obj.createentity(game, 187, 24, 12, 64); // (vertical gravity line) - obj.createentity(game, 104, 124, 11, 80); // (horizontal gravity line) - obj.createentity(game, 48, 72, 10, 1, 252500); // (savepoint) - obj.createentity(game, 224, 72, 10, 1, 252501); // (savepoint) - obj.createentity(game, 99, 24, 12, 80); // (vertical gravity line) + obj.createentity(267, 24, 12, 184); // (vertical gravity line) + obj.createentity(16, 24, 9, 9); // (shiny trinket) + obj.createentity(187, 24, 12, 64); // (vertical gravity line) + obj.createentity(104, 124, 11, 80); // (horizontal gravity line) + obj.createentity(48, 72, 10, 1, 252500); // (savepoint) + obj.createentity(224, 72, 10, 1, 252501); // (savepoint) + obj.createentity(99, 24, 12, 80); // (vertical gravity line) rcol=0; roomname = "Young Man, It's Worth the Challenge"; @@ -1686,7 +1686,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("289,289,289,289,289,330,371,446,447,288,286,327,367,367,367,367,328,286,287,447,448,369,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,370"); tmap.push_back("289,289,289,289,289,289,330,370,371,406,286,286,286,286,286,286,286,286,408,369,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); - obj.createentity(game, 104, 128, 9, 11); // (shiny trinket) + obj.createentity(104, 128, 9, 11); // (shiny trinket) rcol = 6; roomname = "Purest Unobtainium"; @@ -1725,7 +1725,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity tmap.push_back("295,295,295,295,295,417,0,415,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,295,295,295,295"); tmap.push_back("295,295,295,295,295,417,0,415,295,295,336,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,337,295,295,295,295"); - obj.createentity(game, 112, 184, 10, 1, 258520); // (savepoint) + obj.createentity(112, 184, 10, 1, 258520); // (savepoint) rcol = 5; roomname = "I Smell Ozone"; @@ -1768,7 +1768,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity { if(game.companion==0 && obj.flags[9]==0 && !game.crewstats[5]) //also need to check if he's rescued in a previous game { - obj.createentity(game, 32, 177, 18, 16, 1, 17, 1); + obj.createentity(32, 177, 18, 16, 1, 17, 1); obj.createblock(1, 24*8, 0, 32, 240, 33); } } @@ -1811,7 +1811,7 @@ std::vector labclass::loadlevel(int rx, int ry , Game& game, entity rcol=3; - obj.createentity(game, (10 * 8)-4, (8 * 8) + 4, 14); //Teleporter! + obj.createentity((10 * 8)-4, (8 * 8) + 4, 14); //Teleporter! if(game.intimetrial) { diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 35771fae..f2171a80 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -365,18 +365,18 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi //Remove old platform //if (obj.entities[i].isplatform) obj.removeblockat(obj.entities[i].xp, obj.entities[i].yp); - obj.updateentities(i, help, game, music); // Behavioral logic - obj.updateentitylogic(i, game); // Basic Physics - obj.entitymapcollision(i, map); // Collisions with walls + obj.updateentities(i); // Behavioral logic + obj.updateentitylogic(i); // Basic Physics + obj.entitymapcollision(i); // Collisions with walls //Create new platform - //if (obj.entities[i].isplatform) obj.movingplatformfix(i, map); + //if (obj.entities[i].isplatform) obj.movingplatformfix(i); } - obj.entitycollisioncheck(dwgfx, game, map, music); // Check ent v ent collisions, update states + obj.entitycollisioncheck(); // Check ent v ent collisions, update states //special for tower: is the player touching any spike blocks? int player = obj.getplayer(); - if(obj.checktowerspikes(player, map) && dwgfx.fademode==0) + if(obj.checktowerspikes(player) && dwgfx.fademode==0) { game.deathseq = 30; } @@ -607,14 +607,14 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { //ok, unfortunate case where the disappearing platform hasn't fully disappeared. Accept a little //graphical uglyness to avoid breaking the room! - while (obj.entities[i].state == 2) obj.updateentities(i, help, game, music); + while (obj.entities[i].state == 2) obj.updateentities(i); obj.entities[i].state = 4; } else if (map.finalstretch && obj.entities[i].type == 2) { //TODO: }else if (map.finallevel && map.finalstretch && obj.entities[i].type == 2) { //for the final level. probably something 99% of players won't see. - while (obj.entities[i].state == 2) obj.updateentities(i, help, game, music); + while (obj.entities[i].state == 2) obj.updateentities(i); obj.entities[i].state = 4; } else if (obj.entities[i].type == 23 && game.swnmode && game.deathseq<15) @@ -750,7 +750,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music } else { - obj.generateswnwave(game, help, 0); + obj.generateswnwave(0); } } else if(game.swngame==1) //super gravitron game @@ -825,7 +825,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music } } - obj.generateswnwave(game, help, 1); + obj.generateswnwave(1); game.swncoldelay--; if(game.swncoldelay<=0) @@ -859,7 +859,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music else if (game.swngame == 4) //create top line { game.swngame = 3; - obj.createentity(game, -8, 84 - 32, 11, 8); // (horizontal gravity line) + obj.createentity(-8, 84 - 32, 11, 8); // (horizontal gravity line) music.niceplay(2); game.swndeaths = game.deathcounts; } @@ -965,19 +965,19 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { obj.removeblockat(obj.entities[i].xp, obj.entities[i].yp); - obj.updateentities(i, help, game, music); // Behavioral logic - obj.updateentitylogic(i, game); // Basic Physics - obj.entitymapcollision(i, map); // Collisions with walls + obj.updateentities(i); // Behavioral logic + obj.updateentitylogic(i); // Basic Physics + obj.entitymapcollision(i); // Collisions with walls obj.createblock(0, obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); if (game.supercrewmate) { - obj.movingplatformfix(i, map); - obj.scmmovingplatformfix(i, map); + obj.movingplatformfix(i); + obj.scmmovingplatformfix(i); } else { - obj.movingplatformfix(i, map); + obj.movingplatformfix(i); } } } @@ -994,29 +994,29 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { obj.removeblockat(obj.entities[ie].xp, obj.entities[ie].yp); - obj.updateentities(ie, help, game, music); // Behavioral logic - obj.updateentitylogic(ie, game); // Basic Physics - obj.entitymapcollision(ie, map); // Collisions with walls + obj.updateentities(ie); // Behavioral logic + obj.updateentitylogic(ie); // Basic Physics + obj.entitymapcollision(ie); // Collisions with walls - obj.hormovingplatformfix(ie, map); + obj.hormovingplatformfix(ie); } } } //is the player standing on a moving platform? int i = obj.getplayer(); - float j = obj.entitycollideplatformfloor(map, i); + float j = obj.entitycollideplatformfloor(i); if (j > -1000) { obj.entities[i].newxp = obj.entities[i].xp + j; - obj.entitymapcollision(i, map); + obj.entitymapcollision(i); } else { - j = obj.entitycollideplatformroof(map, i); + j = obj.entitycollideplatformroof(i); if (j > -1000) { obj.entities[i].newxp = obj.entities[i].xp + j; - obj.entitymapcollision(i, map); + obj.entitymapcollision(i); } } } @@ -1025,13 +1025,13 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (!obj.entities[ie].isplatform) { - obj.updateentities(ie, help, game, music); // Behavioral logic - obj.updateentitylogic(ie, game); // Basic Physics - obj.entitymapcollision(ie, map); // Collisions with walls + obj.updateentities(ie); // Behavioral logic + obj.updateentitylogic(ie); // Basic Physics + obj.entitymapcollision(ie); // Collisions with walls } } - obj.entitycollisioncheck(dwgfx, game, map, music); // Check ent v ent collisions, update states + obj.entitycollisioncheck(); // Check ent v ent collisions, update states } //now! let's clean up removed entities @@ -1360,7 +1360,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music switch(game.companion) { case 6: - obj.createentity(game, obj.entities[i].xp, 121.0f, 15.0f,1); //Y=121, the floor in that particular place! + obj.createentity(obj.entities[i].xp, 121.0f, 15.0f,1); //Y=121, the floor in that particular place! j = obj.getcompanion(6); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; @@ -1370,11 +1370,11 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (game.roomx == 110) { - obj.createentity(game, 320, 86, 16, 1); //Y=86, the ROOF in that particular place! + obj.createentity(320, 86, 16, 1); //Y=86, the ROOF in that particular place! } else { - obj.createentity(game, obj.entities[i].xp, 86.0f, 16.0f, 1); //Y=86, the ROOF in that particular place! + obj.createentity(obj.entities[i].xp, 86.0f, 16.0f, 1); //Y=86, the ROOF in that particular place! } j = obj.getcompanion(7); obj.entities[j].vx = obj.entities[i].vx; @@ -1386,14 +1386,14 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (game.roomx == 102) { - obj.createentity(game, 310, 177, 17, 1); + obj.createentity(310, 177, 17, 1); j = obj.getcompanion(8); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; } else { - obj.createentity(game, obj.entities[i].xp, 177.0f, 17.0f, 1); + obj.createentity(obj.entities[i].xp, 177.0f, 17.0f, 1); j = obj.getcompanion(8); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; @@ -1405,11 +1405,11 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (game.roomx == 110 && obj.entities[i].xp<20) { - obj.createentity(game, 100, 185, 18, 15, 0, 1); + obj.createentity(100, 185, 18, 15, 0, 1); } else { - obj.createentity(game, obj.entities[i].xp, 185.0f, 18.0f, 15, 0, 1); + obj.createentity(obj.entities[i].xp, 185.0f, 18.0f, 15, 0, 1); } j = obj.getcompanion(9); obj.entities[j].vx = obj.entities[i].vx; @@ -1422,7 +1422,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (obj.flags[59] == 0) { - obj.createentity(game, 225.0f, 169.0f, 18, dwgfx.crewcolour(game.lastsaved), 0, 10); + obj.createentity(225.0f, 169.0f, 18, dwgfx.crewcolour(game.lastsaved), 0, 10); j = obj.getcompanion(10); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; @@ -1432,7 +1432,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music { if (obj.flags[59] == 1) { - obj.createentity(game, 160.0f, 177.0f, 18, dwgfx.crewcolour(game.lastsaved), 0, 18, 1); + obj.createentity(160.0f, 177.0f, 18, dwgfx.crewcolour(game.lastsaved), 0, 18, 1); j = obj.getcompanion(10); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; @@ -1440,7 +1440,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music else { obj.flags[59] = 1; - obj.createentity(game, obj.entities[i].xp, -20.0f, 18.0f, dwgfx.crewcolour(game.lastsaved), 0, 10, 0); + obj.createentity(obj.entities[i].xp, -20.0f, 18.0f, dwgfx.crewcolour(game.lastsaved), 0, 10, 0); j = obj.getcompanion(10); obj.entities[j].vx = obj.entities[i].vx; obj.entities[j].dir = obj.entities[i].dir; @@ -1449,60 +1449,60 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music break; case 11: //Intermission 1: We're using the SuperCrewMate instead! - //obj.createentity(game, obj.entities[i].xp, obj.entities[i].yp, 24, dwgfx.crewcolour(game.lastsaved)); + //obj.createentity(obj.entities[i].xp, obj.entities[i].yp, 24, dwgfx.crewcolour(game.lastsaved)); if(game.roomx-41==game.scmprogress) { switch(game.scmprogress) { case 0: - obj.createentity(game, 76, 161, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(76, 161, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 1: - obj.createentity(game, 10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 2: - obj.createentity(game, 10, 177, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 177, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 3: if (game.scmmoveme) { - obj.createentity(game, obj.entities[obj.getplayer()].xp, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(obj.entities[obj.getplayer()].xp, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); game.scmmoveme = false; } else { - obj.createentity(game, 10, 177, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 177, 24, dwgfx.crewcolour(game.lastsaved), 2); } break; case 4: - obj.createentity(game, 10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 5: - obj.createentity(game, 10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 6: - obj.createentity(game, 10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 185, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 7: - obj.createentity(game, 10, 41, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 41, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 8: - obj.createentity(game, 10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 9: - obj.createentity(game, 10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 169, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 10: - obj.createentity(game, 10, 129, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 129, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 11: - obj.createentity(game, 10, 129, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 129, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 12: - obj.createentity(game, 10, 65, 24, dwgfx.crewcolour(game.lastsaved), 2); + obj.createentity(10, 65, 24, dwgfx.crewcolour(game.lastsaved), 2); break; case 13: - obj.createentity(game, 10, 177, 24, dwgfx.crewcolour(game.lastsaved)); + obj.createentity(10, 177, 24, dwgfx.crewcolour(game.lastsaved)); break; } } diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 56b6072f..ff41ca24 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1352,27 +1352,27 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas //All the entities for here are just loaded here; it's essentially one room after all - obj.createentity(game, 48, 5456, 10, 1, 505007); // (savepoint) - obj.createentity(game, 224, 4528, 10, 1, 505017); // (savepoint) - obj.createentity(game, 232, 4168, 10, 0, 505027); // (savepoint) - obj.createentity(game, 280, 3816, 10, 1, 505037); // (savepoint) - obj.createentity(game, 152, 3552, 10, 1, 505047); // (savepoint) - obj.createentity(game, 216, 3280, 10, 0, 505057); // (savepoint) - obj.createentity(game, 216, 4808, 10, 1, 505067); // (savepoint) - obj.createentity(game, 72, 3096, 10, 0, 505077); // (savepoint) - obj.createentity(game, 176, 2600, 10, 0, 505087); // (savepoint) - obj.createentity(game, 216, 2392, 10, 0, 505097); // (savepoint) - obj.createentity(game, 152, 1184, 10, 1, 505107); // (savepoint) - obj.createentity(game, 152, 912, 10, 1, 505117); // (savepoint) - obj.createentity(game, 152, 536, 10, 1, 505127); // (savepoint) - obj.createentity(game, 120, 5136, 10, 0, 505137); // (savepoint) - obj.createentity(game, 144, 1824, 10, 0, 505147); // (savepoint) - obj.createentity(game, 72, 2904, 10, 0, 505157); // (savepoint) - obj.createentity(game, 224, 1648, 10, 1, 505167); // (savepoint) - obj.createentity(game, 112, 5280, 10, 1, 50517); // (savepoint) + obj.createentity(48, 5456, 10, 1, 505007); // (savepoint) + obj.createentity(224, 4528, 10, 1, 505017); // (savepoint) + obj.createentity(232, 4168, 10, 0, 505027); // (savepoint) + obj.createentity(280, 3816, 10, 1, 505037); // (savepoint) + obj.createentity(152, 3552, 10, 1, 505047); // (savepoint) + obj.createentity(216, 3280, 10, 0, 505057); // (savepoint) + obj.createentity(216, 4808, 10, 1, 505067); // (savepoint) + obj.createentity(72, 3096, 10, 0, 505077); // (savepoint) + obj.createentity(176, 2600, 10, 0, 505087); // (savepoint) + obj.createentity(216, 2392, 10, 0, 505097); // (savepoint) + obj.createentity(152, 1184, 10, 1, 505107); // (savepoint) + obj.createentity(152, 912, 10, 1, 505117); // (savepoint) + obj.createentity(152, 536, 10, 1, 505127); // (savepoint) + obj.createentity(120, 5136, 10, 0, 505137); // (savepoint) + obj.createentity(144, 1824, 10, 0, 505147); // (savepoint) + obj.createentity(72, 2904, 10, 0, 505157); // (savepoint) + obj.createentity(224, 1648, 10, 1, 505167); // (savepoint) + obj.createentity(112, 5280, 10, 1, 50517); // (savepoint) - obj.createentity(game, 24, 4216, 9, 7); // (shiny trinket) - obj.createentity(game, 280, 3216, 9, 8); // (shiny trinket) + obj.createentity(24, 4216, 9, 7); // (shiny trinket) + obj.createentity(280, 3216, 9, 8); // (shiny trinket) break; case 4: //The Warpzone tmap = warplevel.loadlevel(rx, ry, game, obj); @@ -1484,19 +1484,19 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas tower.loadminitower2(); - obj.createentity(game, 56, 556, 11, 136); // (horizontal gravity line) - obj.createentity(game, 184, 592, 10, 0, 50500); // (savepoint) - obj.createentity(game, 184, 644, 11, 88); // (horizontal gravity line) - obj.createentity(game, 56, 460, 11, 136); // (horizontal gravity line) - obj.createentity(game, 216, 440, 10, 0, 50501); // (savepoint) - obj.createentity(game, 104, 508, 11, 168); // (horizontal gravity line) - obj.createentity(game, 219, 264, 12, 56); // (vertical gravity line) - obj.createentity(game, 120, 332, 11, 96); // (horizontal gravity line) - obj.createentity(game, 219, 344, 12, 56); // (vertical gravity line) - obj.createentity(game, 224, 332, 11, 48); // (horizontal gravity line) - obj.createentity(game, 56, 212, 11, 144); // (horizontal gravity line) - obj.createentity(game, 32, 20, 11, 96); // (horizontal gravity line) - obj.createentity(game, 72, 156, 11, 200); // (horizontal gravity line) + obj.createentity(56, 556, 11, 136); // (horizontal gravity line) + obj.createentity(184, 592, 10, 0, 50500); // (savepoint) + obj.createentity(184, 644, 11, 88); // (horizontal gravity line) + obj.createentity(56, 460, 11, 136); // (horizontal gravity line) + obj.createentity(216, 440, 10, 0, 50501); // (savepoint) + obj.createentity(104, 508, 11, 168); // (horizontal gravity line) + obj.createentity(219, 264, 12, 56); // (vertical gravity line) + obj.createentity(120, 332, 11, 96); // (horizontal gravity line) + obj.createentity(219, 344, 12, 56); // (vertical gravity line) + obj.createentity(224, 332, 11, 48); // (horizontal gravity line) + obj.createentity(56, 212, 11, 144); // (horizontal gravity line) + obj.createentity(32, 20, 11, 96); // (horizontal gravity line) + obj.createentity(72, 156, 11, 200); // (horizontal gravity line) int i = obj.getplayer(); obj.entities[i].yp += (71 * 8); @@ -1527,19 +1527,19 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas tower.loadminitower2(); - obj.createentity(game, 56, 556, 11, 136); // (horizontal gravity line) - obj.createentity(game, 184, 592, 10, 0, 50500); // (savepoint) - obj.createentity(game, 184, 644, 11, 88); // (horizontal gravity line) - obj.createentity(game, 56, 460, 11, 136); // (horizontal gravity line) - obj.createentity(game, 216, 440, 10, 0, 50501); // (savepoint) - obj.createentity(game, 104, 508, 11, 168); // (horizontal gravity line) - obj.createentity(game, 219, 264, 12, 56); // (vertical gravity line) - obj.createentity(game, 120, 332, 11, 96); // (horizontal gravity line) - obj.createentity(game, 219, 344, 12, 56); // (vertical gravity line) - obj.createentity(game, 224, 332, 11, 48); // (horizontal gravity line) - obj.createentity(game, 56, 212, 11, 144); // (horizontal gravity line) - obj.createentity(game, 32, 20, 11, 96); // (horizontal gravity line) - obj.createentity(game, 72, 156, 11, 200); // (horizontal gravity line) + obj.createentity(56, 556, 11, 136); // (horizontal gravity line) + obj.createentity(184, 592, 10, 0, 50500); // (savepoint) + obj.createentity(184, 644, 11, 88); // (horizontal gravity line) + obj.createentity(56, 460, 11, 136); // (horizontal gravity line) + obj.createentity(216, 440, 10, 0, 50501); // (savepoint) + obj.createentity(104, 508, 11, 168); // (horizontal gravity line) + obj.createentity(219, 264, 12, 56); // (vertical gravity line) + obj.createentity(120, 332, 11, 96); // (horizontal gravity line) + obj.createentity(219, 344, 12, 56); // (vertical gravity line) + obj.createentity(224, 332, 11, 48); // (horizontal gravity line) + obj.createentity(56, 212, 11, 144); // (horizontal gravity line) + obj.createentity(32, 20, 11, 96); // (horizontal gravity line) + obj.createentity(72, 156, 11, 200); // (horizontal gravity line) ypos = 0; bypos = 0; @@ -1663,7 +1663,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas if(warpy){ if(by1==0 && by2==240){ by1=-100; by2=340; } } obj.customenemy=ed.level[tsx+((ed.maxwidth)*tsy)].enemytype; - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 56, + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 56, edentity[edi].p1, 4, bx1, by1, bx2, by2); break; case 2: //Platforms and Threadmills @@ -1677,36 +1677,36 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas if(warpx){ if(bx1==0 && bx2==320){ bx1=-100; bx2=420; } } if(warpy){ if(by1==0 && by2==240){ by1=-100; by2=340; } } - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 2, + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 2, edentity[edi].p1, ed.level[rx-100+((ry-100)*ed.mapwidth)].platv, bx1, by1, bx2, by2); }else if(edentity[edi].p1>=5 && edentity[edi].p1<=8){ //Threadmill - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 2, + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 2, edentity[edi].p1+3, 4); } break; case 3: //Disappearing platforms - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 3); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 3); break; case 9: - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 9, ed.findtrinket(edi)); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 9, ed.findtrinket(edi)); break; case 10: //Checkpoints - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 10, + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 10, edentity[edi].p1,((rx+(ry*100))*20)+tempcheckpoints); tempcheckpoints++; break; case 11: //Gravity Lines if(edentity[edi].p1==0){ //Horizontal - obj.createentity(game, (edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8)+4, 11, edentity[edi].p3); + obj.createentity((edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8)+4, 11, edentity[edi].p3); }else{ //Vertical - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8)+3,(edentity[edi].p2*8), 12, edentity[edi].p3); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8)+3,(edentity[edi].p2*8), 12, edentity[edi].p3); } break; case 13: //Warp Tokens - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 13, edentity[edi].p1, edentity[edi].p2); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8), 13, edentity[edi].p1, edentity[edi].p2); break; case 15: //Collectable crewmate - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8)-4,(edentity[edi].y*8)- ((ry-100)*30*8)+1, 55, ed.findcrewmate(edi), edentity[edi].p1, edentity[edi].p2); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8)-4,(edentity[edi].y*8)- ((ry-100)*30*8)+1, 55, ed.findcrewmate(edi), edentity[edi].p1, edentity[edi].p2); break; case 17: //Roomtext! { @@ -1720,7 +1720,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas } case 18: //Terminals obj.customscript=edentity[edi].scriptname; - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8)+8, 20, 1); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8),(edentity[edi].y*8)- ((ry-100)*30*8)+8, 20, 1); obj.createblock(5, (edentity[edi].x*8)- ((rx-100)*40*8)-8, (edentity[edi].y*8)- ((ry-100)*30*8)+8, 20, 16, 35); break; case 19: //Script Box @@ -1732,13 +1732,13 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas case 50: //Warp Lines obj.customwarpmode=true; if(edentity[edi].p1==0){ // - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8)+4,(edentity[edi].p2*8), 51, edentity[edi].p3); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8)+4,(edentity[edi].p2*8), 51, edentity[edi].p3); }else if(edentity[edi].p1==1){ //Horizontal, right - obj.createentity(game, (edentity[edi].x*8)- ((rx-100)*40*8)+4,(edentity[edi].p2*8), 52, edentity[edi].p3); + obj.createentity((edentity[edi].x*8)- ((rx-100)*40*8)+4,(edentity[edi].p2*8), 52, edentity[edi].p3); }else if(edentity[edi].p1==2){ //Vertical, top - obj.createentity(game, (edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8)+7, 53, edentity[edi].p3); + obj.createentity((edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8)+7, 53, edentity[edi].p3); }else if(edentity[edi].p1==3){ - obj.createentity(game, (edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8), 54, edentity[edi].p3); + obj.createentity((edentity[edi].p2*8),(edentity[edi].y*8)- ((ry-100)*30*8), 54, edentity[edi].p3); } break; } @@ -1833,7 +1833,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas if (contents[i + vmult[j]] == 10) { contents[i + vmult[j]] = 0; - obj.createentity(game, i * 8, j * 8, 4); + obj.createentity(i * 8, j * 8, 4); } //Directional blocks if (contents[i + vmult[j]] >= 14 && contents[i + vmult[j]] <= 17) @@ -1877,7 +1877,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas { if (game.crewstats[3] && !game.crewstats[4]) { - obj.createentity(game, 87, 105, 18, 15, 0, 18); + obj.createentity(87, 105, 18, 15, 0, 18); obj.createblock(5, 87-32, 0, 32+32+32, 240, 3); } } @@ -1885,7 +1885,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas { if (game.crewstats[3] && !game.crewstats[5]) { - obj.createentity(game, 140, 137, 18, 15, 0, 18); + obj.createentity(140, 137, 18, 15, 0, 18); obj.createblock(5, 140-32, 0, 32+32+32, 240, 3); } } @@ -1893,7 +1893,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas { if (game.crewstats[3] && !game.crewstats[2]) { - obj.createentity(game, 235, 81, 18, 15, 0, 18); + obj.createentity(235, 81, 18, 15, 0, 18); obj.createblock(5, 235-32, 0, 32+32+32, 240, 3); } } @@ -1905,7 +1905,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas { if(game.crewrescued()>4 && game.crewrescued()!=6) { - obj.createentity(game, 175, 121, 18, 13, 0, 18); + obj.createentity(175, 121, 18, 13, 0, 18); obj.createblock(5, 175-32, 0, 32+32+32, 240, 4); } } @@ -1916,7 +1916,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas { if(game.crewrescued()<=4 && game.crewrescued()!=6) { - obj.createentity(game, 53, 161, 18, 13, 1, 18); + obj.createentity(53, 161, 18, 13, 1, 18); obj.createblock(5, 53-32, 0, 32+32+32, 240, 4); } } @@ -1929,7 +1929,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas if (game.crewstats[3]) { //If so, red will always be at his post - obj.createentity(game, 107, 121, 18, 15, 0, 18); + obj.createentity(107, 121, 18, 15, 0, 18); //What script do we use? obj.createblock(5, 107-32, 0, 32+32+32, 240, 3); } @@ -1940,7 +1940,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas //First: is he rescued? if (game.crewstats[2]) { - obj.createentity(game, 198, 105, 18, 14, 0, 18); + obj.createentity(198, 105, 18, 14, 0, 18); //What script do we use? obj.createblock(5, 198-32, 0, 32+32+32, 240, 2); } @@ -1951,7 +1951,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas //First: is he rescued? if (game.crewstats[4]) { - obj.createentity(game, 242, 177, 18, 13, 0, 18); + obj.createentity(242, 177, 18, 13, 0, 18); //What script do we use? obj.createblock(5, 242-32, 177-20, 32+32+32, 40, 4); } @@ -1962,7 +1962,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas //First: is she rescued? if (game.crewstats[1]) { - obj.createentity(game, 140, 177, 18, 20, 0, 18); + obj.createentity(140, 177, 18, 20, 0, 18); //What script do we use? obj.createblock(5, 140-32, 0, 32+32+32, 240, 1); } @@ -1974,7 +1974,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas if (game.crewstats[5]) { //A slight varation - she's upside down - obj.createentity(game, 249, 62, 18, 16, 0, 18); + obj.createentity(249, 62, 18, 16, 0, 18); j = obj.getcrewman(5); obj.entities[j].rule = 7; obj.entities[j].tile +=6; diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp index ae941cd4..be1ce9c5 100644 --- a/desktop_version/src/Otherlevel.cpp +++ b/desktop_version/src/Otherlevel.cpp @@ -61,8 +61,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,0,0,0,0,606,486,486,486,486,486,486"); tmap.push_back("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,0,0,0,0,606,486,486,486,486,486,486"); - obj.createentity(game, 72, 32, 14); //Teleporter! - obj.createentity(game, 216, 144, 20, 1); + obj.createentity(72, 32, 14); //Teleporter! + obj.createentity(216, 144, 20, 1); obj.createblock(5, 216-4, 144, 20, 16, 8); break; @@ -372,7 +372,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 152, 144, 10, 1, 9000); // (savepoint) + obj.createentity(152, 144, 10, 1, 9000); // (savepoint) break; case rn(0,10): @@ -408,7 +408,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); - obj.createentity(game, 224, 96, 10, 0, 10000); // (savepoint) + obj.createentity(224, 96, 10, 0, 10000); // (savepoint) break; case rn(0,11): @@ -444,7 +444,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 56, 32, 13); //Warp Token + obj.createentity(56, 32, 13); //Warp Token break; @@ -617,7 +617,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 120, 40, 14); //Teleporter! + obj.createentity(120, 40, 14); //Teleporter! break; case rn(0,17): @@ -755,7 +755,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,483,483"); tmap.push_back("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,483,483"); - obj.createentity(game, 144, 136, 10, 1, 4010); // (savepoint) + obj.createentity(144, 136, 10, 1, 4010); // (savepoint) break; case rn(1,5): @@ -791,7 +791,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 88, 104, 10, 1, 106010); // (savepoint) + obj.createentity(88, 104, 10, 1, 106010); // (savepoint) break; case rn(1,6): @@ -895,7 +895,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,236,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116"); tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,236,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116"); - obj.createentity(game, 152, 64, 10, 0, 9010); // (savepoint) + obj.createentity(152, 64, 10, 0, 9010); // (savepoint) break; case rn(1,10): @@ -931,7 +931,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 208, 120, 9, 15); // (shiny trinket) + obj.createentity(208, 120, 9, 15); // (shiny trinket) break; case rn(1,11): @@ -967,13 +967,13 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 40, 192, 13); //Warp Token - obj.createentity(game, 168, 136, 13); //Warp Token - obj.createentity(game, 224, 136, 13); //Warp Token + obj.createentity(40, 192, 13); //Warp Token + obj.createentity(168, 136, 13); //Warp Token + obj.createentity(224, 136, 13); //Warp Token - obj.createentity(game, 96, 80, 13); //Warp Token + obj.createentity(96, 80, 13); //Warp Token break; @@ -1044,7 +1044,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 112, 152, 10, 1, 13010); // (savepoint) + obj.createentity(112, 152, 10, 1, 13010); // (savepoint) break; case rn(1,14): @@ -1148,7 +1148,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,415,295,295,295,295,295"); tmap.push_back("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,415,295,295,295,295,295"); - obj.createentity(game, 280, 120, 10, 1, 16010); // (savepoint) + obj.createentity(280, 120, 10, 1, 16010); // (savepoint) break; case rn(2,2): @@ -1184,7 +1184,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,605,49,0,0,0,0,0,0,50,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); tmap.push_back("483,483,483,483,483,483,483,483,483,605,49,0,0,0,0,0,0,50,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); - obj.createentity(game, 56, 32, 10, 1, 2020); // (savepoint) + obj.createentity(56, 32, 10, 1, 2020); // (savepoint) break; case rn(2,3): @@ -1288,7 +1288,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 40, 88, 10, 1, 6020); // (savepoint) + obj.createentity(40, 88, 10, 1, 6020); // (savepoint) break; case rn(2,8): @@ -1394,26 +1394,26 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 40, 32, 22, 0); // (shiny trinket) - obj.createentity(game, 64, 32, 22, 1); // (shiny trinket) - obj.createentity(game, 88, 32, 22, 2); // (shiny trinket) - obj.createentity(game, 40, 80, 22, 3); // (shiny trinket) - obj.createentity(game, 64, 80, 22, 4); // (shiny trinket) - obj.createentity(game, 88, 80, 22, 5); // (shiny trinket) - obj.createentity(game, 112, 80, 22, 6); // (shiny trinket) - obj.createentity(game, 40, 128, 22, 7); // (shiny trinket) - obj.createentity(game, 64, 128, 22, 8); // (shiny trinket) - obj.createentity(game, 88, 128, 22, 9); // (shiny trinket) - obj.createentity(game, 112, 128, 22, 10); // (shiny trinket) - obj.createentity(game, 136, 128, 22, 11); // (shiny trinket) - obj.createentity(game, 40, 176, 22, 12); // (shiny trinket) - obj.createentity(game, 64, 176, 22, 13); // (shiny trinket) - obj.createentity(game, 88, 176, 22, 14); // (shiny trinket) - obj.createentity(game, 112, 176, 22, 15); // (shiny trinket) - obj.createentity(game, 136, 176, 22, 16); // (shiny trinket) - obj.createentity(game, 112, 32, 22, 17); // (shiny trinket) - obj.createentity(game, 136, 80, 22, 18); // (shiny trinket) - obj.createentity(game, 136, 32, 22, 19); // (shiny trinket) + obj.createentity(40, 32, 22, 0); // (shiny trinket) + obj.createentity(64, 32, 22, 1); // (shiny trinket) + obj.createentity(88, 32, 22, 2); // (shiny trinket) + obj.createentity(40, 80, 22, 3); // (shiny trinket) + obj.createentity(64, 80, 22, 4); // (shiny trinket) + obj.createentity(88, 80, 22, 5); // (shiny trinket) + obj.createentity(112, 80, 22, 6); // (shiny trinket) + obj.createentity(40, 128, 22, 7); // (shiny trinket) + obj.createentity(64, 128, 22, 8); // (shiny trinket) + obj.createentity(88, 128, 22, 9); // (shiny trinket) + obj.createentity(112, 128, 22, 10); // (shiny trinket) + obj.createentity(136, 128, 22, 11); // (shiny trinket) + obj.createentity(40, 176, 22, 12); // (shiny trinket) + obj.createentity(64, 176, 22, 13); // (shiny trinket) + obj.createentity(88, 176, 22, 14); // (shiny trinket) + obj.createentity(112, 176, 22, 15); // (shiny trinket) + obj.createentity(136, 176, 22, 16); // (shiny trinket) + obj.createentity(112, 32, 22, 17); // (shiny trinket) + obj.createentity(136, 80, 22, 18); // (shiny trinket) + obj.createentity(136, 32, 22, 19); // (shiny trinket) if(!game.nocutscenes && obj.flags[70]==0) { @@ -1454,7 +1454,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 90, 52, 26, 0); // (super warp) + obj.createentity(90, 52, 26, 0); // (super warp) } break; @@ -1492,7 +1492,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104"); tmap.push_back("104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104"); - obj.createentity(game, 64, 64, 14); //Teleporter! + obj.createentity(64, 64, 14); //Teleporter! break; case rn(2,12): @@ -1630,7 +1630,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); tmap.push_back("489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); - obj.createentity(game, 240, 96, 10, 0, 15020); // (savepoint) + obj.createentity(240, 96, 10, 0, 15020); // (savepoint) break; case rn(3,2): @@ -1666,7 +1666,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,618,498,498"); tmap.push_back("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,618,498,498"); - obj.createentity(game, 152, 96, 9, 16); // (shiny trinket) + obj.createentity(152, 96, 9, 16); // (shiny trinket) break; case rn(3,3): @@ -1702,7 +1702,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,501,501,501,501,501,501,501"); tmap.push_back("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,501,501,501,501,501,501,501"); - obj.createentity(game, 24, 192, 10, 1, 3030); // (savepoint) + obj.createentity(24, 192, 10, 1, 3030); // (savepoint) break; case rn(3,5): @@ -1874,7 +1874,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101"); tmap.push_back("101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101"); - obj.createentity(game, 248, 168, 10, 1, 9030); // (savepoint) + obj.createentity(248, 168, 10, 1, 9030); // (savepoint) break; case rn(3,10): @@ -1910,65 +1910,65 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,223,741,741,741,741,741,741,221,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101"); tmap.push_back("101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,223,741,741,741,741,741,741,221,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101"); - obj.createentity(game, 88, 80, 21, 1); //Terminal // UU Brothers + obj.createentity(88, 80, 21, 1); //Terminal // UU Brothers obj.createblock(5, 88 - 4, 80, 20, 16, 25); if(game.stat_trinkets>=5) { - obj.createentity(game, 128, 80, 21, 1); //Terminal + obj.createentity(128, 80, 21, 1); //Terminal obj.createblock(5, 128 - 4, 80, 20, 16, 26); } if(game.stat_trinkets>=8) { - obj.createentity(game, 176, 80, 21, 1); //Terminal + obj.createentity(176, 80, 21, 1); //Terminal obj.createblock(5, 176 - 4, 80, 20, 16, 27); } if(game.stat_trinkets>=10) { - obj.createentity(game, 216, 80, 21, 1); //Terminal + obj.createentity(216, 80, 21, 1); //Terminal obj.createblock(5, 216 - 4, 80, 20, 16, 28); } if(game.stat_trinkets>=12) { - obj.createentity(game, 88, 128, 21, 0); //Terminal + obj.createentity(88, 128, 21, 0); //Terminal obj.createblock(5, 88 - 4, 128, 20, 16, 29); } if(game.stat_trinkets>=14) { - obj.createentity(game, 128, 128, 21, 0); //Terminal + obj.createentity(128, 128, 21, 0); //Terminal obj.createblock(5, 128 - 4, 128, 20, 16, 33); } if(game.stat_trinkets>=16) { - obj.createentity(game, 176, 128, 21, 0); //Terminal + obj.createentity(176, 128, 21, 0); //Terminal obj.createblock(5, 176 - 4, 128, 20, 16, 30); } if(game.stat_trinkets>=18) { - obj.createentity(game, 216, 128, 21, 0); //Terminal + obj.createentity(216, 128, 21, 0); //Terminal obj.createblock(5, 216 - 4, 128, 20, 16, 32); } //Special cases if(game.stat_trinkets>=20) { - obj.createentity(game, 40, 40, 21, 0); //Terminal + obj.createentity(40, 40, 21, 0); //Terminal obj.createblock(5, 40 - 4, 40, 20, 16, 31); } if(game.stat_trinkets>=20) { - obj.createentity(game, 264, 40, 21, 0); //Terminal + obj.createentity(264, 40, 21, 0); //Terminal obj.createblock(5, 264 - 4, 40, 20, 16, 34); } - obj.createentity(game, 152, 40, 21, 0); //Terminal (jukebox instructions) + obj.createentity(152, 40, 21, 0); //Terminal (jukebox instructions) obj.createblock(5, 152 - 4, 40, 20, 16, 24); break; @@ -2039,7 +2039,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,692,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,692,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 128, 160, 10, 1, 113030); // (savepoint) + obj.createentity(128, 160, 10, 1, 113030); // (savepoint) break; @@ -2076,7 +2076,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,0,0,0,0,0,0,0,0"); tmap.push_back("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,0,0,0,0,0,0,0,0"); - obj.createentity(game, 192, 96, 10, 0, 114030); // (savepoint) + obj.createentity(192, 96, 10, 0, 114030); // (savepoint) break; case rn(3,14): @@ -2282,12 +2282,12 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,110,110,110,110,110"); tmap.push_back("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,110,110,110,110,110"); - obj.createentity(game, 256, 120, 20, 1); //Terminal Ship computer + obj.createentity(256, 120, 20, 1); //Terminal Ship computer obj.createblock(5, 256 - 4, 120, 20, 16, 22); - obj.createentity(game, 256, 184, 20, 1); //Terminal - obj.createentity(game, 232, 184, 20, 1); //Terminal - obj.createentity(game, 208, 184, 20, 1); //Terminal + obj.createentity(256, 184, 20, 1); //Terminal + obj.createentity(232, 184, 20, 1); //Terminal + obj.createentity(208, 184, 20, 1); //Terminal obj.createblock(5, 208 + 4, 184, 56, 16, 23); break; @@ -2392,7 +2392,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,609,489,489,489,489,489,489,489,489,489,489,489"); tmap.push_back("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,609,489,489,489,489,489,489,489,489,489,489,489"); - obj.createentity(game, 248, 112, 10, 1, 114040); // (savepoint) + obj.createentity(248, 112, 10, 1, 114040); // (savepoint) break; case rn(4,14): @@ -2428,7 +2428,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492"); tmap.push_back("492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492"); - obj.createentity(game, 104, 176, 10, 1, 115040); // (savepoint) + obj.createentity(104, 176, 10, 1, 115040); // (savepoint) break; case rn(4,15): @@ -2464,7 +2464,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 16, 40, 10, 1, 15040); // (savepoint) + obj.createentity(16, 40, 10, 1, 15040); // (savepoint) break; case rn(5,2): @@ -2534,7 +2534,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 272, 128, 10, 0, 3050); // (savepoint) + obj.createentity(272, 128, 10, 0, 3050); // (savepoint) break; case rn(5,4): @@ -2876,7 +2876,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 184, 176, 10, 1, 13050); // (savepoint) + obj.createentity(184, 176, 10, 1, 13050); // (savepoint) break; case rn(5,14): @@ -2947,7 +2947,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("486,486,486,486,486,486,486,486,527,567,568,0,0,686,0,0,606,486,486,486,486,486,486,486,527,568,0,0,0,0,0,566,567,528,486,486,486,486,486,486"); tmap.push_back("486,486,486,486,486,486,486,486,486,486,527,567,567,567,567,567,528,486,486,486,486,486,486,486,486,527,567,567,567,567,567,528,486,486,486,486,486,486,486,486"); - obj.createentity(game, 72, 16, 9, 14); // (shiny trinket) + obj.createentity(72, 16, 9, 14); // (shiny trinket) break; case rn(5,18): @@ -2983,7 +2983,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("489,489,611,0,0,0,0,609,489,489,611,0,0,0,0,609,489,489,611,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); tmap.push_back("489,489,611,0,0,0,0,609,489,489,611,0,0,0,0,609,489,489,611,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); - obj.createentity(game, 224, 160, 13); //Warp Token + obj.createentity(224, 160, 13); //Warp Token break; @@ -3054,7 +3054,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 152, 152, 10, 0, 103060); // (savepoint) + obj.createentity(152, 152, 10, 0, 103060); // (savepoint) break; case rn(6,4): @@ -3090,7 +3090,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 128, 120, 10, 1, 4060); // (savepoint) + obj.createentity(128, 120, 10, 1, 4060); // (savepoint) break; case rn(6,5): @@ -3194,7 +3194,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); tmap.push_back("489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); - obj.createentity(game, 64, 88, 10, 1, 7060); // (savepoint) + obj.createentity(64, 88, 10, 1, 7060); // (savepoint) break; case rn(6,8): @@ -3298,7 +3298,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,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"); tmap.push_back("0,0,0,0,0,0,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"); - obj.createentity(game, 152, 128, 10, 0, 10060); // (savepoint) + obj.createentity(152, 128, 10, 0, 10060); // (savepoint) break; case rn(6,11): @@ -3473,11 +3473,11 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, if(!game.intimetrial) { - obj.createentity(game, 96, 48, 20, 1);//Terminal + obj.createentity(96, 48, 20, 1);//Terminal obj.createblock(5, 96 - 4, 48, 20, 16, 12); } - obj.createentity(game, 128, 216, 10, 1, 116061); // (savepoint) + obj.createentity(128, 216, 10, 1, 116061); // (savepoint) break; case rn(6,18): @@ -3581,7 +3581,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 192, 104, 13); //Warp Token + obj.createentity(192, 104, 13); //Warp Token break; @@ -3618,7 +3618,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 88, 136, 10, 0, 103070); // (savepoint) + obj.createentity(88, 136, 10, 0, 103070); // (savepoint) break; case rn(7,3): @@ -3688,7 +3688,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("486,486,486,486,486,486,486,486,486,486,527,567,567,567,528,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"); tmap.push_back("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"); - obj.createentity(game, 208, 128, 10, 1, 4070); // (savepoint) + obj.createentity(208, 128, 10, 1, 4070); // (savepoint) break; case rn(7,5): @@ -3860,7 +3860,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); - obj.createentity(game, 64, 112, 14); //Teleporter! + obj.createentity(64, 112, 14); //Teleporter! break; case rn(7,10): @@ -3964,7 +3964,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,524,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,525,483,483,483,483,483,483,483,483,483,483,483"); tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); - obj.createentity(game, 48, 192, 10, 1, 14070); // (savepoint) + obj.createentity(48, 192, 10, 1, 14070); // (savepoint) break; case rn(8,0): @@ -4170,7 +4170,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 80, 40, 10, 1, 5080); // (savepoint) + obj.createentity(80, 40, 10, 1, 5080); // (savepoint) break; case rn(8,6): @@ -4206,7 +4206,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("489,489,489,489,489,489,611,0,0,0,0,609,489,489,489,489,611,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); tmap.push_back("489,489,489,489,489,489,611,0,0,0,0,609,489,489,489,489,611,0,0,0,0,0,0,609,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489"); - obj.createentity(game, 96, 72, 13); //Warp Token + obj.createentity(96, 72, 13); //Warp Token break; @@ -4345,8 +4345,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,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"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,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"); - obj.createentity(game, 176, 40, 14); //Teleporter! - obj.createentity(game, 120, 128, 20, 1); // (terminal) + obj.createentity(176, 40, 14); //Teleporter! + obj.createentity(120, 128, 20, 1); // (terminal) obj.createblock(5, 120-4, 128, 20, 16, 7); break; @@ -4452,7 +4452,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("492,492,614,0,0,0,0,0,0,0,0,0,0,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"); tmap.push_back("492,492,614,0,0,0,0,0,0,0,0,0,0,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"); - obj.createentity(game, 40, 152, 10, 1, 14080); // (savepoint) + obj.createentity(40, 152, 10, 1, 14080); // (savepoint) break; case rn(8,15): @@ -4522,7 +4522,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,0,0,0,0,0,0,0,0,0,609,489,489,489,489"); tmap.push_back("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,0,0,0,0,0,0,0,0,0,609,489,489,489,489"); - obj.createentity(game, 152, 80, 10, 1, 16080); // (savepoint) + obj.createentity(152, 80, 10, 1, 16080); // (savepoint) break; case rn(8,17): @@ -4796,7 +4796,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295"); tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295"); - obj.createentity(game, 80, 40, 9, 17); // (shiny trinket) + obj.createentity(80, 40, 9, 17); // (shiny trinket) roomtileset = 0; // (Use space station tileset) break; @@ -4942,7 +4942,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("516,516,638,0,0,0,630,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510"); tmap.push_back("516,516,638,0,0,0,630,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510"); - obj.createentity(game, 184, 176, 10, 1, 12100); // (savepoint) + obj.createentity(184, 176, 10, 1, 12100); // (savepoint) roomtileset = 0; // (Use space station tileset) break; @@ -5085,7 +5085,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 216, 72, 10, 1, 16100); // (savepoint) + obj.createentity(216, 72, 10, 1, 16100); // (savepoint) break; case rn(10,17): @@ -5189,7 +5189,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 40, 112, 9, 13); // (shiny trinket) + obj.createentity(40, 112, 9, 13); // (shiny trinket) break; case rn(11,0): @@ -5362,7 +5362,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,0,0,0,0,0,0,0"); - obj.createentity(game, (8 * 8), (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy + obj.createentity((8 * 8), (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) @@ -5402,7 +5402,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310"); - obj.createentity(game, 8 * 8, -248 + (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy + obj.createentity(8 * 8, -248 + (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) @@ -5716,10 +5716,10 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,292,292,414,698,698,698,412,292,292,292"); - obj.createentity(game, -328 + (8 * 8), (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy + obj.createentity(-328 + (8 * 8), (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy obj.nearelephant = true; - obj.createentity(game, 240, 72, 10, 1, 8120); // (savepoint) + obj.createentity(240, 72, 10, 1, 8120); // (savepoint) roomtileset = 0; // (Use space station tileset) break; @@ -5757,7 +5757,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,689,689,689,215,95,95,95"); - obj.createentity(game, -328 + (8 * 8), -248 + (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy + obj.createentity(-328 + (8 * 8), -248 + (12 * 8), 1, 0, 0, -10000, -10000, 10000, 100000); // Enemy obj.nearelephant = true; roomtileset = 0; // (Use space station tileset) @@ -6003,7 +6003,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 48, 96, 14); //Teleporter! + obj.createentity(48, 96, 14); //Teleporter! break; case rn(13,14): @@ -6039,7 +6039,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 280, 32, 20, 1); //terminal + obj.createentity(280, 32, 20, 1); //terminal obj.createblock(5, 280-4, 32, 20, 16, 9); roomtileset = 0; // (Use space station tileset) @@ -6112,7 +6112,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 80, 104, 10, 1, 16130); // (savepoint) + obj.createentity(80, 104, 10, 1, 16130); // (savepoint) break; case rn(13,17): @@ -6148,7 +6148,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 240, 128, 10, 1, 17130); // (savepoint) + obj.createentity(240, 128, 10, 1, 17130); // (savepoint) break; case rn(13,18): @@ -6390,8 +6390,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 176, 72, 14); //Teleporter! - obj.createentity(game, 88, 160, 20, 1);//terminal + obj.createentity(176, 72, 14); //Teleporter! + obj.createentity(88, 160, 20, 1);//terminal obj.createblock(5, 88-4, 160, 20, 16, 11); break; @@ -6533,7 +6533,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("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,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 88, 96, 10, 0, 18150); // (savepoint) + obj.createentity(88, 96, 10, 0, 18150); // (savepoint) break; case rn(15,19): @@ -6603,7 +6603,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); tmap.push_back("483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483"); - obj.createentity(game, 72, 120, 13); //Warp Token + obj.createentity(72, 120, 13); //Warp Token break; @@ -6641,7 +6641,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); roomtileset = 0; // (Use space station tileset) - obj.createentity(game, 176, 152, 10, 1, 14160); // (savepoint) + obj.createentity(176, 152, 10, 1, 14160); // (savepoint) break; case rn(16,17): @@ -6779,8 +6779,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,680,680,680,680,680,680,615,495,495,495,495,495"); tmap.push_back("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,680,680,680,680,680,680,615,495,495,495,495,495"); - obj.createentity(game, 40, 40, 14); //Teleporter! - obj.createentity(game, 192, 120, 20, 1);//terminal + obj.createentity(40, 40, 14); //Teleporter! + obj.createentity(192, 120, 20, 1);//terminal obj.createblock(5, 192-4, 120, 20, 16, 10); roomtileset = 0; // (Use space station tileset) @@ -6961,7 +6961,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 112, 72, 14); //Teleporter! + obj.createentity(112, 72, 14); //Teleporter! break; case rn(17,18): @@ -7031,7 +7031,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 152, 152, 10, 0, 19170); // (savepoint) + obj.createentity(152, 152, 10, 0, 19170); // (savepoint) break; case rn(18,4): @@ -7102,7 +7102,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); roomtileset = 0; // (Use space station tileset) - obj.createentity(game, 104, 152, 10, 1, 15180); // (savepoint) + obj.createentity(104, 152, 10, 1, 15180); // (savepoint) break; case rn(18,17): @@ -7206,7 +7206,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("564,564,564,564,564,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("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,0,0,0,0"); - obj.createentity(game, 192, 176, 10, 1, 105190); // (savepoint) + obj.createentity(192, 176, 10, 1, 105190); // (savepoint) break; case rn(19,5): @@ -7242,7 +7242,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 40, 192, 10, 1, 106190); // (savepoint) + obj.createentity(40, 192, 10, 1, 106190); // (savepoint) break; @@ -7313,7 +7313,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 72, 168, 10, 1, 111190); // (savepoint) + obj.createentity(72, 168, 10, 1, 111190); // (savepoint) break; case rn(19,11): @@ -7451,7 +7451,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("489,489,489,489,489,489,611,0,0,0,0,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"); tmap.push_back("489,489,489,489,489,489,611,0,0,0,0,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"); - obj.createentity(game, 80, 144, 10, 1, 14190); // (savepoint) + obj.createentity(80, 144, 10, 1, 14190); // (savepoint) break; case rn(19,15): @@ -7555,7 +7555,7 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("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,495,495,495,495,495"); tmap.push_back("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,495,495,495,495,495"); - obj.createentity(game, 168, 88, 10, 1, 17190); // (savepoint) + obj.createentity(168, 88, 10, 1, 17190); // (savepoint) break; case rn(19,18): @@ -7802,23 +7802,23 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 256, 88, 21, 1); //Terminal - obj.createentity(game, 128, 88, 21, 1); //Terminal - obj.createentity(game, 104, 88, 21, 1); //Terminal - obj.createentity(game, 80, 88, 21, 1); //Terminal - obj.createentity(game, 128, 128, 21, 0); //Terminal - obj.createentity(game, 128, 192, 21, 1); //Terminal - obj.createentity(game, 104, 192, 21, 1); //Terminal - obj.createentity(game, 80, 192, 21, 1); //Terminal + obj.createentity(256, 88, 21, 1); //Terminal + obj.createentity(128, 88, 21, 1); //Terminal + obj.createentity(104, 88, 21, 1); //Terminal + obj.createentity(80, 88, 21, 1); //Terminal + obj.createentity(128, 128, 21, 0); //Terminal + obj.createentity(128, 192, 21, 1); //Terminal + obj.createentity(104, 192, 21, 1); //Terminal + obj.createentity(80, 192, 21, 1); //Terminal if(game.insecretlab) { //vitellary - obj.createentity(game, 231, 81, 18, 14, 0, 18); + obj.createentity(231, 81, 18, 14, 0, 18); obj.createblock(5, 231- 32, 0, 32 + 32 + 32, 240, 2); //violet - obj.createentity(game,83, 126, 18, 20, 0, 18); + obj.createentity(83, 126, 18, 20, 0, 18); obj.entities[obj.getcrewman(1)].rule = 7; obj.entities[obj.getcrewman(1)].tile +=6; obj.createblock(5, 83 - 32, 0, 32 + 32 + 32, 240, 1); @@ -7858,27 +7858,27 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); tmap.push_back("295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295"); - obj.createentity(game, 96, 48, 25, 0, 1); //Terminal - obj.createentity(game, 128, 48, 25, 0, 2); //Terminal - obj.createentity(game, 160, 48, 25, 0, 3); //Terminal - obj.createentity(game, 192, 48, 25, 0, 4); //Terminal - obj.createentity(game, 224, 48, 25, 0, 5); //Terminal - obj.createentity(game, 256, 48, 25, 0, 6); //Terminal + obj.createentity(96, 48, 25, 0, 1); //Terminal + obj.createentity(128, 48, 25, 0, 2); //Terminal + obj.createentity(160, 48, 25, 0, 3); //Terminal + obj.createentity(192, 48, 25, 0, 4); //Terminal + obj.createentity(224, 48, 25, 0, 5); //Terminal + obj.createentity(256, 48, 25, 0, 6); //Terminal - obj.createentity(game, 96, 88, 25, 1, 13); //Terminal - obj.createentity(game, 128, 88, 25, 1, 14); //Terminal - obj.createentity(game, 160, 88, 25, 1, 15); //Terminal - obj.createentity(game, 192, 88, 25, 1, 16); //Terminal - obj.createentity(game, 224, 88, 25, 1, 17); //Terminal - obj.createentity(game, 256, 88, 25, 1, 18); //Terminal + obj.createentity(96, 88, 25, 1, 13); //Terminal + obj.createentity(128, 88, 25, 1, 14); //Terminal + obj.createentity(160, 88, 25, 1, 15); //Terminal + obj.createentity(192, 88, 25, 1, 16); //Terminal + obj.createentity(224, 88, 25, 1, 17); //Terminal + obj.createentity(256, 88, 25, 1, 18); //Terminal - obj.createentity(game, 96, 128-3, 25, 0, 7); //Terminal - obj.createentity(game, 96, 168, 25, 1, 8); //Terminal + obj.createentity(96, 128-3, 25, 0, 7); //Terminal + obj.createentity(96, 168, 25, 1, 8); //Terminal - obj.createentity(game, 160, 128, 25, 0, 12); //Terminal - obj.createentity(game, 192, 128, 25, 0, 11); //Terminal - obj.createentity(game, 224, 128, 25, 0, 10); //Terminal - obj.createentity(game, 256, 128, 25, 0, 9); //Terminal + obj.createentity(160, 128, 25, 0, 12); //Terminal + obj.createentity(192, 128, 25, 0, 11); //Terminal + obj.createentity(224, 128, 25, 0, 10); //Terminal + obj.createentity(256, 128, 25, 0, 9); //Terminal break; case rn(16,5): @@ -7914,8 +7914,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 152, 168, 25, 0, 20); //Terminal - obj.createentity(game, 152, 168, 25, 0, 19); //Terminal + obj.createentity(152, 168, 25, 0, 20); //Terminal + obj.createentity(152, 168, 25, 0, 19); //Terminal break; case rn(19,6): @@ -7951,21 +7951,21 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,0,0,409,289,289,289"); tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,0,0,409,289,289,289"); - obj.createentity(game, 216, 176, 21, 1); //Terminal - obj.createentity(game, 192, 176, 21, 1); //Terminal - obj.createentity(game, 168, 176, 21, 1); //Terminal - obj.createentity(game, 144, 176, 21, 1); //Terminal - obj.createentity(game, 88, 96, 21, 1); //Terminal - obj.createentity(game, 112, 96, 21, 1); //Terminal - obj.createentity(game, 136, 96, 21, 1); //Terminal - obj.createentity(game, 160, 96, 21, 1); //Terminal + obj.createentity(216, 176, 21, 1); //Terminal + obj.createentity(192, 176, 21, 1); //Terminal + obj.createentity(168, 176, 21, 1); //Terminal + obj.createentity(144, 176, 21, 1); //Terminal + obj.createentity(88, 96, 21, 1); //Terminal + obj.createentity(112, 96, 21, 1); //Terminal + obj.createentity(136, 96, 21, 1); //Terminal + obj.createentity(160, 96, 21, 1); //Terminal //vertigris: - obj.createentity(game, 100, 169, 18, 13, 0, 18); + obj.createentity(100, 169, 18, 13, 0, 18); obj.createblock(5, 100 - 16, 0, 32 + 32, 240, 4); //victoria: - obj.createentity(game, 193, 89, 18, 16, 0, 18); + obj.createentity(193, 89, 18, 16, 0, 18); obj.createblock(5, 193-16, 0, 32+32, 240, 5); break; @@ -8003,12 +8003,12 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 72, 192, 13); // (shiny trinket) - obj.createentity(game, 112, 144, 20, 1); // (terminal) + obj.createentity(72, 192, 13); // (shiny trinket) + obj.createentity(112, 144, 20, 1); // (terminal) obj.createblock(5, 112 - 4, 144, 20, 16, 21); //vermilion - obj.createentity(game, 186, 137, 18, 15, 0, 18); + obj.createentity(186, 137, 18, 15, 0, 18); obj.createblock(5, 186 - 32, 0, 32 + 32 + 32, 240, 3); //naughty corner! @@ -8051,8 +8051,8 @@ std::vector otherlevelclass::loadlevel(int rx, int ry , Game& game, tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, -8, 84-32, 11, 328+8); // (horizontal gravity line) - obj.createentity(game, -8, 148 + 32, 11, 328+8); // (horizontal gravity line) + 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 break; diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 6dbfbce2..9a35eb2e 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -717,7 +717,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, } else if (words[0] == "createentity") { - obj.createentity(game, ss_toi(words[1]), ss_toi(words[2]), ss_toi(words[3]), ss_toi(words[4]), ss_toi(words[5])); + obj.createentity(ss_toi(words[1]), ss_toi(words[2]), ss_toi(words[3]), ss_toi(words[4]), ss_toi(words[5])); } else if (words[0] == "createcrewman") { @@ -786,11 +786,11 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, if (ss_toi(words[5]) >= 16) { - obj.createentity(game, ss_toi(words[1]), ss_toi(words[2]), 18, r, ss_toi(words[4]), ss_toi(words[5]), ss_toi(words[6])); + obj.createentity(ss_toi(words[1]), ss_toi(words[2]), 18, r, ss_toi(words[4]), ss_toi(words[5]), ss_toi(words[6])); } else { - obj.createentity(game, ss_toi(words[1]), ss_toi(words[2]), 18, r, ss_toi(words[4]), ss_toi(words[5])); + obj.createentity(ss_toi(words[1]), ss_toi(words[2]), 18, r, ss_toi(words[4]), ss_toi(words[5])); } } else if (words[0] == "changemood") @@ -1810,22 +1810,22 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, i = 215; if (game.crewstats[2] && game.lastsaved!=2) { - obj.createentity(game, i, 153, 18, 14, 0, 17, 0); + obj.createentity(i, 153, 18, 14, 0, 17, 0); i += 25; } if (game.crewstats[3] && game.lastsaved!=3) { - obj.createentity(game, i, 153, 18, 15, 0, 17, 0); + obj.createentity(i, 153, 18, 15, 0, 17, 0); i += 25; } if (game.crewstats[4] && game.lastsaved!=4) { - obj.createentity(game, i, 153, 18, 13, 0, 17, 0); + obj.createentity(i, 153, 18, 13, 0, 17, 0); i += 25; } if (game.crewstats[5] && game.lastsaved!=5) { - obj.createentity(game, i, 153, 18, 16, 0, 17, 0); + obj.createentity(i, 153, 18, 16, 0, 17, 0); i += 25; } } @@ -2012,7 +2012,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map, r = 19; } - obj.createentity(game, 200, 153, 18, r, 0, 19, 30); + obj.createentity(200, 153, 18, r, 0, 19, 30); i = obj.getcrewman(game.lastsaved); obj.entities[i].dir = 1; } @@ -2558,7 +2558,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2581,7 +2581,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2603,7 +2603,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2642,7 +2642,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2670,7 +2670,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2698,7 +2698,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2726,7 +2726,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2754,7 +2754,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2788,7 +2788,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2813,7 +2813,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2842,7 +2842,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2878,7 +2878,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2913,7 +2913,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2948,7 +2948,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -2983,7 +2983,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3018,7 +3018,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3050,7 +3050,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3082,7 +3082,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3114,7 +3114,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3146,7 +3146,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true; if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3169,7 +3169,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3206,7 +3206,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3245,7 +3245,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { @@ -3291,7 +3291,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam if(obj.nentity==0) { - obj.createentity(game, game.savex, game.savey, 0, 0); //In this game, constant, never destroyed + obj.createentity(game.savex, game.savey, 0, 0); //In this game, constant, never destroyed } else { diff --git a/desktop_version/src/Spacestation2.cpp b/desktop_version/src/Spacestation2.cpp index f4f91c9c..478863c5 100644 --- a/desktop_version/src/Spacestation2.cpp +++ b/desktop_version/src/Spacestation2.cpp @@ -51,10 +51,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,277,277,277,277,277,278,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 96, 40, 10, 0, 450500); // (savepoint) + obj.createentity(96, 40, 10, 0, 450500); // (savepoint) if(game.intimetrial) { - obj.createentity(game, 136, 92, 11, 48); // (horizontal gravity line) + obj.createentity(136, 92, 11, 48); // (horizontal gravity line) } roomname = "Outer Hull"; //If not yet in level, use "The Space Station"; @@ -128,14 +128,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("107,107,107,107,107,107,229,689,689,689,689,227,107,107,107,107,107,107,107,148,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,149,107,107,107"); tmap.push_back("107,107,107,107,107,107,229,689,689,689,689,227,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"); - obj.createentity(game, 128, 176, 10, 1, 449490); // (savepoint) - obj.createentity(game, 160, 192, 3); //Disappearing Platform - obj.createentity(game, 192, 192, 3); //Disappearing Platform - obj.createentity(game, 224, 192, 3); //Disappearing Platform - obj.createentity(game, 256, 192, 3); //Disappearing Platform - obj.createentity(game, 216-4, 168, 1, 0, 4, 160, 88, 256, 192); // Enemy, bounded - obj.createentity(game, 184-24, 96, 1, 1, 4, 160, 88, 256, 192); // Enemy, bounded - obj.createentity(game, 256, 8, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 176, 10, 1, 449490); // (savepoint) + obj.createentity(160, 192, 3); //Disappearing Platform + obj.createentity(192, 192, 3); //Disappearing Platform + obj.createentity(224, 192, 3); //Disappearing Platform + obj.createentity(256, 192, 3); //Disappearing Platform + obj.createentity(216-4, 168, 1, 0, 4, 160, 88, 256, 192); // Enemy, bounded + 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"; break; @@ -172,7 +172,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); tmap.push_back("289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); - obj.createentity(game, 192, 96, 9, 2); // (shiny trinket) + obj.createentity(192, 96, 9, 2); // (shiny trinket) roomname = "One Way Room"; break; @@ -209,23 +209,23 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,92,92"); tmap.push_back("92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,172,173,173,173,173,173,173,173,173,173,173,174,0,0,0,0,212,92,92,92"); - obj.createentity(game, 56, 24, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 120, 24, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 184, 24, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 88, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 216, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 280, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 32, 10, 0, 447490); // (savepoint) - obj.createentity(game, 288, 160, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 280, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 160, 216, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 224, 216, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 248, 24, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 120, 168, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 184, 168, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 216, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 152, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 224, 120, 10, 0, 447491); // (savepoint) + obj.createentity(56, 24, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(120, 24, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(184, 24, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(88, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(216, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(280, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 32, 10, 0, 447490); // (savepoint) + obj.createentity(288, 160, 2, 8, 4); //Threadmill, >>> + obj.createentity(280, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(160, 216, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(224, 216, 2, 8, 4); //Threadmill, >>> + obj.createentity(248, 24, 2, 8, 4); //Threadmill, >>> + obj.createentity(120, 168, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(184, 168, 2, 8, 4); //Threadmill, >>> + obj.createentity(216, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(152, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(224, 120, 10, 0, 447491); // (savepoint) roomname = "Conveying a New Idea"; break; @@ -263,23 +263,23 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98"); tmap.push_back("98,98,98,220,0,0,0,0,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,140,98,98,220,0,0,0,0,218,98,98,98"); - obj.createentity(game, 0, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 96, 24, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 160, 24, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 168, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 168, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 160, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 160, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 0, 160, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 0, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 216, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 216, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 216, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 0, 168, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 72, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 112, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(96, 24, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(160, 24, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 168, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 168, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 160, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 160, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 160, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 216, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 216, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 216, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 168, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 72, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 112, 2, 8, 4); //Threadmill, >>> roomname = "Upstream Downstream"; break; @@ -316,13 +316,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); obj.platformtile = 119; - obj.createentity(game, 64, 72, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 96, 80, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 128, 88, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 160, 96, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 192, 104, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 224, 112, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded - obj.createentity(game, 264, 96, 10, 1, 448500); // (savepoint) + obj.createentity(64, 72, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded + obj.createentity(96, 80, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded + obj.createentity(128, 88, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded + obj.createentity(160, 96, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded + obj.createentity(192, 104, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded + 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"; break; @@ -358,13 +358,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,235,8,8,8,8,233,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113"); tmap.push_back("113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,154,194,194,194,194,155,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113"); - obj.createentity(game, 144, 200, 3, 51); //Disappearing Platform - obj.createentity(game, 24, 16, 10, 0, 449500); // (savepoint) - obj.createentity(game, 280, 16, 10, 0, 449501); // (savepoint) - obj.createentity(game, 0, 8, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 8, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 224, 8, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 288, 8, 2, 9, 4); //Threadmill, <<< + obj.createentity(144, 200, 3, 51); //Disappearing Platform + obj.createentity(24, 16, 10, 0, 449500); // (savepoint) + obj.createentity(280, 16, 10, 0, 449501); // (savepoint) + obj.createentity(0, 8, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 8, 2, 8, 4); //Threadmill, >>> + obj.createentity(224, 8, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(288, 8, 2, 9, 4); //Threadmill, <<< roomname = "Give Me A V"; break; @@ -400,20 +400,20 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("83,83,83,124,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,125,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83"); tmap.push_back("83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83"); - obj.createentity(game, 0, 8, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 8, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 8, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 256, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 152, 88, 10, 1, 449510); // (savepoint) - obj.createentity(game, 152, 120, 10, 0, 449511); // (savepoint) - obj.createentity(game, 128, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 32, 208, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 64, 208, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 208, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 8, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 8, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 8, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(256, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(152, 88, 10, 1, 449510); // (savepoint) + obj.createentity(152, 120, 10, 0, 449511); // (savepoint) + obj.createentity(128, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(32, 208, 2, 8, 4); //Threadmill, >>> + obj.createentity(64, 208, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 208, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Select Track"; break; @@ -449,21 +449,21 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); tmap.push_back("283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 0, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 256, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 152, 128, 1, 0, 5, 72, 120, 256, 200); // Enemy, bounded - obj.createentity(game, 240, 168, 1, 1, 5, 72, 120, 256, 200); // Enemy, bounded - obj.createentity(game, 72, 168, 1, 1, 5, 72, 120, 256, 200); // Enemy, bounded - obj.createentity(game, 0, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 32, 3,10); //Disappearing Platform - obj.createentity(game, 96, 32, 3,10); //Disappearing Platform - obj.createentity(game, 192, 32, 3,10); //Disappearing Platform - obj.createentity(game, 224, 32, 3,10); //Disappearing Platform + obj.createentity(0, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(256, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(152, 128, 1, 0, 5, 72, 120, 256, 200); // Enemy, bounded + obj.createentity(240, 168, 1, 1, 5, 72, 120, 256, 200); // Enemy, bounded + obj.createentity(72, 168, 1, 1, 5, 72, 120, 256, 200); // Enemy, bounded + obj.createentity(0, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 32, 3,10); //Disappearing Platform + obj.createentity(96, 32, 3,10); //Disappearing Platform + obj.createentity(192, 32, 3,10); //Disappearing Platform + obj.createentity(224, 32, 3,10); //Disappearing Platform roomname = "You Chose... Poorly"; break; @@ -499,16 +499,16 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 0, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 256, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 152, 120, 10, 0, 449530); // (savepoint) - obj.createentity(game, 0, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(256, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(152, 120, 10, 0, 449530); // (savepoint) + obj.createentity(0, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 112, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Hyperspace Bypass 5"; break; @@ -545,14 +545,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); obj.platformtile = 319; - obj.createentity(game, 0, 104, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 104, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 0, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 112, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 136, 104, 2, 0, 5, 136, 88, 200, 152); // Platform, bounded - obj.createentity(game, 168, 104, 2, 0, 5, 136, 88, 200, 152); // Platform, bounded - obj.createentity(game, 80, 112, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 80, 104, 2, 9, 4); //Threadmill, <<< + obj.createentity(0, 104, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 104, 2, 9, 4); //Threadmill, <<< + obj.createentity(0, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 112, 2, 8, 4); //Threadmill, >>> + obj.createentity(136, 104, 2, 0, 5, 136, 88, 200, 152); // Platform, bounded + obj.createentity(168, 104, 2, 0, 5, 136, 88, 200, 152); // Platform, bounded + obj.createentity(80, 112, 2, 8, 4); //Threadmill, >>> + obj.createentity(80, 104, 2, 9, 4); //Threadmill, <<< roomname = "Plain Sailing from Here On"; break; @@ -590,14 +590,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("483,483,483,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"); obj.platformtile = 10; - obj.createentity(game, 264, 128, 10, 0, 448540); // (savepoint) - obj.createentity(game, 192, 32, 3, 10); //Disappearing Platform - obj.createentity(game, 32, 176, 2, 3, 4); // Platform - obj.createentity(game, 256, 120, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 224, 184, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 0, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 16, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 104, 24, 10, 0, 448541); // (savepoint) + obj.createentity(264, 128, 10, 0, 448540); // (savepoint) + obj.createentity(192, 32, 3, 10); //Disappearing Platform + obj.createentity(32, 176, 2, 3, 4); // Platform + obj.createentity(256, 120, 2, 8, 4); //Threadmill, >>> + obj.createentity(224, 184, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 16, 2, 8, 4); //Threadmill, >>> + obj.createentity(104, 24, 10, 0, 448541); // (savepoint) roomname = "Ha Ha Ha Not Really"; break; @@ -635,18 +635,18 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("510,510,510,510,510,510,510,510,632,0,0,0,0,818,698,698,630,510,510,510,510,510,510,632,698,698,820,0,0,0,0,630,510,510,510,510,510,510,510,510"); obj.platformtile = 279; - obj.createentity(game, 32, 168, 9, 3); // (shiny trinket) - obj.createentity(game, 16, 112, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 0, 112, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 0, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 96, 32, 2, 3, 4); // Platform - obj.createentity(game, 240, 88, 2, 2, 4); // Platform - obj.createentity(game, 128, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 152, 168, 10, 1, 448530); // (savepoint) - obj.createentity(game, 72, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 184, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 48, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(32, 168, 9, 3); // (shiny trinket) + obj.createentity(16, 112, 2, 9, 4); //Threadmill, <<< + obj.createentity(0, 112, 2, 9, 4); //Threadmill, <<< + obj.createentity(0, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(96, 32, 2, 3, 4); // Platform + obj.createentity(240, 88, 2, 2, 4); // Platform + obj.createentity(128, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(152, 168, 10, 1, 448530); // (savepoint) + obj.createentity(72, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(184, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(48, 104, 2, 10, 4); //Big Threadmill, >>>>>> roomname="You Just Keep Coming Back"; break; @@ -684,16 +684,16 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); obj.platformtile = 359; - obj.createentity(game, 256, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 0, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 0, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 120, 104, 2, 0, 4, 96, 64, 224, 160); // Platform, bounded - obj.createentity(game, 168, 80, 2, 0, 4, 96, 64, 224, 160); // Platform, bounded - obj.createentity(game, 72, 64, 10, 1, 448520); // (savepoint) - obj.createentity(game, 232, 64, 10, 1, 448521); // (savepoint) - obj.createentity(game, 232, 144, 10, 0, 448522); // (savepoint) - obj.createentity(game, 72, 144, 10, 0, 448523); // (savepoint) + obj.createentity(256, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(0, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(0, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(120, 104, 2, 0, 4, 96, 64, 224, 160); // Platform, bounded + obj.createentity(168, 80, 2, 0, 4, 96, 64, 224, 160); // Platform, bounded + obj.createentity(72, 64, 10, 1, 448520); // (savepoint) + obj.createentity(232, 64, 10, 1, 448521); // (savepoint) + obj.createentity(232, 144, 10, 0, 448522); // (savepoint) + obj.createentity(72, 144, 10, 0, 448523); // (savepoint) roomname = "Gordian Knot"; break; @@ -730,20 +730,20 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313"); tmap.push_back("313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313"); - obj.createentity(game, 256, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 112, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 96, 40, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 160, 40, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 32, 40, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 72, 80, 10, 1, 448510); // (savepoint) - obj.createentity(game, 104, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded - obj.createentity(game, 160+8, 168, 1, 1, 5, 104, 120, 288, 200); // Enemy, bounded - obj.createentity(game, 216+16, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded + obj.createentity(256, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 112, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(96, 40, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(160, 40, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(32, 40, 2, 9, 4); //Threadmill, <<< + obj.createentity(72, 80, 10, 1, 448510); // (savepoint) + obj.createentity(104, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded + obj.createentity(160+8, 168, 1, 1, 5, 104, 120, 288, 200); // Enemy, bounded + obj.createentity(216+16, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded roomname = "Backsliders"; break; @@ -780,16 +780,16 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("283,283,283,283,283,283,283,405,0,0,0,0,363,364,364,364,325,283,283,283,283,283,283,283,283,283,283,283,283,324,364,364,364,364,364,364,364,364,364,364"); tmap.push_back("283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); - obj.createentity(game, 72, 184, 10, 0, 447510); // (savepoint) - obj.createentity(game, 80, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 144, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 208, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(72, 184, 10, 0, 447510); // (savepoint) + obj.createentity(80, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(144, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(208, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 24 - 8, 144 - 8, 1, 10, 0); // Enemy + obj.createentity(24 - 8, 144 - 8, 1, 10, 0); // Enemy - obj.createentity(game, 24 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy //LIES emitter starts here roomname = "The Cuckoo"; @@ -827,15 +827,15 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("391,391,391,391,391,391,391,391,391,391,352,351,391,391,391,391,391,391,391,391,352,310,310,351,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391"); tmap.push_back("310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310"); - obj.createentity(game, 8, 200, 10, 1, 447520); // (savepoint) - obj.createentity(game, 200, 192, 9, 4); // (shiny trinket) - obj.createentity(game, 232, 96, 10, 1, 447521); // (savepoint) + obj.createentity(8, 200, 10, 1, 447520); // (savepoint) + obj.createentity(200, 192, 9, 4); // (shiny trinket) + obj.createentity(232, 96, 10, 1, 447521); // (savepoint) - obj.createentity(game, 24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy + obj.createentity(24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy - obj.createentity(game, 24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned roomname = "Clarion Call"; break; @@ -872,11 +872,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110"); tmap.push_back("110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110"); - obj.createentity(game, 176, 104, 10, 0, 446510); // (savepoint) + obj.createentity(176, 104, 10, 0, 446510); // (savepoint) - obj.createentity(game, 7 * 8, 17 * 8, 1, 12, 0); // Enemy + obj.createentity(7 * 8, 17 * 8, 1, 12, 0); // Enemy - obj.createentity(game, 7*8, 2*8, 1, 12, 1); // Enemy + obj.createentity(7*8, 2*8, 1, 12, 1); // Enemy //FACTORY emitter starts here roomname = "The Solution is Dilution"; break; @@ -913,12 +913,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("92,92,92,92,92,92,214,683,683,683,683,683,172,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); tmap.push_back("92,92,92,92,92,92,214,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); - obj.createentity(game, 96, 168, 10, 0, 445510); // (savepoint) + obj.createentity(96, 168, 10, 0, 445510); // (savepoint) - obj.createentity(game, 7 * 8, 36 * 8, 1, 12, 0); // Enemy + obj.createentity(7 * 8, 36 * 8, 1, 12, 0); // Enemy - obj.createentity(game, 7 * 8, (36 * 8)-108, 1, 12, 1); // Enemy - obj.createentity(game, 7 * 8, (36 * 8)-216, 1, 12, 1); // Enemy + obj.createentity(7 * 8, (36 * 8)-108, 1, 12, 1); // Enemy + obj.createentity(7 * 8, (36 * 8)-216, 1, 12, 1); // Enemy //FACTORY emitter starts here (manually placed) roomname = "Lighter Than Air"; @@ -957,19 +957,19 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("292,292,292,292,333,373,374,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,372,373,373,373,373,373,373,373,373,373,373,373,334,292,292"); tmap.push_back("292,292,292,292,292,292,414,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 224, 200, 10, 1, 444510); // (savepoint) + obj.createentity(224, 200, 10, 1, 444510); // (savepoint) - obj.createentity(game, 56, 40, 1, 0, 2); // Enemy //collector + obj.createentity(56, 40, 1, 0, 2); // Enemy //collector - obj.createentity(game, 7 * 8, 36 * 8, 1, 12, 0); // Enemy + obj.createentity(7 * 8, 36 * 8, 1, 12, 0); // Enemy - obj.createentity(game, 7 * 8, (36 * 8)-108, 1, 12, 1); // Enemy - obj.createentity(game, 7 * 8, (36 * 8)-216, 1, 12, 1); // Enemy + obj.createentity(7 * 8, (36 * 8)-108, 1, 12, 1); // Enemy + obj.createentity(7 * 8, (36 * 8)-216, 1, 12, 1); // Enemy //FACTORY emitter starts here (manually placed) if(!game.intimetrial) { - obj.createentity(game, 18 * 8, (5 * 8) + 4, 14); //Teleporter! + obj.createentity(18 * 8, (5 * 8) + 4, 14); //Teleporter! } roomname = "Level Complete!"; break; @@ -1041,11 +1041,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 248 - 4, 160 - 48, 1, 1, 0); // Enemy - obj.createentity(game, 124, 120, 20, 1); // (terminal) + obj.createentity(248 - 4, 160 - 48, 1, 1, 0); // Enemy + obj.createentity(124, 120, 20, 1); // (terminal) obj.createblock(5, 124-4, 120, 20, 16, 14); - obj.createentity(game, 156, 40, 20, 1); // (terminal) + obj.createentity(156, 40, 20, 1); // (terminal) obj.createblock(5, 156-4, 40, 20, 16, 15); roomname = "The Hanged Man, Reversed"; @@ -1083,7 +1083,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,371,0,0,0,0,369,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289"); - obj.createentity(game, 152, 120, 10, 0, 445530); // (savepoint) + obj.createentity(152, 120, 10, 0, 445530); // (savepoint) roomname = "doomS"; break; @@ -1119,12 +1119,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 24-60-8, 144-8, 1, 10, 0); // Enemy + obj.createentity(24-60-8, 144-8, 1, 10, 0); // Enemy //LIES Emitter, manually positioned - obj.createentity(game, 24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy roomname = "Chinese Rooms"; break; @@ -1161,7 +1161,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 152, 96, 10, 1, 446530); // (savepoint) + obj.createentity(152, 96, 10, 1, 446530); // (savepoint) roomname = "Swoop"; break; @@ -1197,11 +1197,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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,229,0,0,0,0,227,229,0,0,0,0,0,0"); tmap.push_back("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,229,0,0,0,0,227,229,0,0,0,0,0,0"); - obj.createentity(game, 64, 40, 10, 1, 446520); // (savepoint) - obj.createentity(game, 208, 88, 3, 827); //Disappearing Platform - obj.createentity(game, 152, 160, 3, 827); //Disappearing Platform - obj.createentity(game, 96, 88, 3, 827); //Disappearing Platform - obj.createentity(game, 40, 160, 3, 827); //Disappearing Platform + obj.createentity(64, 40, 10, 1, 446520); // (savepoint) + obj.createentity(208, 88, 3, 827); //Disappearing Platform + obj.createentity(152, 160, 3, 827); //Disappearing Platform + obj.createentity(96, 88, 3, 827); //Disappearing Platform + obj.createentity(40, 160, 3, 827); //Disappearing Platform roomname = "Manic Mine"; break; @@ -1273,26 +1273,26 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,435,0,0,0,0,0,0,0,0,0,0,433,313,313,313,313,313,313,313,313,313,313,313,313"); tmap.push_back("313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,354,394,394,394,394,394,394,394,394,394,394,355,313,313,313,313,313,313,313,313,313,313,313,313"); - obj.createentity(game, 144-4, 208, 1, 1, 6); // Enemy - obj.createentity(game, 128+4, 8, 1, 0, 6); // Enemy - obj.createentity(game, 64, 200, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 216, 200, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 96, 160, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 160, 160, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 208, 160, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 248, 184, 10, 1, 445540); // (savepoint) - obj.createentity(game, 184, 24, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 64, 64, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 152, 64, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 152, 88, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 64, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 96, 136, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 160, 136, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 184, 136, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 152, 24, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 104, 200, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 104, 136, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 104, 160, 2, 9, 4); //Threadmill, <<< + obj.createentity(144-4, 208, 1, 1, 6); // Enemy + obj.createentity(128+4, 8, 1, 0, 6); // Enemy + obj.createentity(64, 200, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(216, 200, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(96, 160, 2, 9, 4); //Threadmill, <<< + obj.createentity(160, 160, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(208, 160, 2, 9, 4); //Threadmill, <<< + obj.createentity(248, 184, 10, 1, 445540); // (savepoint) + obj.createentity(184, 24, 2, 9, 4); //Threadmill, <<< + obj.createentity(64, 64, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(152, 64, 2, 9, 4); //Threadmill, <<< + obj.createentity(152, 88, 2, 9, 4); //Threadmill, <<< + obj.createentity(64, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(96, 136, 2, 9, 4); //Threadmill, <<< + obj.createentity(160, 136, 2, 9, 4); //Threadmill, <<< + obj.createentity(184, 136, 2, 9, 4); //Threadmill, <<< + obj.createentity(152, 24, 2, 9, 4); //Threadmill, <<< + obj.createentity(104, 200, 2, 9, 4); //Threadmill, <<< + obj.createentity(104, 136, 2, 9, 4); //Threadmill, <<< + obj.createentity(104, 160, 2, 9, 4); //Threadmill, <<< roomname = "$eeing Dollar $ign$"; break; @@ -1329,19 +1329,19 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86"); tmap.push_back("0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86"); - obj.createentity(game, 184, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 248, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 312, 56, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 152, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 216, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 280, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 280, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 272, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 152, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 120, 152, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 96, 192, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 152, 192, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 240, 88, 2, 9, 4); //Threadmill, <<< + obj.createentity(184, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(248, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(312, 56, 2, 8, 4); //Threadmill, >>> + obj.createentity(152, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(216, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(280, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(280, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(272, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 152, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(120, 152, 2, 8, 4); //Threadmill, >>> + obj.createentity(96, 192, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(152, 192, 2, 8, 4); //Threadmill, >>> + obj.createentity(240, 88, 2, 9, 4); //Threadmill, <<< roomname = "Parabolica"; break; @@ -1377,23 +1377,23 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("167,167,167,167,128,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); tmap.push_back("86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); - obj.createentity(game, 96, 80, 10, 1, 447540); // (savepoint) - obj.createentity(game, 64, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 112, 184, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 176, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 224, 184, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 232, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 288, 128, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 288, 184, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 120, 112, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 168, 112, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 208, 168, 10, 1, 447541); // (savepoint) + obj.createentity(96, 80, 10, 1, 447540); // (savepoint) + obj.createentity(64, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(112, 184, 2, 8, 4); //Threadmill, >>> + obj.createentity(176, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(224, 184, 2, 8, 4); //Threadmill, >>> + obj.createentity(232, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(288, 128, 2, 8, 4); //Threadmill, >>> + obj.createentity(288, 184, 2, 8, 4); //Threadmill, >>> + obj.createentity(120, 112, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(168, 112, 2, 8, 4); //Threadmill, >>> + obj.createentity(208, 168, 10, 1, 447541); // (savepoint) - obj.createentity(game, 24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy + obj.createentity(24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy - obj.createentity(game, 24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned roomname = "Spikes Do!"; @@ -1431,10 +1431,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 64, 152, 10, 1, 446540); // (savepoint) - obj.createentity(game, 120, 72, 3, 707); //Disappearing Platform - obj.createentity(game, 248, 72, 3, 707); //Disappearing Platform - obj.createentity(game, 184, 200, 3, 707); //Disappearing Platform + obj.createentity(64, 152, 10, 1, 446540); // (savepoint) + obj.createentity(120, 72, 3, 707); //Disappearing Platform + obj.createentity(248, 72, 3, 707); //Disappearing Platform + obj.createentity(184, 200, 3, 707); //Disappearing Platform roomname = "What Lies Beneath?"; break; @@ -1470,18 +1470,18 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 0, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 128, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 112, 128, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 0, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 184, 184, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 152, 168, 10, 1, 447550); // (savepoint) + obj.createentity(0, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 128, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(112, 128, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(184, 184, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(152, 168, 10, 1, 447550); // (savepoint) - obj.createentity(game, 264, 136, 1, 0, 2); // Enemy //Collector - obj.createentity(game, 24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy - obj.createentity(game, 24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy - obj.createentity(game, 24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy + obj.createentity(264, 136, 1, 0, 2); // Enemy //Collector + obj.createentity(24 - 60 - 8, 144 - 8, 1, 10, 0); // Enemy + obj.createentity(24 - 60 - 8 + 117, 144 - 8, 1, 10, 1); // Enemy + obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned, collector! roomname = "Chipper Cipher"; break; @@ -1518,7 +1518,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504"); tmap.push_back("0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504"); - obj.createentity(game, 40, 72, 3, 787); //Disappearing Platform + obj.createentity(40, 72, 3, 787); //Disappearing Platform roomname = "If You Fall Up"; break; @@ -1555,9 +1555,9 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,695,695,695,695,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498"); obj.platformtile = 159; - obj.createentity(game, 24, 80, 2, 3, 6); // Platform - obj.createentity(game, 64, 176, 10, 0, 445550); // (savepoint) - obj.createentity(game, 216 - 4, 192, 10, 1, 445551); // (savepoint) + obj.createentity(24, 80, 2, 3, 6); // Platform + obj.createentity(64, 176, 10, 0, 445550); // (savepoint) + obj.createentity(216 - 4, 192, 10, 1, 445551); // (savepoint) roomname = "Just Pick Yourself Down"; break; @@ -1594,37 +1594,37 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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,408,0,0,0,0,406,286"); tmap.push_back("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,408,0,0,0,0,406,286"); - obj.createentity(game, 32, 40, 10, 1, 444560); // (savepoint) - obj.createentity(game, 56, 24, 10, 0, 444551); // (savepoint) - obj.createentity(game, 80, 40, 10, 1, 444552); // (savepoint) - obj.createentity(game, 104, 24, 10, 0, 444553); // (savepoint) - obj.createentity(game, 128, 40, 10, 1, 444554); // (savepoint) - obj.createentity(game, 152, 24, 10, 0, 444555); // (savepoint) - obj.createentity(game, 176, 40, 10, 1, 444556); // (savepoint) - obj.createentity(game, 200, 24, 10, 0, 444557); // (savepoint) - obj.createentity(game, 224, 40, 10, 1, 444558); // (savepoint) - obj.createentity(game, 248, 24, 10, 0, 444559); // (savepoint) - obj.createentity(game, 272, 40, 10, 1, 444550); // (savepoint) - obj.createentity(game, 0, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 16, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 0, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 64, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 128, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 192, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 256, 56, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 0, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 240, 88, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 0, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 128, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 240, 128, 2, 9, 4); //Threadmill, <<< + obj.createentity(32, 40, 10, 1, 444560); // (savepoint) + obj.createentity(56, 24, 10, 0, 444551); // (savepoint) + obj.createentity(80, 40, 10, 1, 444552); // (savepoint) + obj.createentity(104, 24, 10, 0, 444553); // (savepoint) + obj.createentity(128, 40, 10, 1, 444554); // (savepoint) + obj.createentity(152, 24, 10, 0, 444555); // (savepoint) + obj.createentity(176, 40, 10, 1, 444556); // (savepoint) + obj.createentity(200, 24, 10, 0, 444557); // (savepoint) + obj.createentity(224, 40, 10, 1, 444558); // (savepoint) + obj.createentity(248, 24, 10, 0, 444559); // (savepoint) + obj.createentity(272, 40, 10, 1, 444550); // (savepoint) + obj.createentity(0, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(64, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(128, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(192, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(256, 56, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(0, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(240, 88, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(0, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 128, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(240, 128, 2, 9, 4); //Threadmill, <<< roomname = "The Warning"; break; @@ -1661,13 +1661,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("420,49,0,0,0,0,50,418,298,420,0,0,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,0,0,418,298"); tmap.push_back("420,49,0,0,0,0,50,418,298,420,0,0,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,0,0,418,298"); - obj.createentity(game, 176, 80, 3, 55); //Disappearing Platform - obj.createentity(game, 0, 56, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 16, 56, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 72, 72, 10, 1, 444561); // (savepoint) - obj.createentity(game, 8, 144, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 48, 144, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 0, 16, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(176, 80, 3, 55); //Disappearing Platform + obj.createentity(0, 56, 2, 8, 4); //Threadmill, >>> + obj.createentity(16, 56, 2, 8, 4); //Threadmill, >>> + obj.createentity(72, 72, 10, 1, 444561); // (savepoint) + obj.createentity(8, 144, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(48, 144, 2, 8, 4); //Threadmill, >>> + obj.createentity(0, 16, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Getting Here is Half the Fun"; @@ -1880,10 +1880,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("89,89,89,89,89,89,211,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,169,170,170,170,170,170,170,170,131,89,89"); tmap.push_back("89,89,89,89,89,89,130,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,131,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 224, 144, 9, 5); // (shiny trinket) - obj.createentity(game, 96, 152, 10, 1, 450560); // (savepoint) + obj.createentity(224, 144, 9, 5); // (shiny trinket) + obj.createentity(96, 152, 10, 1, 450560); // (savepoint) - obj.createentity(game, 24, 152, 20, 1); // (terminal) + obj.createentity(24, 152, 20, 1); // (terminal) obj.createblock(5, 24-4, 152, 20, 16, 16); roomname = "Doing Things The Hard Way"; break; @@ -1923,8 +1923,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495"); obj.platformtile = 707; - obj.createentity(game, 272, 40, 2, 14, 2); // Platform - obj.createentity(game, 240, 40, 3, 707); //Disappearing Platform + obj.createentity(272, 40, 2, 14, 2); // Platform + obj.createentity(240, 40, 3, 707); //Disappearing Platform if(game.intimetrial && game.timetriallevel > 0) { @@ -1965,11 +1965,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("301,301,301,301,301,301,301,423,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301"); tmap.push_back("301,301,301,301,301,301,301,423,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301"); - obj.createentity(game, 0, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 64, 168, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 72, 128, 10, 1, 443560); // (savepoint) + obj.createentity(0, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(64, 168, 2, 9, 4); //Threadmill, <<< + obj.createentity(72, 128, 10, 1, 443560); // (savepoint) - obj.createentity(game, (21 * 8), (9 * 8), 14); //Teleporter! + obj.createentity((21 * 8), (9 * 8), 14); //Teleporter! if(game.intimetrial) { @@ -2026,16 +2026,16 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); tmap.push_back("86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); - obj.createentity(game, 0, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 63, 64-16, 1, 3, 4, 64, 0, 256, 204); // Enemy, bounded - obj.createentity(game, 256-28, 80, 1, 2, 4, 64, 0, 256, 204); // Enemy, bounded - obj.createentity(game, 48, 168, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 104, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 152, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 240, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 288, 168, 2, 9, 4); //Threadmill, <<< - obj.createentity(game, 160 - 48, 184 - 8, 1, 3, 5);// , 160, 0, 320, 240); // Enemy, bounded - obj.createentity(game, 160 - 28 + 48, 184 - 8, 1, 2, 5);// , 0, 0, 160, 240); // Enemy, bounded + obj.createentity(0, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(63, 64-16, 1, 3, 4, 64, 0, 256, 204); // Enemy, bounded + obj.createentity(256-28, 80, 1, 2, 4, 64, 0, 256, 204); // Enemy, bounded + obj.createentity(48, 168, 2, 9, 4); //Threadmill, <<< + obj.createentity(104, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(152, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(240, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(288, 168, 2, 9, 4); //Threadmill, <<< + 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"; break; @@ -2071,13 +2071,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507"); tmap.push_back("507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507"); - obj.createentity(game, 64, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 128, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 192, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 256, 168, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 32+4, 48, 10, 0, 443540); // (savepoint) - obj.createentity(game, 208-4, 48, 1, 0, 3, 104, 40, 324, 136); // Enemy, bounded - obj.createentity(game, 136 + 4, 96, 10, 1, 443541); // (savepoint) + obj.createentity(64, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(128, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(192, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(256, 168, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(32+4, 48, 10, 0, 443540); // (savepoint) + obj.createentity(208-4, 48, 1, 0, 3, 104, 40, 324, 136); // Enemy, bounded + obj.createentity(136 + 4, 96, 10, 1, 443541); // (savepoint) roomname = "The Tomb of Mad Carew"; break; @@ -2114,8 +2114,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("310,310,310,310,432,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310"); tmap.push_back("310,310,310,310,432,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310"); - obj.createentity(game, 56, 144, 10, 0, 443520); // (savepoint) - obj.createentity(game, 152, 80, 10, 1, 443521); // (savepoint) + obj.createentity(56, 144, 10, 0, 443520); // (savepoint) + obj.createentity(152, 80, 10, 1, 443521); // (savepoint) roomname = "The Sensible Room"; break; @@ -2151,7 +2151,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 0, -200, 1, 16, 6, -64, -500, 320 + 64, 340); + obj.createentity(0, -200, 1, 16, 6, -64, -500, 320 + 64, 340); roomname = "B-B-B-Busted"; break; @@ -2188,8 +2188,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("286,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,286,286,286,286,286"); tmap.push_back("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"); - obj.createentity(game, 280, 192, 10, 1, 443500); // (savepoint) - obj.createentity(game, 64, 80, 10, 1, 443501); // (savepoint) + obj.createentity(280, 192, 10, 1, 443500); // (savepoint) + obj.createentity(64, 80, 10, 1, 443501); // (savepoint) if(!game.nocutscenes) { @@ -2239,12 +2239,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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"); obj.platformtile = 747; - obj.createentity(game, 120, 72, 3, 747); //Disappearing Platform - obj.createentity(game, 120, 112, 3, 747); //Disappearing Platform - obj.createentity(game, 120, 128, 3, 747); //Disappearing Platform - obj.createentity(game, 88, 72, 2, 15, 4); // Platform - obj.createentity(game, 192, 128, 9, 6); // (shiny trinket) - obj.createentity(game, 240, 136, 10, 0, 443490); // (savepoint) + obj.createentity(120, 72, 3, 747); //Disappearing Platform + obj.createentity(120, 112, 3, 747); //Disappearing Platform + obj.createentity(120, 128, 3, 747); //Disappearing Platform + obj.createentity(88, 72, 2, 15, 4); // Platform + obj.createentity(192, 128, 9, 6); // (shiny trinket) + obj.createentity(240, 136, 10, 0, 443490); // (savepoint) roomname = "Prize for the Reckless"; if(game.nodeathmode) { @@ -2288,16 +2288,16 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 152, 32, 10, 1, 443480); // (savepoint) - obj.createentity(game, 152, 184, 10, 0, 443481); // (savepoint) - obj.createentity(game, 272, 120, 1, 2, 8); // Enemy - obj.createentity(game, 32, 96, 1, 3, 8); // Enemy - obj.createentity(game, 104, 80, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 168, 80, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 232, 80, 2, 8, 4); //Threadmill, >>> - obj.createentity(game, 56, 144, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 120, 144, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 184, 144, 2, 8, 4); //Threadmill, >>> + obj.createentity(152, 32, 10, 1, 443480); // (savepoint) + obj.createentity(152, 184, 10, 0, 443481); // (savepoint) + obj.createentity(272, 120, 1, 2, 8); // Enemy + obj.createentity(32, 96, 1, 3, 8); // Enemy + obj.createentity(104, 80, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(168, 80, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(232, 80, 2, 8, 4); //Threadmill, >>> + obj.createentity(56, 144, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(120, 144, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(184, 144, 2, 8, 4); //Threadmill, >>> roomname = "A Deception"; break; @@ -2334,12 +2334,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("310,310,432,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310"); obj.platformtile = 239; - obj.createentity(game, 88, 112, 2, 0, 4, 88, 64, 264, 168); // Platform, bounded - obj.createentity(game, 136, 112, 2, 1, 4, 88, 64, 264, 168); // Platform, bounded - obj.createentity(game, 184, 112, 2, 0, 4, 88, 64, 264, 168); // Platform, bounded - obj.createentity(game, 232, 112, 2, 1, 4, 88, 64, 264, 168); // Platform, bounded - obj.createentity(game, 56, 64, 10, 0, 442480); // (savepoint) - obj.createentity(game, 280, 152, 10, 1, 442481); // (savepoint) + obj.createentity(88, 112, 2, 0, 4, 88, 64, 264, 168); // Platform, bounded + obj.createentity(136, 112, 2, 1, 4, 88, 64, 264, 168); // Platform, bounded + obj.createentity(184, 112, 2, 0, 4, 88, 64, 264, 168); // Platform, bounded + obj.createentity(232, 112, 2, 1, 4, 88, 64, 264, 168); // Platform, bounded + obj.createentity(56, 64, 10, 0, 442480); // (savepoint) + obj.createentity(280, 152, 10, 1, 442481); // (savepoint) roomname = "Down Under"; break; @@ -2376,10 +2376,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("295,417,779,779,779,779,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295"); tmap.push_back("295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295"); - obj.createentity(game, 16, 104, 2, 10, 4); //Big Threadmill, >>>>>> - obj.createentity(game, 104, 184, 2, 11, 4); //Big Threadmill, <<<<<< - obj.createentity(game, 144, 168, 10, 1, 442490); // (savepoint) - obj.createentity(game, 24, 112, 10, 0, 442491); // (savepoint) + obj.createentity(16, 104, 2, 10, 4); //Big Threadmill, >>>>>> + obj.createentity(104, 184, 2, 11, 4); //Big Threadmill, <<<<<< + obj.createentity(144, 168, 10, 1, 442490); // (savepoint) + obj.createentity(24, 112, 10, 0, 442491); // (savepoint) roomname = "Shenanigan"; break; @@ -2415,13 +2415,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("489,489,489,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,809,689,689,609,489,489,489,489,489"); tmap.push_back("489,489,489,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,809,689,689,609,489,489,489,489,489"); - obj.createentity(game, 192, 88, 10, 0, 441490); // (savepoint) + obj.createentity(192, 88, 10, 0, 441490); // (savepoint) if(!game.intimetrial) { if(game.companion==0 && obj.flags[10]==0 && !game.crewstats[2]) //also need to check if he's rescued in a previous game { - obj.createentity(game, 42, 86, 16, 0); + obj.createentity(42, 86, 16, 0); obj.createblock(1, 0, 0, 140, 240, 34); } } @@ -2460,7 +2460,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298"); tmap.push_back("298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298"); - obj.createentity(game, (5 * 8) - 4, (8 * 8) + 4, 14); //Teleporter! + obj.createentity((5 * 8) - 4, (8 * 8) + 4, 14); //Teleporter! if(game.intimetrial) { @@ -2501,8 +2501,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 40, 24, 10, 0, 442530); // (savepoint) - obj.createentity(game, 264, 24, 10, 0, 442531); // (savepoint) + obj.createentity(40, 24, 10, 0, 442530); // (savepoint) + obj.createentity(264, 24, 10, 0, 442531); // (savepoint) roomname = "Driller"; break; @@ -2539,24 +2539,24 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,172,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); tmap.push_back("92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); - obj.createentity(game, 128, 80, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 80, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 80, 3, 867); //Disappearing Platform - obj.createentity(game, 128, 88, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 88, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 88, 3, 867); //Disappearing Platform - obj.createentity(game, 128, 96, 3, 867); //Disappearing Platform - obj.createentity(game, 128, 104, 3, 867); //Disappearing Platform - obj.createentity(game, 128, 112, 3, 867); //Disappearing Platform - obj.createentity(game, 128, 120, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 96, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 104, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 112, 3, 867); //Disappearing Platform - obj.createentity(game, 160, 120, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 96, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 104, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 112, 3, 867); //Disappearing Platform - obj.createentity(game, 192, 120, 3, 867); //Disappearing Platform + obj.createentity(128, 80, 3, 867); //Disappearing Platform + obj.createentity(160, 80, 3, 867); //Disappearing Platform + obj.createentity(192, 80, 3, 867); //Disappearing Platform + obj.createentity(128, 88, 3, 867); //Disappearing Platform + obj.createentity(160, 88, 3, 867); //Disappearing Platform + obj.createentity(192, 88, 3, 867); //Disappearing Platform + obj.createentity(128, 96, 3, 867); //Disappearing Platform + obj.createentity(128, 104, 3, 867); //Disappearing Platform + obj.createentity(128, 112, 3, 867); //Disappearing Platform + obj.createentity(128, 120, 3, 867); //Disappearing Platform + obj.createentity(160, 96, 3, 867); //Disappearing Platform + obj.createentity(160, 104, 3, 867); //Disappearing Platform + obj.createentity(160, 112, 3, 867); //Disappearing Platform + obj.createentity(160, 120, 3, 867); //Disappearing Platform + obj.createentity(192, 96, 3, 867); //Disappearing Platform + obj.createentity(192, 104, 3, 867); //Disappearing Platform + obj.createentity(192, 112, 3, 867); //Disappearing Platform + obj.createentity(192, 120, 3, 867); //Disappearing Platform if(!game.nocutscenes) { @@ -2601,8 +2601,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95"); tmap.push_back("95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95"); - obj.createentity(game, 144, 40, 3); //Disappearing Platform - obj.createentity(game, 200, 128, 3); //Disappearing Platform + obj.createentity(144, 40, 3); //Disappearing Platform + obj.createentity(200, 128, 3); //Disappearing Platform roomname = "Boo! Think Fast!"; break; @@ -2638,12 +2638,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("495,495,495,495,495,617,0,0,0,0,0,0,615,495,617,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,615,495,495,495,495"); tmap.push_back("495,495,495,495,495,617,0,0,0,0,0,0,615,495,536,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,537,495,495,495,495"); - obj.createentity(game, 288, 160, 10, 1, 442500); // (savepoint) + obj.createentity(288, 160, 10, 1, 442500); // (savepoint) - obj.createentity(game, 135, 75, 2, 0, 3, 100, 70, 320, 160); - obj.createentity(game, 185, 110, 2, 0, 3, 100, 70, 320, 160); - obj.createentity(game, 235, 145, 2, 0, 3, 100, 70, 320, 160); + obj.createentity(135, 75, 2, 0, 3, 100, 70, 320, 160); + 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"; break; @@ -2680,11 +2680,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); obj.platformtile = 207; - obj.createentity(game, 112-4, 200-4, 1, 1, 6, 104, 144, 264, 240); // Enemy, bounded - obj.createentity(game, 176-4, 152, 1, 0, 6, 104, 144, 264, 240); // Enemy, bounded - obj.createentity(game, 240-4, 200-4, 1, 1, 6, 104, 144, 264, 240); // Enemy, bounded - obj.createentity(game, 64, 48, 2, 3, 4); // Platform - obj.createentity(game, 272, 152, 9, 1); // (shiny trinket) + obj.createentity(112-4, 200-4, 1, 1, 6, 104, 144, 264, 240); // Enemy, bounded + obj.createentity(176-4, 152, 1, 0, 6, 104, 144, 264, 240); // Enemy, bounded + obj.createentity(240-4, 200-4, 1, 1, 6, 104, 144, 264, 240); // Enemy, bounded + obj.createentity(64, 48, 2, 3, 4); // Platform + obj.createentity(272, 152, 9, 1); // (shiny trinket) if(!game.nocutscenes) { @@ -2726,14 +2726,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("92,92,92,92,92,214,683,683,683,683,683,683,212,92,214,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); tmap.push_back("92,92,92,92,92,214,683,683,683,683,683,683,212,92,133,173,173,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92"); - obj.createentity(game, 120+2, 8, 1, 0, 3); // Enemy - obj.createentity(game, 264+2, 8, 1, 0, 3); // Enemy - obj.createentity(game, 120+2, 208-4, 1, 1, 3); // Enemy - obj.createentity(game, 192+2, 176-4, 1, 1, 3); // Enemy - obj.createentity(game, 192+2, 40, 1, 0, 3); // Enemy + obj.createentity(120+2, 8, 1, 0, 3); // Enemy + obj.createentity(264+2, 8, 1, 0, 3); // Enemy + obj.createentity(120+2, 208-4, 1, 1, 3); // Enemy + obj.createentity(192+2, 176-4, 1, 1, 3); // Enemy + obj.createentity(192+2, 40, 1, 0, 3); // Enemy - obj.createentity(game, 64, 80, 10, 1, 441501); // (savepoint) - obj.createentity(game, 64, 136, 10, 0, 441502); // (savepoint) + obj.createentity(64, 80, 10, 1, 441501); // (savepoint) + obj.createentity(64, 136, 10, 0, 441502); // (savepoint) roomname = "The Yes Men"; break; @@ -2771,12 +2771,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283"); obj.platformtile = 10; - obj.createentity(game, 136-32, 64, 3, 10); //Disappearing Platform - obj.createentity(game, 136, 64, 3, 10); //Disappearing Platform - obj.createentity(game, 136+32, 64, 3, 10); //Disappearing Platform - obj.createentity(game, 56, 104, 10, 1, 440500); // (savepoint) - obj.createentity(game, 56, 152, 2, 3, 3); // Platform - obj.createentity(game, 280, 192, 10, 1, 440501); // (savepoint) + obj.createentity(136-32, 64, 3, 10); //Disappearing Platform + obj.createentity(136, 64, 3, 10); //Disappearing Platform + obj.createentity(136+32, 64, 3, 10); //Disappearing Platform + obj.createentity(56, 104, 10, 1, 440500); // (savepoint) + obj.createentity(56, 152, 2, 3, 3); // Platform + obj.createentity(280, 192, 10, 1, 440501); // (savepoint) roomname = "Gantry and Dolly"; break; @@ -2813,13 +2813,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("495,495,495,495,495,495,495,495,495,617,680,680,680,680,680,680,680,680,680,615,495,495,495,495,617,680,680,680,680,680,680,680,680,680,680,615,495,495,495,495"); tmap.push_back("495,495,495,495,495,495,495,495,495,536,576,576,576,576,576,576,576,576,576,537,495,495,495,495,536,576,576,576,576,576,576,576,576,576,576,537,495,495,495,495"); - obj.createentity(game, 88, 104, 21, 1); // (savepoint) - obj.createentity(game, 112, 104, 21, 1, 440511); // (savepoint) - obj.createentity(game, 136, 88, 1, 0, 0); // Enemy //the radar dish - //obj.createentity(game, 176, 104, 10, 1, 440512); // (savepoint) - obj.createentity(game, 200, 104, 21, 1); // (savepoint) - obj.createentity(game, 224, 104, 21, 1); // (savepoint) - obj.createentity(game, 256, 32, 1, 0, 0); // Enemy //in this case, the transmitter + obj.createentity(88, 104, 21, 1); // (savepoint) + obj.createentity(112, 104, 21, 1, 440511); // (savepoint) + obj.createentity(136, 88, 1, 0, 0); // Enemy //the radar dish + //obj.createentity(176, 104, 10, 1, 440512); // (savepoint) + obj.createentity(200, 104, 21, 1); // (savepoint) + obj.createentity(224, 104, 21, 1); // (savepoint) + obj.createentity(256, 32, 1, 0, 0); // Enemy //in this case, the transmitter if(!game.intimetrial) { @@ -2861,8 +2861,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); tmap.push_back("292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292"); - obj.createentity(game, 200, 32, 1, 0, 8); // Enemy - obj.createentity(game, 168, 104, 10, 1, 439500); // (savepoint) + obj.createentity(200, 32, 1, 0, 8); // Enemy + obj.createentity(168, 104, 10, 1, 439500); // (savepoint) roomname = "Security Sweep"; break; @@ -2899,12 +2899,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,136,176,176,176,176,176,176,176,176,176,137,95,95"); tmap.push_back("95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95"); - obj.createentity(game, 24, 168, 10, 1, 439510); // (savepoint) - obj.createentity(game, 280, 48, 10, 0, 439511); // (savepoint) - obj.createentity(game, 80, 88, 1, 3, 3); // Enemy - obj.createentity(game, 224 - 16, 128, 1, 2, 3); // Enemy + obj.createentity(24, 168, 10, 1, 439510); // (savepoint) + obj.createentity(280, 48, 10, 0, 439511); // (savepoint) + obj.createentity(80, 88, 1, 3, 3); // Enemy + obj.createentity(224 - 16, 128, 1, 2, 3); // Enemy - obj.createentity(game, 256-4, 200, 20, 1); // (terminal) + obj.createentity(256-4, 200, 20, 1); // (terminal) obj.createblock(5, 256-8, 200, 20, 16, 6); roomname = "Linear Collider"; break; @@ -2941,8 +2941,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289"); tmap.push_back("289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289"); - obj.createentity(game, 192, 48, 10, 0, 439520); // (savepoint) - obj.createentity(game, 112, 160, 10, 1, 439521); // (savepoint) + obj.createentity(192, 48, 10, 0, 439520); // (savepoint) + obj.createentity(112, 160, 10, 1, 439521); // (savepoint) roomname = "Atmospheric Filtering Unit"; break; @@ -2980,11 +2980,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam roomname = "Traffic Jam"; - obj.createentity(game, 45, 118, 1, 1, 4); - obj.createentity(game, 205, 118, 1, 1, 4); - obj.createentity(game, 125, 18, 1, 0, 4); + obj.createentity(45, 118, 1, 1, 4); + obj.createentity(205, 118, 1, 1, 4); + obj.createentity(125, 18, 1, 0, 4); - obj.createentity(game, 232, 184, 10, 0, 1); + obj.createentity(232, 184, 10, 0, 1); break; case rn(53,40): @@ -3053,7 +3053,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("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"); tmap.push_back("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"); - obj.createentity(game, 152, 168, 10, 1, 441530); // (savepoint) + obj.createentity(152, 168, 10, 1, 441530); // (savepoint) if(!game.nocutscenes) { @@ -3171,8 +3171,8 @@ std::vector spacestation2class::loadlevel(int rx, int ry, Game& gam tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89"); - obj.createentity(game, 216, 144, 10, 1, 440520); // (savepoint) - obj.createentity(game, 16, 136, 9, 0); // (shiny trinket) + obj.createentity(216, 144, 10, 1, 440520); // (savepoint) + obj.createentity(16, 136, 9, 0); // (shiny trinket) roomname = "It's a Secret to Nobody"; break; diff --git a/desktop_version/src/WarpClass.cpp b/desktop_version/src/WarpClass.cpp index fa14c453..220f23b8 100644 --- a/desktop_version/src/WarpClass.cpp +++ b/desktop_version/src/WarpClass.cpp @@ -55,7 +55,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120"); tmap.push_back("120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120"); - obj.createentity(game, 288, 168, 10, 1, 50500); // (savepoint) + obj.createentity(288, 168, 10, 1, 50500); // (savepoint) if(game.intimetrial) { @@ -136,9 +136,9 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83"); tmap.push_back("83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83"); - obj.createentity(game, 248, 80, 10, 1, 51510); // (savepoint) - obj.createentity(game, 136, 128, 1, 3, 3, 128, 120, 288, 152); // Enemy, bounded - obj.createentity(game, 104, 192, 10, 1, 51511); // (savepoint) + obj.createentity(248, 80, 10, 1, 51510); // (savepoint) + obj.createentity(136, 128, 1, 3, 3, 128, 120, 288, 152); // Enemy, bounded + obj.createentity(104, 192, 10, 1, 51511); // (savepoint) rcol = 1; warpy = true; roomname = "Take the Red Pill"; @@ -176,11 +176,11 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("135,135,135,135,135,135,135,135,135,135,215,95,217,215,95,95,95,95,95,95,95,95,95,217,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135"); tmap.push_back("135,135,135,135,135,135,135,135,135,135,215,95,217,215,95,95,95,95,95,95,95,95,95,217,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135"); - obj.createentity(game, 32, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded - obj.createentity(game, 96, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded - obj.createentity(game, 160, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded - obj.createentity(game, 224, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded - obj.createentity(game, 232, 152, 10, 1, 51520); // (savepoint) + obj.createentity(32, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded + obj.createentity(96, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded + obj.createentity(160, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded + obj.createentity(224, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded + obj.createentity(232, 152, 10, 1, 51520); // (savepoint) rcol = 5; warpx = true; roomname = "Short Circuit"; @@ -218,7 +218,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("213,212,92,214,172,174,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92"); tmap.push_back("213,212,92,214,252,254,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92"); - obj.createentity(game, 32, 16, 10, 0, 50520); // (savepoint) + obj.createentity(32, 16, 10, 0, 50520); // (savepoint) rcol = 4; warpy = true; roomname = "As you like it"; @@ -257,7 +257,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0"); tmap.push_back("170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,209,211,169,170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,209,211,169,170,170,170,170"); - obj.createentity(game, 16, 120, 10, 1, 50530); // (savepoint) + obj.createentity(16, 120, 10, 1, 50530); // (savepoint) rcol = 3; warpx = true; roomname = "Maze With No Entrance"; @@ -295,7 +295,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("126,126,126,126,206,86,208,0,0,0,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167"); tmap.push_back("126,126,126,126,206,86,208,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86"); - obj.createentity(game, 64, 152, 10, 0, 49530); // (savepoint) + obj.createentity(64, 152, 10, 0, 49530); // (savepoint) rcol = 2; warpy = true; roomname = "As we go up, we go down"; @@ -333,10 +333,10 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("161,161,161,161,161,161,161,161,161,162,200,202,0,0,0,0,160,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,162,200,202,160,161"); tmap.push_back("80,80,80,80,80,80,80,80,80,202,200,202,0,0,0,0,200,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,200,202,200,80"); - obj.createentity(game, 296, 64, 10, 1, 49540); // (savepoint) - obj.createentity(game, 152-4-15+8, 32, 1, 0, 6, 128, 32, 288, 200); // Enemy, bounded - obj.createentity(game, 240-4-15+8, 186, 1, 1, 6, 128, 32, 288, 200); // Enemy, bounded - obj.createentity(game, 296, 152, 10, 0, 49541); // (savepoint) + obj.createentity(296, 64, 10, 1, 49540); // (savepoint) + obj.createentity(152-4-15+8, 32, 1, 0, 6, 128, 32, 288, 200); // Enemy, bounded + obj.createentity(240-4-15+8, 186, 1, 1, 6, 128, 32, 288, 200); // Enemy, bounded + obj.createentity(296, 152, 10, 0, 49541); // (savepoint) rcol = 0; warpx = true; roomname = "Time to get serious"; @@ -376,7 +376,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86"); if(!game.intimetrial) { - obj.createentity(game, (7 * 8) + 4, (6 * 8), 14); //Teleporter! + obj.createentity((7 * 8) + 4, (6 * 8), 14); //Teleporter! } rcol = 2; warpy = true; @@ -415,10 +415,10 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("212,92,92,214,212,92,92,214,172,173,173,174,0,0,0,0,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214"); tmap.push_back("212,92,92,214,212,92,92,214,212,92,92,214,172,173,173,174,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214"); - obj.createentity(game, 96, 72, 1, 3, 8, 64, 56, 256, 152); // Enemy, bounded - obj.createentity(game, 240, 120, 1, 2, 8, 64, 56, 256, 152); // Enemy, bounded - obj.createentity(game, 72, 16, 10, 0, 50550); // (savepoint) - obj.createentity(game, 264, 176, 10, 1, 50551); // (savepoint) + obj.createentity(96, 72, 1, 3, 8, 64, 56, 256, 152); // Enemy, bounded + obj.createentity(240, 120, 1, 2, 8, 64, 56, 256, 152); // Enemy, bounded + obj.createentity(72, 16, 10, 0, 50550); // (savepoint) + obj.createentity(264, 176, 10, 1, 50551); // (savepoint) rcol = 4; warpx = true; roomname = "Ascending and Descending"; @@ -456,12 +456,12 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,163,165,0,0,0,0,163,165,0,0,0,0,203,205,0,0,0,0,203,83"); tmap.push_back("83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83"); - obj.createentity(game, 280, 24, 1, 2, 3, 128, 16, 304, 216); // Enemy, bounded - obj.createentity(game, 136, 192, 1, 3, 3, 128, 16, 304, 216); // Enemy, bounded - obj.createentity(game, 40, 8, 1, 0, 10, 24, -56, 120, 280); // Enemy, bounded - obj.createentity(game, 88, 8, 1, 0, 10, 24, -40, 120, 272); // Enemy, bounded - obj.createentity(game, 256, 128, 10, 1, 51550); // (savepoint) - obj.createentity(game, 136, 32, 10, 1, 51551); // (savepoint) + obj.createentity(280, 24, 1, 2, 3, 128, 16, 304, 216); // Enemy, bounded + obj.createentity(136, 192, 1, 3, 3, 128, 16, 304, 216); // Enemy, bounded + obj.createentity(40, 8, 1, 0, 10, 24, -56, 120, 280); // Enemy, bounded + obj.createentity(88, 8, 1, 0, 10, 24, -40, 120, 272); // Enemy, bounded + obj.createentity(256, 128, 10, 1, 51550); // (savepoint) + obj.createentity(136, 32, 10, 1, 51551); // (savepoint) rcol = 1; warpy = true; roomname = "Shockwave Rider"; @@ -499,13 +499,13 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,169,170,170,171,169,170,170,170,170,170,170,170,170,171,0,0,0,0,169,170,170,170"); tmap.push_back("89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,89,89,211,209,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89"); - obj.createentity(game, 296, 32, 10, 1, 51540); // (savepoint) - obj.createentity(game, 184, 192, 1, 18, 48, -800, -24, 4000, 264); // Enemy, bounded - obj.createentity(game, 88, 136, 1, 17, 48, -800, -32, 4000, 272); // Enemy, bounded - obj.createentity(game, 184, 80, 1, 18, 48, -800, -32, 4000, 272); // Enemy, bounded + obj.createentity(296, 32, 10, 1, 51540); // (savepoint) + obj.createentity(184, 192, 1, 18, 48, -800, -24, 4000, 264); // Enemy, bounded + obj.createentity(88, 136, 1, 17, 48, -800, -32, 4000, 272); // Enemy, bounded + obj.createentity(184, 80, 1, 18, 48, -800, -32, 4000, 272); // Enemy, bounded - obj.createentity(game, 8, 32, 20, 1); // (terminal) + obj.createentity(8, 32, 20, 1); // (terminal) obj.createblock(5, 8-8, 32, 20, 16, 17); rcol = 3; @@ -545,18 +545,18 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("176,176,176,177,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,177,0,0,0,0,175,176,176,176"); tmap.push_back("95,95,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,257,0,0,0,0,215,95,95,95"); - obj.createentity(game, 288, 200, 10, 1, 52540); // (savepoint) - obj.createentity(game, 48, 16, 1, 1, 10, 0, -40, 320, 296); // Enemy, bounded - obj.createentity(game, 64, 16+8+4+2, 1, 1, 10, 0, -48, 320, 280); // Enemy, bounded - obj.createentity(game, 80, 16+16+8+4, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded - obj.createentity(game, 96, 16+24+12+6, 1, 1, 10, 0, -40, 320, 304); // Enemy, bounded - obj.createentity(game, 112, 16+32+16+8, 1, 1, 10, 0, -48, 320, 288); // Enemy, bounded - obj.createentity(game, 128, 16+40+20+10, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded - obj.createentity(game, 144, 16+48+24+12, 1, 1, 10, 0, -56, 320, 296); // Enemy, bounded - obj.createentity(game, 160, 16+56+28+14, 1, 1, 10, 0, -48, 320, 288); // Enemy, bounded - obj.createentity(game, 176, 16+64+32+16, 1, 1, 10, 0, -48, 320, 296); // Enemy, bounded - obj.createentity(game, 192, 16+72+36+18, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded - obj.createentity(game, 208, 16+80+40+20, 1, 1, 10, 0, -48, 320, 280); // Enemy, bounded + obj.createentity(288, 200, 10, 1, 52540); // (savepoint) + obj.createentity(48, 16, 1, 1, 10, 0, -40, 320, 296); // Enemy, bounded + obj.createentity(64, 16+8+4+2, 1, 1, 10, 0, -48, 320, 280); // Enemy, bounded + obj.createentity(80, 16+16+8+4, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded + obj.createentity(96, 16+24+12+6, 1, 1, 10, 0, -40, 320, 304); // Enemy, bounded + obj.createentity(112, 16+32+16+8, 1, 1, 10, 0, -48, 320, 288); // Enemy, bounded + obj.createentity(128, 16+40+20+10, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded + obj.createentity(144, 16+48+24+12, 1, 1, 10, 0, -56, 320, 296); // Enemy, bounded + obj.createentity(160, 16+56+28+14, 1, 1, 10, 0, -48, 320, 288); // Enemy, bounded + obj.createentity(176, 16+64+32+16, 1, 1, 10, 0, -48, 320, 296); // Enemy, bounded + obj.createentity(192, 16+72+36+18, 1, 1, 10, 0, -40, 320, 280); // Enemy, bounded + obj.createentity(208, 16+80+40+20, 1, 1, 10, 0, -48, 320, 280); // Enemy, bounded rcol = 5; warpy = true; roomname = "Mind The Gap"; @@ -594,17 +594,17 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167"); tmap.push_back("86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86"); - obj.createentity(game, 152, 200, 10, 1, 52530); // (savepoint) - obj.createentity(game, 248, 48, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 152, 48, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 152, 96, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 56, 96, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 104, 144, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 200, 144, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 280, 16, 9, 12); //Shiny Trinket + obj.createentity(152, 200, 10, 1, 52530); // (savepoint) + obj.createentity(248, 48, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(152, 48, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(152, 96, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(56, 96, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(104, 144, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(200, 144, 1, 3, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(280, 16, 9, 12); //Shiny Trinket - obj.createentity(game, 24, 200, 20, 1); // (terminal) + obj.createentity(24, 200, 20, 1); // (terminal) obj.createblock(5, 24-8, 200, 20, 16, 18); rcol = 2; warpx = true; @@ -643,7 +643,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83"); tmap.push_back("83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83"); - obj.createentity(game, 152, 112, 13); + obj.createentity(152, 112, 13); rcol = 1; warpx = true; warpy = true; @@ -682,8 +682,8 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0"); tmap.push_back("0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0"); - obj.createentity(game, 152, 112, 13); - obj.createentity(game, 152, 152, 10, 0, 49550); // (savepoint) + obj.createentity(152, 112, 13); + obj.createentity(152, 152, 10, 0, 49550); // (savepoint) rcol = 4; warpx = true; warpy = true; @@ -722,8 +722,8 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 152, 112, 13); - obj.createentity(game, 136, 40, 10, 1, 52550); // (savepoint) + obj.createentity(152, 112, 13); + obj.createentity(136, 40, 10, 1, 52550); // (savepoint) rcol = 3; warpx = true; warpy = true; @@ -762,8 +762,8 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); tmap.push_back("0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0"); - obj.createentity(game, 152, 112, 13); - obj.createentity(game, 288, 120, 10, 1, 52520); // (savepoint) + obj.createentity(152, 112, 13); + obj.createentity(288, 120, 10, 1, 52520); // (savepoint) rcol = 5; warpx = true; warpy = true; @@ -802,12 +802,12 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("83,83,83,83,83,83,83,83,83,83,83,83,83,205,163,164,164,164,164,164,164,164,164,164,164,165,0,0,0,0,203,83,83,83,83,83,83,83,83,83"); tmap.push_back("83,83,83,83,83,83,83,83,83,83,83,83,83,205,203,83,83,83,83,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,83,83,83"); - obj.createentity(game, 152, 112, 13); - obj.createentity(game, 24, 128, 10, 1, 52510); // (savepoint) - obj.createentity(game, 56, 48, 1, 0, 10, -16, -16, 336, 256); // Enemy, bounded - obj.createentity(game, 264, 48, 1, 0, 10, -16, -16, 336, 256); // Enemy, bounded - obj.createentity(game, 152, 48, 1, 2, 8, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 152, 176, 1, 2, 8, -24, -16, 344, 256); // Enemy, bounded + obj.createentity(152, 112, 13); + obj.createentity(24, 128, 10, 1, 52510); // (savepoint) + obj.createentity(56, 48, 1, 0, 10, -16, -16, 336, 256); // Enemy, bounded + obj.createentity(264, 48, 1, 0, 10, -16, -16, 336, 256); // Enemy, bounded + obj.createentity(152, 48, 1, 2, 8, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(152, 176, 1, 2, 8, -24, -16, 344, 256); // Enemy, bounded rcol = 1; warpx = true; warpy = true; @@ -846,13 +846,13 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit tmap.push_back("86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86"); tmap.push_back("86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86"); - obj.createentity(game, 152, 112, 13); - obj.createentity(game, 248, 16, 1, 0, 10, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 64, 16, 1, 0, 10, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 200, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 152, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 104, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded - obj.createentity(game, 152, 152, 10, 0, 49520); // (savepoint) + obj.createentity(152, 112, 13); + obj.createentity(248, 16, 1, 0, 10, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(64, 16, 1, 0, 10, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(200, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(152, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(104, 56, 1, 2, 5, -24, -24, 344, 256); // Enemy, bounded + obj.createentity(152, 152, 10, 0, 49520); // (savepoint) rcol = 2; warpx = true; warpy = true; @@ -933,7 +933,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit obj.entities[obj.nentity].active = true; obj.nentity++; - obj.createentity(game, 14 * 8, (8 * 8) + 4, 14); //Teleporter! + obj.createentity(14 * 8, (8 * 8) + 4, 14); //Teleporter! obj.entities[obj.nentity - 2].active = false; if(game.intimetrial) @@ -982,7 +982,7 @@ std::vector warpclass::loadlevel(int rx, int ry , Game& game, entit { if(game.companion==0 && obj.flags[11]==0 && !game.crewstats[4]) //also need to check if he's rescued in a previous game { - obj.createentity(game, 255, 121, 15, 0); + obj.createentity(255, 121, 15, 0); obj.createblock(1, 215, 0, 160, 240, 35); } } diff --git a/desktop_version/src/titlerender.cpp b/desktop_version/src/titlerender.cpp index f0345c2a..46b69eda 100644 --- a/desktop_version/src/titlerender.cpp +++ b/desktop_version/src/titlerender.cpp @@ -1499,7 +1499,7 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut for (int i = 0; i < obj.nentity; i++) { //Is this entity on the ground? (needed for jumping) - if (obj.entitycollidefloor(map, i)) + if (obj.entitycollidefloor(i)) { obj.entities[i].onground = 2; } @@ -1508,7 +1508,7 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut obj.entities[i].onground--; } - if (obj.entitycollideroof(map, i)) + if (obj.entitycollideroof(i)) { obj.entities[i].onroof = 2; } @@ -1518,7 +1518,7 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut } //Animate the entities - obj.animateentities(i, game, help); + obj.animateentities(i); } } @@ -2758,7 +2758,7 @@ void towerrender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, U for (int i = 0; i < obj.nentity; i++) { //Is this entity on the ground? (needed for jumping) - if (obj.entitycollidefloor(map, i)) + if (obj.entitycollidefloor(i)) { obj.entities[i].onground = 2; } @@ -2767,7 +2767,7 @@ void towerrender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, U obj.entities[i].onground--; } - if (obj.entitycollideroof(map, i)) + if (obj.entitycollideroof(i)) { obj.entities[i].onroof = 2; } @@ -2777,7 +2777,7 @@ void towerrender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, U } //Animate the entities - obj.animateentities(i, game, help); + obj.animateentities(i); } }