mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-03 03:23:33 +02:00
Code Issues Releases Wiki Activity

game is now fully playable start to finish!

Browse Source
This commit is contained in:
RMGRich 2020-01-18 13:24:52 -06:00
parent 038443428f
commit 6a056a670c
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop_version/src/Finalclass.cpp
View File

@ -12,8 +12,8 @@ std::vector<growing_vector<std::string>> finalclass::loadlevel(int rx, int ry, G
warpx = false;
warpy = false;
bool warped = false;
roomname = "";
roomname = "Untitled room ["+UtilityClass::String(rx) + "," + UtilityClass::String(ry)+"]";
for (int i = 0; i < 3; i++) {
t++;
if (i >= 1 && warpx && !warped) {

16
desktop_version/src/Graphics.cpp
View File

@ -568,6 +568,7 @@ void Graphics::drawtile3(int x, int y, int t, int off, bool flip)
SDL_Surface* temp = SDL_DuplicateSurface(tiles3[t + (off * 30)]);
if (flip) temp = FlipSurfaceHorizontal(temp);
BlitSurfaceStandard(temp, NULL, backBuffer, &rect);
SDL_FreeSurface(temp);
}
void Graphics::drawentcolours(int x, int y, int t)
@ -589,6 +590,7 @@ void Graphics::drawtowertile3(int x, int y, int t, int off, bool flip)
SDL_Surface* temp = SDL_DuplicateSurface(tiles3[t + (off * 30)]);
if (flip) temp = FlipSurfaceHorizontal(temp);
BlitSurfaceStandard(temp, NULL, towerbuffer, &rect);
SDL_FreeSurface(temp);
}
void Graphics::drawgui(UtilityClass& help)
@ -1972,10 +1974,15 @@ void Graphics::drawentities(mapclass& map, entityclass& obj, UtilityClass& help)
if (!map.warpx)
BlitSurfaceStandard(tBuffer, NULL, backBuffer, &rect);
else {
//if (map.currentarea)
for (int k = 0; k < 3; k++) {
rect.x = -267 + (k * 320) - 53;
BlitSurfaceStandard(tBuffer, NULL, backBuffer, &rect);
if (!specialwarp)
for (int k = 0; k < 3; k++) {
rect.x = -267 + (k * 320) - 53;
BlitSurfaceStandard(tBuffer, NULL, backBuffer, &rect);
}
else {
SDL_Rect srcrect = {53, 0, 320, backBuffer->h};
rect.x = 53;
BlitSurfaceStandard(tBuffer, &srcrect, backBuffer, &rect);
}
//drawrect(51, 0, 2, backBuffer->h, 215, 215, 215);
//drawrect(backBuffer->w - 54, 0, 2, backBuffer->h, 215, 215, 215);
@ -2747,7 +2754,6 @@ void Graphics::drawtowerbackground(mapclass& map)
}
}
SDL_BlitSurface(towerbuffer, NULL, backBuffer, NULL);
}
void Graphics::setcol(int t, UtilityClass& help)

2
desktop_version/src/Graphics.h
View File

@ -278,6 +278,8 @@ public:
int warpskip, warpfcol, warpbcol;
bool specialwarp = false;
};
#endif /* GRAPHICS_H */

5
desktop_version/src/main.cpp
View File

@ -412,12 +412,13 @@ int main(int argc, char *argv[])
script.run(key, graphics, game, map, obj, help, music);
}
if (game.swnmode) graphics.specialwarp = true;
else graphics.specialwarp = false;
gameinput(key, graphics, game, map, obj, help, music);
//}
gamerender(graphics,map, game, obj, help);
gamelogic(graphics, game,obj, music, map, help);
}
break;
case MAPMODE: