Commit Graph
621 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 0502ba70ea Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-10-13 18:53:49 +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
Anders Jenbo babddf2921 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-10-08 00:35:03 +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
Anders Jenbo fde6c8030b [hellfire] SpellITbl 2019-09-20 10:53:06 +02:00
qndel fa9ee2aa45 Fix hp not showing bug (#1680) 2019-09-18 03:37:22 +02:00
Anders Jenbo 0bdd819ca9 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-18 01:00:24 +02:00
qndel 12435a9317 SetSpell cleanup 2019-09-18 00:35:20 +02:00
galaxyhaxz 282e42b46b Town/misc fixes 2019-09-17 05:39:16 +02:00
qndel 81f965d122 [hellfire] InitControlPan bin exact 2019-09-15 15:43:33 +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 8a78228aba [hellfire] DrawInfoBox bin exact 2019-09-12 11:27:22 +02:00
qndel fdac4d19e7 [hellfire] UpdateLifeFlask bin exact 2019-09-12 11:26:27 +02:00
qndel 48006b22a8 [hellfire] DrawLifeFlask bin exact 2019-09-12 11:25:03 +02:00
qndel 74b6ac4d77 [hellfire] control_press_enter bin exact 2019-09-12 11:23:43 +02:00
qndel 9667c34f0a [hellfire] DrawManaFlask bin exact 2019-09-12 11:23:05 +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 3154ab3bd2 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-03 00:30:42 +02:00
Anders Jenbo e24cbb2423 Clean up init_disable_screensaver 2019-09-01 05:59:44 +02:00
Anders Jenbo 83e62ea8a1 [hellfire] Set up build intergration 2019-08-30 09:55:44 +02:00
Anders Jenbo 27e3696df4 Use consts for drawing ui 2019-08-27 17:55:17 +02:00