mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Remove global args from mapclass

Browse source 
This commit removes the global args being passed around from the
function args on the mapclass object, as well as updating all callers in
other files to not have those args. Furthermore, 'dwgfx' has been
renamed to 'graphics' in Map.cpp.
This commit is contained in:
Misa 2020-03-31 01:09:42 -07:00 committed by Ethan Lee
parent cac1a9e3ab
commit 35d9bcce05
4 changed files with 127 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
desktop_version/src/Logic.cpp
View file

@ -290,7 +290,7 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
game.gravitycontrol = game.savegc; game.gravitycontrol = game.savegc;
dwgfx.textboxremove(); dwgfx.textboxremove();
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
} }
} }
@ -391,13 +391,13 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
if (game.door_left > -2 && obj.entities[player].xp < -14) if (game.door_left > -2 && obj.entities[player].xp < -14)
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
map.gotoroom(48, 52, dwgfx, game, obj, music); map.gotoroom(48, 52);
} }
if (game.door_right > -2 && obj.entities[player].xp >= 308) if (game.door_right > -2 && obj.entities[player].xp >= 308)
{ {
obj.entities[player].xp -= 320; obj.entities[player].xp -= 320;
obj.entities[player].yp -= (71*8); obj.entities[player].yp -= (71*8);
map.gotoroom(game.roomx + 1, game.roomy+1, dwgfx, game, obj, music); map.gotoroom(game.roomx + 1, game.roomy+1);
} }
} }
else else
@ -410,18 +410,18 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
obj.entities[player].yp -= (71 * 8); obj.entities[player].yp -= (71 * 8);
map.gotoroom(50, 54, dwgfx, game, obj, music); map.gotoroom(50, 54);
} }
else else
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
map.gotoroom(50, 53, dwgfx, game, obj, music); map.gotoroom(50, 53);
} }
} }
if (game.door_right > -2 && obj.entities[player].xp >= 308) if (game.door_right > -2 && obj.entities[player].xp >= 308)
{ {
obj.entities[player].xp -= 320; obj.entities[player].xp -= 320;
map.gotoroom(52, 53, dwgfx, game, obj, music); map.gotoroom(52, 53);
} }
} }
} }
@ -453,12 +453,12 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
obj.entities[player].yp -= (671 * 8); obj.entities[player].yp -= (671 * 8);
map.gotoroom(108, 109, dwgfx, game, obj, music); map.gotoroom(108, 109);
} }
if (game.door_right > -2 && obj.entities[player].xp >= 308) if (game.door_right > -2 && obj.entities[player].xp >= 308)
{ {
obj.entities[player].xp -= 320; obj.entities[player].xp -= 320;
map.gotoroom(110, 104, dwgfx, game, obj, music); map.gotoroom(110, 104);
} }
} }
} }
@ -678,7 +678,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
game.gravitycontrol = game.savegc; game.gravitycontrol = game.savegc;
dwgfx.textboxremove(); dwgfx.textboxremove();
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
} }
} }
@ -700,7 +700,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
temp = 1+int(fRandom() * 6); temp = 1+int(fRandom() * 6);
if (temp == map.final_mapcol) temp = (temp + 1) % 6; if (temp == map.final_mapcol) temp = (temp + 1) % 6;
if (temp == 0) temp = 6; if (temp == 0) temp = 6;
map.changefinalcol(temp, obj,game); map.changefinalcol(temp);
} }
else if (map.final_colorframe == 2) else if (map.final_colorframe == 2)
{ {
@ -708,7 +708,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
temp = 1+int(fRandom() * 6); temp = 1+int(fRandom() * 6);
if (temp == map.final_mapcol) temp = (temp + 1) % 6; if (temp == map.final_mapcol) temp = (temp + 1) % 6;
if (temp == 0) temp = 6; if (temp == 0) temp = 6;
map.changefinalcol(temp, obj,game); map.changefinalcol(temp);
} }
} }
} }
@ -1145,12 +1145,12 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
if (game.door_down > -2 && obj.entities[player].yp >= 238) if (game.door_down > -2 && obj.entities[player].yp >= 238)
{ {
obj.entities[player].yp -= 240; obj.entities[player].yp -= 240;
map.gotoroom(game.roomx, game.roomy + 1, dwgfx, game, obj, music); map.gotoroom(game.roomx, game.roomy + 1);
} }
if (game.door_up > -2 && obj.entities[player].yp < -2) if (game.door_up > -2 && obj.entities[player].yp < -2)
{ {
obj.entities[player].yp += 240; obj.entities[player].yp += 240;
map.gotoroom(game.roomx, game.roomy - 1, dwgfx, game, obj, music); map.gotoroom(game.roomx, game.roomy - 1);
} }
} }
else if (map.warpy) else if (map.warpy)
@ -1197,12 +1197,12 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
if (game.door_left > -2 && obj.entities[player].xp < -14) if (game.door_left > -2 && obj.entities[player].xp < -14)
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
map.gotoroom(game.roomx - 1, game.roomy, dwgfx, game, obj, music); map.gotoroom(game.roomx - 1, game.roomy);
} }
if (game.door_right > -2 && obj.entities[player].xp >= 308) if (game.door_right > -2 && obj.entities[player].xp >= 308)
{ {
obj.entities[player].xp -= 320; obj.entities[player].xp -= 320;
map.gotoroom(game.roomx + 1, game.roomy, dwgfx, game, obj, music); map.gotoroom(game.roomx + 1, game.roomy);
} }
} }
else else
@ -1212,22 +1212,22 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
if (game.door_down > -2 && obj.entities[player].yp >= 238) if (game.door_down > -2 && obj.entities[player].yp >= 238)
{ {
obj.entities[player].yp -= 240; obj.entities[player].yp -= 240;
map.gotoroom(game.roomx, game.roomy + 1, dwgfx, game, obj, music); map.gotoroom(game.roomx, game.roomy + 1);
} }
if (game.door_up > -2 && obj.entities[player].yp < -2) if (game.door_up > -2 && obj.entities[player].yp < -2)
{ {
obj.entities[player].yp += 240; obj.entities[player].yp += 240;
map.gotoroom(game.roomx, game.roomy - 1, dwgfx, game, obj, music); map.gotoroom(game.roomx, game.roomy - 1);
} }
if (game.door_left > -2 && obj.entities[player].xp < -14) if (game.door_left > -2 && obj.entities[player].xp < -14)
{ {
obj.entities[player].xp += 320; obj.entities[player].xp += 320;
map.gotoroom(game.roomx - 1, game.roomy, dwgfx, game, obj, music); map.gotoroom(game.roomx - 1, game.roomy);
} }
if (game.door_right > -2 && obj.entities[player].xp >= 308) if (game.door_right > -2 && obj.entities[player].xp >= 308)
{ {
obj.entities[player].xp -= 320; obj.entities[player].xp -= 320;
map.gotoroom(game.roomx + 1, game.roomy, dwgfx, game, obj, music); map.gotoroom(game.roomx + 1, game.roomy);
} }
} }
@ -1241,7 +1241,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
edi2 = (edi-(edi%40))/40; edi2 = (edi-(edi%40))/40;
edj2 = (edj-(edj%30))/30; edj2 = (edj-(edj%30))/30;
map.warpto(100+edi2, 100+edj2, obj.getplayer(), edi%40, (edj%30)+2, dwgfx, game, obj, music); map.warpto(100+edi2, 100+edj2, obj.getplayer(), edi%40, (edj%30)+2);
game.teleport = false; game.teleport = false;
if (game.teleport == false) if (game.teleport == false)
@ -1257,56 +1257,56 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].yp = 225; obj.entities[i].yp = 225;
map.gotoroom(119, 100, dwgfx, game, obj, music); map.gotoroom(119, 100);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 119 && game.roomy == 100) else if (game.roomx == 119 && game.roomy == 100)
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].yp = 225; obj.entities[i].yp = 225;
map.gotoroom(119, 103, dwgfx, game, obj, music); map.gotoroom(119, 103);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 119 && game.roomy == 103) else if (game.roomx == 119 && game.roomy == 103)
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].xp = 0; obj.entities[i].xp = 0;
map.gotoroom(116, 103, dwgfx, game, obj, music); map.gotoroom(116, 103);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 116 && game.roomy == 103) else if (game.roomx == 116 && game.roomy == 103)
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].yp = 225; obj.entities[i].yp = 225;
map.gotoroom(116, 100, dwgfx, game, obj, music); map.gotoroom(116, 100);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 116 && game.roomy == 100) else if (game.roomx == 116 && game.roomy == 100)
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].xp = 0; obj.entities[i].xp = 0;
map.gotoroom(114, 102, dwgfx, game, obj, music); map.gotoroom(114, 102);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 114 && game.roomy == 102) else if (game.roomx == 114 && game.roomy == 102)
{ {
int i = obj.getplayer(); int i = obj.getplayer();
obj.entities[i].yp = 225; obj.entities[i].yp = 225;
map.gotoroom(113, 100, dwgfx, game, obj, music); map.gotoroom(113, 100);
game.teleport = false; game.teleport = false;
} }
else if (game.roomx == 116 && game.roomy == 104) else if (game.roomx == 116 && game.roomy == 104)
{ {
//pre warp zone here //pre warp zone here
map.warpto(107, 101, obj.getplayer(), 14, 16, dwgfx, game, obj, music); map.warpto(107, 101, obj.getplayer(), 14, 16);
} }
else if (game.roomx == 107 && game.roomy == 101) else if (game.roomx == 107 && game.roomy == 101)
{ {
map.warpto(105, 119, obj.getplayer(), 5, 26, dwgfx, game, obj, music); map.warpto(105, 119, obj.getplayer(), 5, 26);
} }
else if (game.roomx == 105 && game.roomy == 118) else if (game.roomx == 105 && game.roomy == 118)
{ {
map.warpto(101, 111, obj.getplayer(), 34, 6, dwgfx, game, obj, music); map.warpto(101, 111, obj.getplayer(), 34, 6);
} }
else if (game.roomx == 101 && game.roomy == 111) else if (game.roomx == 101 && game.roomy == 111)
{ {
@ -1314,31 +1314,31 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
switch(game.teleportxpos) switch(game.teleportxpos)
{ {
case 1: case 1:
map.warpto(108, 108, obj.getplayer(), 4, 27, dwgfx, game, obj, music); map.warpto(108, 108, obj.getplayer(), 4, 27);
break; break;
case 2: case 2:
map.warpto(101, 111, obj.getplayer(), 12, 27, dwgfx, game, obj, music); map.warpto(101, 111, obj.getplayer(), 12, 27);
break; break;
case 3: case 3:
map.warpto(119, 111, obj.getplayer(), 31, 7, dwgfx, game, obj, music); map.warpto(119, 111, obj.getplayer(), 31, 7);
break; break;
case 4: case 4:
map.warpto(114, 117, obj.getplayer(), 19, 16, dwgfx, game, obj, music); map.warpto(114, 117, obj.getplayer(), 19, 16);
break; break;
} }
} }
else if (game.roomx == 108 && game.roomy == 106) else if (game.roomx == 108 && game.roomy == 106)
{ {
map.warpto(119, 111, obj.getplayer(), 4, 27, dwgfx, game, obj, music); map.warpto(119, 111, obj.getplayer(), 4, 27);
} }
else if (game.roomx == 100 && game.roomy == 111) else if (game.roomx == 100 && game.roomy == 111)
{ {
map.warpto(101, 111, obj.getplayer(), 24, 6, dwgfx, game, obj, music); map.warpto(101, 111, obj.getplayer(), 24, 6);
} }
else if (game.roomx == 119 && game.roomy == 107) else if (game.roomx == 119 && game.roomy == 107)
{ {
//Secret lab, to super gravitron //Secret lab, to super gravitron
map.warpto(119, 108, obj.getplayer(), 19, 10, dwgfx, game, obj, music); map.warpto(119, 108, obj.getplayer(), 19, 10);
} }
if (game.teleport == false) if (game.teleport == false)
{ {

64
desktop_version/src/Map.cpp
View file

@ -515,7 +515,7 @@ int mapclass::maptiletoenemycol(int t)
return 11; return 11;
} }
void mapclass::changefinalcol(int t, entityclass& obj, Game& game) void mapclass::changefinalcol(int t)
{ {
//change the map to colour t - for the game's final stretch. //change the map to colour t - for the game's final stretch.
//First up, the tiles. This is just a setting: //First up, the tiles. This is just a setting:
@ -819,12 +819,12 @@ void mapclass::showship()
explored[4 + (11 * 20)] = 1; explored[4 + (11 * 20)] = 1;
} }
void mapclass::resetplayer(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music) void mapclass::resetplayer()
{ {
bool was_in_tower = towermode; bool was_in_tower = towermode;
if (game.roomx != game.saverx || game.roomy != game.savery) if (game.roomx != game.saverx || game.roomy != game.savery)
{ {
gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); gotoroom(game.saverx, game.savery);
} }
game.deathseq = -1; game.deathseq = -1;
@ -876,16 +876,16 @@ void mapclass::resetplayer(Graphics& dwgfx, Game& game, entityclass& obj, musicc
} }
} }
void mapclass::warpto(int rx, int ry , int t, int tx, int ty, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music) void mapclass::warpto(int rx, int ry , int t, int tx, int ty)
{ {
gotoroom(rx, ry, dwgfx, game, obj, music); gotoroom(rx, ry);
game.teleport = false; game.teleport = false;
obj.entities[t].xp = tx * 8; obj.entities[t].xp = tx * 8;
obj.entities[t].yp = (ty * 8) - obj.entities[t].h; obj.entities[t].yp = (ty * 8) - obj.entities[t].h;
game.gravitycontrol = 0; game.gravitycontrol = 0;
} }
void mapclass::gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music) void mapclass::gotoroom(int rx, int ry)
{ {
//First, destroy the current room //First, destroy the current room
obj.removeallblocks(); obj.removeallblocks();
@ -999,7 +999,7 @@ void mapclass::gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass
if (game.roomx == 107 && game.roomy == 109) music.niceplay(4); if (game.roomx == 107 && game.roomy == 109) music.niceplay(4);
if (game.roomx == 108 && game.roomy == 109) if (game.roomx == 108 && game.roomy == 109)
{ {
if (dwgfx.setflipmode) if (graphics.setflipmode)
{ {
music.niceplay(9); music.niceplay(9);
} }
@ -1010,7 +1010,7 @@ void mapclass::gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass
} }
if (game.roomx == 109) if (game.roomx == 109)
{ {
if (dwgfx.setflipmode) if (graphics.setflipmode)
{ {
music.niceplay(9); music.niceplay(9);
} }
@ -1053,7 +1053,7 @@ void mapclass::gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass
if (game.roomx == 104 && game.roomy == 112) music.niceplay(4); if (game.roomx == 104 && game.roomy == 112) music.niceplay(4);
} }
temp = rx + (ry * 100); temp = rx + (ry * 100);
loadlevel(game.roomx, game.roomy, dwgfx, game, obj, music); loadlevel(game.roomx, game.roomy);
//Do we need to reload the background? //Do we need to reload the background?
@ -1061,9 +1061,9 @@ void mapclass::gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass
if(redrawbg) if(redrawbg)
{ {
dwgfx.backgrounddrawn = false; //Used for background caching speedup graphics.backgrounddrawn = false; //Used for background caching speedup
} }
dwgfx.foregrounddrawn = false; //Used for background caching speedup graphics.foregrounddrawn = false; //Used for background caching speedup
game.prevroomx = game.roomx; game.prevroomx = game.roomx;
game.prevroomy = game.roomy; game.prevroomy = game.roomy;
@ -1174,7 +1174,7 @@ std::string mapclass::currentarea(int t)
return "???"; return "???";
} }
void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music) void mapclass::loadlevel(int rx, int ry)
{ {
int t; int t;
//t = rx + (ry * 100); //t = rx + (ry * 100);
@ -1287,13 +1287,13 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
{ {
//in the secret lab! Crazy background! //in the secret lab! Crazy background!
background = 2; background = 2;
if (rx == 116 && ry == 105) dwgfx.rcol = 1; if (rx == 116 && ry == 105) graphics.rcol = 1;
if (rx == 117 && ry == 105) dwgfx.rcol = 5; if (rx == 117 && ry == 105) graphics.rcol = 5;
if (rx == 118 && ry == 105) dwgfx.rcol = 4; if (rx == 118 && ry == 105) graphics.rcol = 4;
if (rx == 117 && ry == 106) dwgfx.rcol = 2; if (rx == 117 && ry == 106) graphics.rcol = 2;
if (rx == 118 && ry == 106) dwgfx.rcol = 0; if (rx == 118 && ry == 106) graphics.rcol = 0;
if (rx == 119 && ry == 106) dwgfx.rcol = 3; if (rx == 119 && ry == 106) graphics.rcol = 3;
if (rx == 119 && ry == 107) dwgfx.rcol = 1; if (rx == 119 && ry == 107) graphics.rcol = 1;
} }
} }
} }
@ -1304,7 +1304,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
if (rx == 119 && ry == 108 && !custommode) if (rx == 119 && ry == 108 && !custommode)
{ {
background = 5; background = 5;
dwgfx.rcol = 3; graphics.rcol = 3;
warpx = true; warpx = true;
warpy = true; warpy = true;
} }
@ -1334,7 +1334,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
roomname = lablevel.roomname; roomname = lablevel.roomname;
tileset = 1; tileset = 1;
background = 2; background = 2;
dwgfx.rcol = lablevel.rcol; graphics.rcol = lablevel.rcol;
break; break;
case 3: //The Tower case 3: //The Tower
tdrawback = true; tdrawback = true;
@ -1380,8 +1380,8 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
roomname = warplevel.roomname; roomname = warplevel.roomname;
tileset = 1; tileset = 1;
background = 3; background = 3;
dwgfx.rcol = warplevel.rcol; graphics.rcol = warplevel.rcol;
dwgfx.backgrounddrawn = false; graphics.backgrounddrawn = false;
warpx = warplevel.warpx; warpx = warplevel.warpx;
warpy = warplevel.warpy; warpy = warplevel.warpy;
@ -1402,8 +1402,8 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
roomname = finallevel.roomname; roomname = finallevel.roomname;
tileset = 1; tileset = 1;
background = 3; background = 3;
dwgfx.rcol = finallevel.rcol; graphics.rcol = finallevel.rcol;
dwgfx.backgrounddrawn = false; graphics.backgrounddrawn = false;
if (finalstretch) if (finalstretch)
{ {
@ -1419,8 +1419,8 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
if (warpx && warpy) background = 5; if (warpx && warpy) background = 5;
} }
dwgfx.rcol = 6; graphics.rcol = 6;
changefinalcol(final_mapcol, obj, game); changefinalcol(final_mapcol);
break; break;
case 7: //Final Level, Tower 1 case 7: //Final Level, Tower 1
tdrawback = true; tdrawback = true;
@ -1589,7 +1589,7 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
case 2: //Lab case 2: //Lab
tileset = 1; tileset = 1;
background = 2; background = 2;
dwgfx.rcol = ed.level[curlevel].tilecol; graphics.rcol = ed.level[curlevel].tilecol;
break; break;
case 3: //Warp Zone/intermission case 3: //Warp Zone/intermission
tileset = 1; tileset = 1;
@ -1608,21 +1608,21 @@ void mapclass::loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclas
//If screen warping, then override all that: //If screen warping, then override all that:
bool redrawbg = game.roomx != game.prevroomx || game.roomy != game.prevroomy; bool redrawbg = game.roomx != game.prevroomx || game.roomy != game.prevroomy;
if(redrawbg){ if(redrawbg){
dwgfx.backgrounddrawn = false; graphics.backgrounddrawn = false;
} }
if(ed.level[curlevel].warpdir>0){ if(ed.level[curlevel].warpdir>0){
if(ed.level[curlevel].warpdir==1){ if(ed.level[curlevel].warpdir==1){
warpx=true; warpx=true;
background=3; background=3;
dwgfx.rcol = ed.getwarpbackground(rx-100,ry-100); graphics.rcol = ed.getwarpbackground(rx-100,ry-100);
}else if(ed.level[curlevel].warpdir==2){ }else if(ed.level[curlevel].warpdir==2){
warpy=true; warpy=true;
background=4; background=4;
dwgfx.rcol = ed.getwarpbackground(rx-100,ry-100); graphics.rcol = ed.getwarpbackground(rx-100,ry-100);
}else if(ed.level[curlevel].warpdir==3){ }else if(ed.level[curlevel].warpdir==3){
warpx=true; warpy=true; warpx=true; warpy=true;
background = 5; background = 5;
dwgfx.rcol = ed.getwarpbackground(rx-100,ry-100); graphics.rcol = ed.getwarpbackground(rx-100,ry-100);
} }
} }

