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

camera movement which is pretty cool

Browse Source
This commit is contained in:
RMGRich 2020-01-18 15:21:07 -06:00
parent 88b1789697
commit 01128cb832
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desktop_version/src/Graphics.cpp
View File

@ -1304,7 +1304,7 @@ bool Graphics::Hitest(SDL_Surface* surface1, point p1, int col, SDL_Surface* sur
void Graphics::drawgravityline(int t, entityclass& obj)
{
line_rect.x += 53;
line_rect.x += 53 + camoff;
if (obj.entities[t].life == 0)
{
switch (linestate)
@ -1970,18 +1970,18 @@ void Graphics::drawentities(mapclass& map, entityclass& obj, UtilityClass& help)
}
SDL_Rect rect;
setRect(rect, 0, 0, backBuffer->w, backBuffer->h);
setRect(rect, camoff, 0, backBuffer->w, backBuffer->h);
if (!map.warpx)
BlitSurfaceStandard(tBuffer, NULL, backBuffer, &rect);
else {
if (!specialwarp)
for (int k = 0; k < 3; k++) {
rect.x = -267 + (k * 320) - 53;
rect.x = -267 + (k * 320) - 53 + camoff;
BlitSurfaceStandard(tBuffer, NULL, backBuffer, &rect);
}
else {
SDL_Rect srcrect = {53, 0, 320, backBuffer->h};
rect.x = 53;
rect.x = 53 + camoff;
BlitSurfaceStandard(tBuffer, &srcrect, backBuffer, &rect);
}
//drawrect(51, 0, 2, backBuffer->h, 215, 215, 215);
@ -2412,13 +2412,16 @@ void Graphics::drawbackground(int t, mapclass& map)
void Graphics::drawmap(mapclass& map, int k, bool c)
{
mapoff = -267 + (k * 320);
if (c) foregrounddrawn = false;
mapoff = -267 + (k * 320) + camoff;
if (c) {
foregrounddrawn = false;
}
///TODO forground once;
if (!foregrounddrawn)
{
if (c)
if (c) {
FillRect(foregroundBuffer, 0xDEADBEEF);
}
if (map.tileset == 0)
{
for (j = 0; j < 29 + map.extrarow; j++)
@ -3230,7 +3233,7 @@ void Graphics::drawtele(int x, int y, int t, int c, UtilityClass& help)
setcolreal(getRGB(16, 16, 16));
SDL_Rect telerect;
setRect(telerect, x + 53, y, tele_rect.w, tele_rect.h);
setRect(telerect, x + 53 + camoff, y, tele_rect.w, tele_rect.h);
BlitSurfaceColoured(tele[0], NULL, backBuffer, &telerect, ct);
setcol(c, help);

1
desktop_version/src/Graphics.h
View File

@ -280,6 +280,7 @@ public:
int warpskip, warpfcol, warpbcol;
bool specialwarp = false;
int camoff = 0;
};

4
desktop_version/src/Logic.cpp
View File

@ -1200,11 +1200,13 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music,
if (game.door_left > -2 && obj.entities[player].xp < -14)
{
obj.entities[player].xp += 320;
dwgfx.camoff -= 320;
map.gotoroom(game.roomx - 1, game.roomy, dwgfx, game, obj, music);
}
if (game.door_right > -2 && obj.entities[player].xp >= 308)
{
obj.entities[player].xp -= 320;
dwgfx.camoff += 320;
map.gotoroom(game.roomx + 1, game.roomy, dwgfx, game, obj, music);
}
}
@ -1225,11 +1227,13 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music,
if (game.door_left > -2 && obj.entities[player].xp < -14)
{
obj.entities[player].xp += 320;
dwgfx.camoff -= 320;
map.gotoroom(game.roomx - 1, game.roomy, dwgfx, game, obj, music);
}
if (game.door_right > -2 && obj.entities[player].xp >= 308)
{
obj.entities[player].xp -= 320;
dwgfx.camoff += 320;
map.gotoroom(game.roomx + 1, game.roomy, dwgfx, game, obj, music);
}
}

2
desktop_version/src/Textbox.cpp
View File

@ -135,7 +135,7 @@ void textboxclass::resize()
max = 0;
for (int iter = 0; iter < numlines; iter++)
{
if (!custom.empty()) line[iter] = custom;
if (!custom.empty()) line[iter] = custom;
auto len = utf8::distance(line[iter].begin(), line[iter].end());
if (len > (unsigned int)max) max = len;
}

3
desktop_version/src/titlerender.cpp
View File

@ -1528,6 +1528,9 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut
{
if (dwgfx.camoff > 0) dwgfx.camoff -= 64;
else if (dwgfx.camoff < 0) dwgfx.camoff += 64;
if (!game.blackout)
{