mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:diasurgical/devilution

pull/731/head
Anders Jenbo 6 years ago
parent
2b5b5ca785 8c2fb7605e
commit
cb4cb653e7
4 changed files with 72 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      Source/automap.cpp
  2. 24
      Source/cursor.cpp
  3. 76
      Source/scrollrt.cpp
  4. 8
      defs.h

28
Source/automap.cpp
Unescape View File

@ -77,10 +77,10 @@ void InitAutomap()
for (i = 0; i < 31; i++) {
d = (j << 6) / 100;
AmShiftTab[i] = 2 * (320 / d) + 1;
if (320 % d)
AmShiftTab[i] = 2 * (SCREEN_WIDTH / 2 / d) + 1;
if ((SCREEN_WIDTH / 2) % d)
AmShiftTab[i]++;
if (320 % d >= (j << 5) / 100)
if ((SCREEN_WIDTH / 2) % d >= (j << 5) / 100)
AmShiftTab[i]++;
j += 5;
}
@ -213,7 +213,7 @@ void DrawAutomap()
return;
}
gpBufEnd = &gpBuffer[(PANEL_Y)*BUFFER_WIDTH];
gpBufEnd = &gpBuffer[BUFFER_WIDTH * (SCREEN_Y + VIEWPORT_HEIGHT)];
AutoMapX = (ViewX - 16) >> 1;
while (AutoMapX + AutoMapXOfs < 0)
@ -236,11 +236,11 @@ void DrawAutomap()
mapy = AutoMapY - 1;
if (cells & 1) {
sx = 384 - AmLine64 * ((cells - 1) >> 1);
sy = 336 - AmLine32 * ((cells + 1) >> 1);
sx = SCREEN_WIDTH / 2 + SCREEN_X - AmLine64 * ((cells - 1) >> 1);
sy = (SCREEN_HEIGHT - PANEL_HEIGHT) / 2 + SCREEN_Y - AmLine32 * ((cells + 1) >> 1);
} else {
sx = 384 - AmLine64 * (cells >> 1) + AmLine32;
sy = 336 - AmLine32 * (cells >> 1) - AmLine16;
sx = SCREEN_WIDTH / 2 + SCREEN_X - AmLine64 * (cells >> 1) + AmLine32;
sy = (SCREEN_HEIGHT - PANEL_HEIGHT) / 2 + SCREEN_Y - AmLine32 * (cells >> 1) - AmLine16;
}
if (ViewX & 1) {
sx -= AmLine16;
@ -254,10 +254,10 @@ void DrawAutomap()
sx += AutoMapScale * ScrollInfo._sxoff / 100 >> 1;
sy += AutoMapScale * ScrollInfo._syoff / 100 >> 1;
if (invflag || sbookflag) {
sx -= 160;
sx -= SCREEN_WIDTH / 4;
}
if (chrflag || questlog) {
sx += 160;
sx += SCREEN_WIDTH / 4;
}
for (i = 0; i <= cells + 1; i++) {
@ -497,13 +497,13 @@ void DrawAutomapPlr()
px = x - 2 * AutoMapXOfs - ViewX;
py = y - 2 * AutoMapYOfs - ViewY;
x = (plr[myplr]._pxoff * AutoMapScale / 100 >> 1) + (ScrollInfo._sxoff * AutoMapScale / 100 >> 1) + (px - py) * AmLine16 + 384;
y = (plr[myplr]._pyoff * AutoMapScale / 100 >> 1) + (ScrollInfo._syoff * AutoMapScale / 100 >> 1) + (px + py) * AmLine8 + 336;
x = (plr[myplr]._pxoff * AutoMapScale / 100 >> 1) + (ScrollInfo._sxoff * AutoMapScale / 100 >> 1) + (px - py) * AmLine16 + SCREEN_WIDTH / 2 + SCREEN_X;
y = (plr[myplr]._pyoff * AutoMapScale / 100 >> 1) + (ScrollInfo._syoff * AutoMapScale / 100 >> 1) + (px + py) * AmLine8 + (SCREEN_HEIGHT - PANEL_HEIGHT) / 2 + SCREEN_Y;
if (invflag || sbookflag)
x -= 160;
x -= SCREEN_WIDTH / 4;
if (chrflag || questlog)
x += 160;
x += SCREEN_WIDTH / 4;
y -= AmLine8;
switch (plr[myplr]._pdir) {

24
Source/cursor.cpp
Unescape View File

@ -192,7 +192,7 @@ void CheckCursMove()
if (PANELS_COVER) {
if (chrflag || questlog) {
if (sx >= SCREEN_WIDTH / 4) {
if (sx >= SCREEN_WIDTH / 4) { /// BUGFIX: (sx >= SCREEN_WIDTH / 2)
sx -= SCREEN_WIDTH / 4;
} else {
sx = 0;
@ -215,14 +215,15 @@ void CheckCursMove()
sy >>= 1;
}
// Adjust by player offset
sx -= ScrollInfo._sxoff;
sy -= ScrollInfo._syoff;
// Predict the next frame when walking to avoid input jitter
fx = plr[myplr]._pVar6 / 256;
fy = plr[myplr]._pVar7 / 256;
fx -= (plr[myplr]._pVar6 + plr[myplr]._pxvel) / 256;
fy -= (plr[myplr]._pVar7 + plr[myplr]._pyvel) / 256;
if (ScrollInfo._sdir != SDIR_NONE) {
sx -= fx;
sy -= fy;
@ -241,18 +242,23 @@ void CheckCursMove()
sy = SCREEN_HEIGHT;
}
tx = sx >> 6; // sx / 64
ty = sy >> 5; // sy / 32
px = sx & 0x3F; // sx % 64
py = sy & 0x1F; // sx % 32
mx = ViewX + tx + ty - (zoomflag ? (SCREEN_WIDTH / 64) : (SCREEN_WIDTH / 2 / 64));
// Convert to tile grid
tx = sx >> 6; // sx / TILE_WIDTH
ty = sy >> 5; // sy / TILE_HEIGHT
px = sx & (TILE_WIDTH - 1);
py = sy & (TILE_HEIGHT - 1);
// Center player tile on screen
mx = ViewX + tx + ty - (zoomflag ? (SCREEN_WIDTH / TILE_WIDTH) : (SCREEN_WIDTH / 2 / TILE_WIDTH));
my = ViewY + ty - tx;
// Shift position to match diamond grid aligment
flipy = py < (px >> 1);
if (flipy) {
my--;
}
flipx = py >= 32 - (px >> 1);
flipx = py >= TILE_HEIGHT - (px >> 1);
if (flipx) {
mx++;
}
@ -270,7 +276,7 @@ void CheckCursMove()
my = MAXDUNY - 1;
}
flipflag = flipy && flipx || (flipy || flipx) && px < 32;
flipflag = flipy && flipx || (flipy || flipx) && px < TILE_WIDTH / 2;
pcurstemp = pcursmonst;
pcursmonst = -1;

76
Source/scrollrt.cpp
Unescape View File

@ -538,9 +538,9 @@ static void drawCell(int x, int y, int sx, int sy)
level_cel_block = pMap->mt[2 * i + 1];
if (level_cel_block != 0) {
arch_draw_type = i == 0 ? 2 : 0;
RenderTile(dst + 32);
RenderTile(dst + TILE_WIDTH / 2);
}
dst -= BUFFER_WIDTH * 32;
dst -= BUFFER_WIDTH * TILE_HEIGHT;
}
cel_foliage_active = false;
}
@ -566,7 +566,7 @@ static void drawFloor(int x, int y, int sx, int sy)
arch_draw_type = 2; // Right
level_cel_block = dpiece_defs_map_2[x][y].mt[1];
if (level_cel_block != 0) {
RenderTile(dst + 32);
RenderTile(dst + TILE_WIDTH / 2);
}
}
@ -752,10 +752,10 @@ static void scrollrt_draw_dungeon(int sx, int sy, int dx, int dy)
// Tree leafs should always cover player when entering or leaving the tile,
// So delay the rendering untill after the next row is being drawn.
// This could probably have been better solved by sprites in screen space.
if (sx > 0 && sy > 0 && dy > 32 + SCREEN_Y) {
if (sx > 0 && sy > 0 && dy > TILE_HEIGHT + SCREEN_Y) {
bArch = dSpecial[sx - 1][sy - 1];
if (bArch != 0) {
CelBlitFrame(&gpBuffer[dx + BUFFER_WIDTH * (dy - 32)], pSpecialCels, bArch, 64);
CelBlitFrame(&gpBuffer[dx + BUFFER_WIDTH * (dy - TILE_HEIGHT)], pSpecialCels, bArch, 64);
}
}
}
@ -789,23 +789,23 @@ static void scrollrt_drawFloor(int x, int y, int sx, int sy, int blocks, int chu
}
x++;
y--;
sx += 64;
sx += TILE_WIDTH;
}
// Return to start of row
x -= chunks;
y += chunks;
sx -= chunks * 64;
sy += 16;
sx -= chunks * TILE_WIDTH;
sy += TILE_HEIGHT / 2;
// Jump to next row
if (i & 1) {
x++;
chunks--;
sx += 32;
sx += TILE_WIDTH / 2;
} else {
y++;
chunks++;
sx -= 32;
sx -= TILE_WIDTH / 2;
}
}
}
@ -829,14 +829,14 @@ static void scrollrt_draw(int x, int y, int sx, int sy, int blocks, int chunks)
for (int i = 0; i < (blocks << 1); i++) {
for (int j = 0; j < chunks ; j++) {
if (x >= 0 && x < MAXDUNX && y >= 0 && y < MAXDUNY) {
if (x + 1 < MAXDUNX && y - 1 >= 0 && sx + 64 <= SCREEN_X + SCREEN_WIDTH) {
if (x + 1 < MAXDUNX && y - 1 >= 0 && sx + TILE_WIDTH <= SCREEN_X + SCREEN_WIDTH) {
// Render objects behind walls first to prevent sprites, that are moving
// between tiles, from poking through the walls as they exceed the tile bound.
// A propper fix for this would probably be to layout the sceen and render by
// sprite screen position rather then tile position.
if (IsWall(x, y) && (IsWall(x + 1, y) || (x > 0 && IsWall(x - 1, y)))) { // Part of a wall aligned on the x-axis
if (IsWalktabke(x + 1, y - 1) && IsWalktabke(x, y - 1) ) { // Has wakable area behind it
scrollrt_draw_dungeon(x + 1, y - 1, sx + 64, sy);
scrollrt_draw_dungeon(x + 1, y - 1, sx + TILE_WIDTH, sy);
}
}
}
@ -846,23 +846,23 @@ static void scrollrt_draw(int x, int y, int sx, int sy, int blocks, int chunks)
}
x++;
y--;
sx += 64;
sx += TILE_WIDTH;
}
// Return to start of row
x -= chunks;
y += chunks;
sx -= chunks * 64;
sy += 16;
sx -= chunks * TILE_WIDTH;
sy += TILE_HEIGHT / 2;
// Jump to next row
if (i & 1) {
x++;
chunks--;
sx += 32;
sx += TILE_WIDTH / 2;
} else {
y++;
chunks++;
sx -= 32;
sx -= TILE_WIDTH / 2;
}
}
}
@ -877,27 +877,27 @@ static void DrawGame(int x, int y)
int i, sx, sy, chunks, blocks;
int wdt, nSrcOff, nDstOff;
sx = (SCREEN_WIDTH % 64) / 2;
sy = (VIEWPORT_HEIGHT % 32) / 2;
sx = (SCREEN_WIDTH % TILE_WIDTH) / 2;
sy = (VIEWPORT_HEIGHT % TILE_HEIGHT) / 2;
if (zoomflag) {
chunks = ceil(SCREEN_WIDTH / 64);
blocks = ceil(VIEWPORT_HEIGHT / 32);
chunks = ceil(SCREEN_WIDTH / TILE_WIDTH);
blocks = ceil(VIEWPORT_HEIGHT / TILE_HEIGHT);
gpBufStart = &gpBuffer[BUFFER_WIDTH * SCREEN_Y];
gpBufEnd = &gpBuffer[BUFFER_WIDTH * (VIEWPORT_HEIGHT + SCREEN_Y)];
} else {
sy -= 32;
sy -= TILE_HEIGHT;
chunks = ceil(SCREEN_WIDTH / 2 / 64) + 1; // TODO why +1?
blocks = ceil(VIEWPORT_HEIGHT / 2 / 32);
chunks = ceil(SCREEN_WIDTH / 2 / TILE_WIDTH) + 1; // TODO why +1?
blocks = ceil(VIEWPORT_HEIGHT / 2 / TILE_HEIGHT);
gpBufStart = &gpBuffer[(-17 + SCREEN_Y) * BUFFER_WIDTH];
gpBufEnd = &gpBuffer[(160 + SCREEN_Y) * BUFFER_WIDTH];
gpBufStart = &gpBuffer[(-(TILE_HEIGHT / 2 + 1) + SCREEN_Y) * BUFFER_WIDTH];
gpBufEnd = &gpBuffer[((VIEWPORT_HEIGHT - TILE_HEIGHT) / 2 + SCREEN_Y) * BUFFER_WIDTH];
}
sx += ScrollInfo._sxoff + SCREEN_X;
sy += ScrollInfo._syoff + SCREEN_Y + 15;
sy += ScrollInfo._syoff + SCREEN_Y + TILE_HEIGHT / 2 - 1;
// Center screen
x -= chunks;
@ -911,13 +911,13 @@ static void DrawGame(int x, int y)
if (chrflag || questlog) {
x += 2;
y -= 2;
sx += 288;
sx += SPANEL_WIDTH - TILE_WIDTH / 2;
chunks -= 4;
}
if (invflag || sbookflag) {
x += 2;
y -= 2;
sx -= 32;
sx -= TILE_WIDTH / 2;
chunks -= 4;
}
}
@ -925,13 +925,13 @@ static void DrawGame(int x, int y)
switch (ScrollInfo._sdir) {
case SDIR_N:
sy -= 32;
sy -= TILE_HEIGHT;
x--;
y--;
blocks++;
break;
case SDIR_NE:
sy -= 32;
sy -= TILE_HEIGHT;
x--;
y--;
chunks++;
@ -948,21 +948,21 @@ static void DrawGame(int x, int y)
blocks++;
break;
case SDIR_SW:
sx -= 64;
sx -= TILE_WIDTH;
x--;
y++;
chunks++;
blocks++;
break;
case SDIR_W:
sx -= 64;
sx -= TILE_WIDTH;
x--;
y++;
chunks++;
break;
case SDIR_NW:
sx -= 64;
sy -= 32;
sx -= TILE_WIDTH;
sy -= TILE_HEIGHT;
x -= 2;
chunks++;
blocks++;
@ -979,16 +979,16 @@ static void DrawGame(int x, int y)
if (zoomflag)
return;
nSrcOff = SCREENXY(32, VIEWPORT_HEIGHT / 2 - 17);
nSrcOff = SCREENXY(TILE_WIDTH / 2, VIEWPORT_HEIGHT / 2 - (TILE_HEIGHT / 2 + 1));
nDstOff = SCREENXY(0, VIEWPORT_HEIGHT - 2);
wdt = SCREEN_WIDTH / 2;
if (PANELS_COVER) {
if (chrflag || questlog) {
nSrcOff = SCREENXY(112, VIEWPORT_HEIGHT / 2 - 17);
nSrcOff = SCREENXY(TILE_WIDTH / 2 + SPANEL_WIDTH / 4, VIEWPORT_HEIGHT / 2 - (TILE_HEIGHT / 2 + 1));
nDstOff = SCREENXY(SPANEL_WIDTH, VIEWPORT_HEIGHT - 2);
wdt = (SCREEN_WIDTH - SPANEL_WIDTH) / 2;
} else if (invflag || sbookflag) {
nSrcOff = SCREENXY(112, VIEWPORT_HEIGHT / 2 - 17);
nSrcOff = SCREENXY(TILE_WIDTH / 2 + SPANEL_WIDTH / 4, VIEWPORT_HEIGHT / 2 - (TILE_HEIGHT / 2 + 1));
nDstOff = SCREENXY(0, VIEWPORT_HEIGHT - 2);
wdt = (SCREEN_WIDTH - SPANEL_WIDTH) / 2;
}

8
defs.h
Unescape View File

@ -111,8 +111,8 @@
#define SCREEN_WIDTH 640
#define SCREEN_HEIGHT 480
#define ZOOM_WIDTH 384
#define ZOOM_HEIGHT 224
#define ZOOM_WIDTH (SCREEN_WIDTH / 2 + TILE_WIDTH)
#define ZOOM_HEIGHT (VIEWPORT_HEIGHT / 2 + TILE_HEIGHT + TILE_HEIGHT / 2)
// If defined, use 32-bit colors instead of 8-bit [Default -> Undefined]
//#define RGBMODE
@ -133,7 +133,9 @@
#define BUFFER_WIDTH (BORDER_LEFT + SCREEN_WIDTH + BORDER_RIGHT)
#define BUFFER_HEIGHT (BORDER_TOP + SCREEN_HEIGHT + BORDER_BOTTOM)
#define TILE_SIZE 32
#define TILE_WIDTH 64
#define TILE_HEIGHT 32
#define PANEL_WIDTH 640
#define PANEL_HEIGHT 128

Write Preview
Loading…
Cancel
Save