Commit Graph
226 Commits
Author SHA1 Message Date
Gleb Mazovetskiy 3ae1dc3037 Source/control.cpp: snprintf instead of SDL_itoa
SDL_itoa doesn't exist in Amiga SDL
https://github.com/diasurgical/devilutionX/pull/397#discussion_r371039612
2020-01-27 09:43:28 +01:00
Gleb Mazovetskiy ce5c1007a2 Controller improvements: START modifier and hints
1. Makes START a modifier key.
2. Main modifier actions are now displayed as hints while the modifier is pressed.
3. Mouse simulation now available on all controllers:
   SELECT + D-Pad to move mouse
   SELECT + Left/Right should button to click

 START +    | Action
 ---------- | ------
 SELECT     | Menu
 UP         | Menu
 DOWN       | Map
 LEFT       | Character info
 RIGHT      | Inventory
 B (Bottom) | Spell book
 Y (Left)   | Quest log

This makes all actions available on controllers without sticks and ZL/ZR.
2020-01-25 16:37:50 +01:00
Anders Jenbo 40d272241b Implement --data-dir for setting mpq path
This also implements a much cleaner version of diablo_parse_flags
Fixes #219
2019-12-27 02:05:16 +01:00
Anders Jenbo da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo 0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo 9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo 5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
qndel 981c9b9c00 some cleanup (#1823) 2019-12-02 13:18:45 +01:00
galaxyhaxz 6c0bc83115 Fix type for panelstr 2019-12-01 22:15:31 -06:00
Anders Jenbo af0a7c0653 Apply SPANEL_WIDTH 2019-11-10 22:35:17 +01:00
Anders Jenbo f4496aa7f9 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-09 21:27:06 +01:00
Anders Jenbo cd0a75480d Decompose numbers in DrawSpellList 2019-11-09 21:07:54 +01:00
Anders Jenbo 505701fd48 Decompose numbers in DoSpeedBook 2019-11-09 21:07:54 +01:00
Anders Jenbo 0a882c19a1 Merge branch 'fix_clicking' of https://github.com/qndel/devilutionX 2019-11-09 17:49:39 +01:00
qndel 2afc5862a0 fix chat (#432) 2019-11-09 17:38:33 +01:00
qndel 692a58d324 move speedbook above main panel 2019-11-08 01:21:07 +01:00
qndel 0e0d2d3c34 small fix 2019-11-07 22:56:09 +01:00
qndel 6ec916bbb8 center speedbook horizontally 2019-11-07 22:54:59 +01:00
Anders Jenbo dbc91ae036 Correct mouse interactions for game controller 2019-11-06 02:13:07 +01:00
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