Commit graph

207 commits

Author SHA1 Message Date
Anders Jenbo
215ff59e65 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-01 00:06:53 +01:00
galaxyhaxz
67fedd9e99 Fix unknown struct field and drawpanflag 2019-10-31 22:57:15 +01:00
Gleb Mazovetskiy
b18fe49d0a Fix OOB in DrawSpell (#405)
The OOB here was in `_pSplLvl[spl]`.

The value of SPL_INVALID is is `-1`.
The fix is to not access the array when `spl == SPL_INVALID`.
2019-10-30 02:02:35 +01:00
Anders Jenbo
72fbb97dc4 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-30 02:00:58 +01:00
Gleb Mazovetskiy
1b24dac942 Add BUGFIX comment in DrawSpell 2019-10-30 00:30:17 +01:00
Anders Jenbo
5a65eec646 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-28 04:31:30 +01:00
Anders Jenbo
048429b4cd Apply more constants 2019-10-28 04:29:39 +01:00
Anders Jenbo
d46ae517d0 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-28 03:14:06 +01:00
Anders Jenbo
71adfe509e Document more attributes 2019-10-28 03:05:40 +01:00
Anders Jenbo
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
falquinho
c65060ccad Some comments on control functions. 2019-10-26 00:45:11 +02:00
Anders Jenbo
92ab05ea13 Decompose more magic numbers 2019-10-26 00:24:55 +02:00
Mathieu Maret
e35b00acd9 Simplify few loops by using memcpy 2019-10-22 01:33:46 +02:00
Anders Jenbo
3e7d352fde Format files 2019-10-21 20:04:14 +02:00
Anders Jenbo
2348c3a8fd Documentations, enums and clean ups 2019-10-21 19:33:14 +02:00
Anders Jenbo
0d7f87630b Remove width from info panel sy value
This was left behind when doing 337bc9b125
2019-10-20 19:23:20 +02:00
Anders Jenbo
d354bd9767 Lock framerate at vsync instead of 20fps
Since most animations are still controlled by the game logic the only
real benefit is smoother mouse and scrolling text, but it's a start :)
2019-10-20 15:59:47 +02:00
Anders Jenbo
c4a7df80a7 Use CelDraw function for rendering instead of CelBlit
This leaves just town_special, scrollrt arches and left side of
two-handed weapons to be using direct blitting functions.
2019-10-20 15:59:47 +02:00
Anders Jenbo
337bc9b125 Render text in screen cordinates instead of buffer offsets 2019-10-20 15:59:47 +02:00
Anders Jenbo
e8cd0aedfb Use cel functions to blit control panel text 2019-10-20 15:59:47 +02:00
Anders Jenbo
ad7a621e5f Drop PitchTbl to avoid resolution restriction 2019-10-20 15:59:47 +02:00
Anders Jenbo
d1914efa41
Make sens of lineoffset (#1810) 2019-10-16 13:52:28 +02:00
Anders Jenbo
a0baa92ef0 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-13 19:59:26 +02:00
Anders Jenbo
6597688eac Rename cell functions 2019-10-13 13:31:56 +02:00
Anders Jenbo
d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00
Robin Eklind
9bf8332d48
Merge pull request #1360 from diasurgical/ui_consts
Ui consts
2019-10-07 22:54:54 +02:00
Anders Jenbo
d2b1f0cfc8 Apply the Cel helper functions in a few more places 2019-09-30 11:50:18 +02:00
Anders Jenbo
fae2be813a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-28 04:31:04 +02:00
Anders Jenbo
ce6fc51b50 Implement CelGetFrame (CEL decoder helper)
This implements the first of the inlined CEL decoder helper functions
that are still visable in the Mac port code.

Functions are still bin exact
2019-09-27 21:02:44 +02:00
qndel
12435a9317 SetSpell cleanup 2019-09-18 00:35:20 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
Anders Jenbo
cf359d9ea2 Remove server chat 2019-09-13 03:56:47 +02:00
qndel
522f8f07c6 DrawTalkPan cleanup 2019-09-12 11:22:07 +02:00
qndel
4605c6096f control_up_down cleanup 2019-09-12 11:21:18 +02:00
Anders Jenbo
e24cbb2423 Clean up init_disable_screensaver 2019-09-01 05:59:44 +02:00
Anders Jenbo
27e3696df4 Use consts for drawing ui 2019-08-27 17:55:17 +02:00
Anders Jenbo
1f715f86f6 Clean up 2019-08-27 17:06:54 +02:00
Anders Jenbo
dd8df33785 Format source 2019-08-26 15:08:03 +02:00
Anders Jenbo
efc5f4570f Remove duplicate code from control.cpp 2019-08-26 14:52:03 +02:00
Anders Jenbo
f605138c79 Strip ASM code 2019-08-26 13:33:03 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind
98e97351b9 control: rename attribute_inc_rects to ChrBtnsRect
Rationale described in sanctuary/notes@541e63f85a
as included below:

Note, the ChrBtnsRect global doesn't have PSX debug info.
However, the functionality correspond to that of InvRect
of inv.h. Moreover, the we may infer the name from the
function CheckChrBtns, and simply combine the two names.
2019-08-18 07:44:52 +02:00
Anders Jenbo
68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
Anders Jenbo
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo
9d3ce818f0 Correct BOOLS 2019-07-21 19:11:11 +02:00
Anders Jenbo
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Anders Jenbo
e2bff090d6 Come up with names for all remaning arguments 2019-07-21 00:57:53 +02:00
Anders Jenbo
aa50489569 Clean up generated comments 2019-07-21 00:57:53 +02:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Anders Jenbo
3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00