10
desktop_version/src/Map.h
View file

@ -44,7 +44,7 @@ public:
int maptiletoenemycol(int t); int maptiletoenemycol(int t);
void changefinalcol(int t, entityclass& obj, Game& game); void changefinalcol(int t);
void setcol(const int r1, const int g1, const int b1 , const int r2, const int g2, const int b2, const int c); void setcol(const int r1, const int g1, const int b1 , const int r2, const int g2, const int b2, const int c);
@ -73,15 +73,15 @@ public:
void showship(); void showship();
void resetplayer(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music); void resetplayer();
void warpto(int rx, int ry , int t, int tx, int ty, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music); void warpto(int rx, int ry , int t, int tx, int ty);
void gotoroom(int rx, int ry, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music); void gotoroom(int rx, int ry);
std::string currentarea(int t); std::string currentarea(int t);
void loadlevel(int rx, int ry, Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music); void loadlevel(int rx, int ry);
std::vector <int> roomdeaths; std::vector <int> roomdeaths;

108
desktop_version/src/Script.cpp
View file

@ -280,7 +280,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
if (words[0] == "gotoroom") if (words[0] == "gotoroom")
{ {
//USAGE: gotoroom(x,y) (manually add 100) //USAGE: gotoroom(x,y) (manually add 100)
map.gotoroom(ss_toi(words[1])+100, ss_toi(words[2])+100, dwgfx, game, obj, music); map.gotoroom(ss_toi(words[1])+100, ss_toi(words[2])+100);
} }
if (words[0] == "cutscene") if (words[0] == "cutscene")
{ {
@ -1462,7 +1462,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
{ {
map.resetnames(); map.resetnames();
map.resetmap(); map.resetmap();
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
map.tdrawback = true; map.tdrawback = true;
obj.resetallflags(); obj.resetallflags();
@ -1518,7 +1518,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
map.finaly = ss_toi(words[2]); map.finaly = ss_toi(words[2]);
game.roomx = map.finalx; game.roomx = map.finalx;
game.roomy = map.finaly; game.roomy = map.finaly;
map.gotoroom(game.roomx, game.roomy, dwgfx, game, obj, music); map.gotoroom(game.roomx, game.roomy);
} }
else if (words[0] == "rescued") else if (words[0] == "rescued")
{ {
@ -1983,7 +1983,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
game.savepoint = 0; game.savepoint = 0;
game.gravitycontrol = 0; game.gravitycontrol = 0;
map.gotoroom(46, 54, dwgfx, game, obj, music); map.gotoroom(46, 54);
} }
else if (words[0] == "telesave") else if (words[0] == "telesave")
{ {
@ -2562,9 +2562,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intro"); load("intro");
break; break;
@ -2585,9 +2585,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 2: //Load Quicksave case 2: //Load Quicksave
@ -2607,13 +2607,13 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
//a very special case for here needs to ensure that the tower is set correctly //a very special case for here needs to ensure that the tower is set correctly
if (map.towermode) if (map.towermode)
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
i = obj.getplayer(); i = obj.getplayer();
map.ypos = obj.entities[i].yp - 120; map.ypos = obj.entities[i].yp - 120;
@ -2646,9 +2646,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 4: case 4:
@ -2674,9 +2674,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 5: case 5:
@ -2702,9 +2702,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 6: case 6:
@ -2730,9 +2730,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 7: case 7:
@ -2758,9 +2758,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 8: case 8:
@ -2792,9 +2792,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 9: case 9:
@ -2817,9 +2817,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intro"); load("intro");
@ -2846,9 +2846,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intro"); load("intro");
@ -2882,9 +2882,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
music.play(11); music.play(11);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
@ -2917,9 +2917,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_1"); load("intermission_1");
break; break;
@ -2952,9 +2952,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_1"); load("intermission_1");
break; break;
@ -2987,9 +2987,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_1"); load("intermission_1");
break; break;
@ -3022,9 +3022,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_1"); load("intermission_1");
break; break;
@ -3054,9 +3054,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_2"); load("intermission_2");
break; break;
@ -3086,9 +3086,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_2"); load("intermission_2");
break; break;
@ -3118,9 +3118,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_2"); load("intermission_2");
break; break;
@ -3150,9 +3150,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
load("intermission_2"); load("intermission_2");
break; break;
@ -3173,9 +3173,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
dwgfx.fademode = 4; dwgfx.fademode = 4;
break; break;
case 21: //play custom level (in editor) case 21: //play custom level (in editor)
@ -3210,9 +3210,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
if(ed.levmusic>0){ if(ed.levmusic>0){
music.play(ed.levmusic); music.play(ed.levmusic);
}else{ }else{
@ -3249,9 +3249,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
ed.generatecustomminimap(dwgfx, map); ed.generatecustomminimap(dwgfx, map);
map.customshowmm=true; map.customshowmm=true;
@ -3295,9 +3295,9 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
} }
else else
{ {
map.resetplayer(dwgfx, game, obj, music); map.resetplayer();
} }
map.gotoroom(game.saverx, game.savery, dwgfx, game, obj, music); map.gotoroom(game.saverx, game.savery);
/* Handled by load /* Handled by load
if(ed.levmusic>0){ if(ed.levmusic>0){
music.play(ed.levmusic); music.play(ed.levmusic);
@ -3342,7 +3342,7 @@ void scriptclass::teleport( Graphics& dwgfx, Game& game, mapclass& map, entitycl
} }
game.gravitycontrol = 0; game.gravitycontrol = 0;
map.gotoroom(100+game.teleport_to_x, 100+game.teleport_to_y, dwgfx, game, obj, music); map.gotoroom(100+game.teleport_to_x, 100+game.teleport_to_y);
j = obj.getteleporter(); j = obj.getteleporter();
obj.entities[j].state = 2; obj.entities[j].state = 2;
game.teleport_to_new_area = false; game.teleport_to_new_area = false;