Commit Graph
271 Commits
Author SHA1 Message Date
Anders Jenbo f5647c4788 Merge branch 'master' of github.com:diasurgical/devilution 2020-09-28 02:11:28 +02:00
Anders Jenbo c2d54ad39e Decompose number 2020-09-28 02:03:40 +02:00
Anders Jenbo 2a3db5f316 Clean up DrawDurIcon 2020-09-28 01:51:51 +02:00
Anders Jenbo 29efef6987 Decompose cords in control_print_talk_msg() 2020-09-27 16:19:57 +02:00
Anders Jenbo cc09635b71 Calculate x posistion of PrintSBookStr 2020-09-27 15:43:43 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Tyler c803c6aa66 Calculate position of screen elements 2020-09-27 00:21:54 +02:00
Anders Jenbo dc8be6c0ab C++03 compatibility (#736)
* Use C++03 compatible constructors
* Remove conflicting definitions
2020-05-17 01:37:19 +02:00
Anders Jenbo 3227fea5c0 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-26 21:44:34 +02:00
qndel b0a8a38462 clean magic numbers 2020-04-26 19:49:05 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo edcd92e012 Misc clean ups that missed last round 2020-04-08 21:47:32 +02:00
Anders Jenbo c3cdc1c4ab Decompose magic numbers 2020-04-08 20:34:31 +02:00
Anders Jenbo 6704657e71 Apply sematic codestyle 2020-04-08 20:34:29 +02:00
Anders Jenbo 7db4ed749a Apply more enums, defines and types 2020-04-08 20:18:11 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo 3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
qndel 29682a296e fix pushed in buttons 2020-04-06 08:26:13 +02:00
qndel 5191237f42 enums and stuff (#2024) 2020-04-06 08:04:14 +02:00
Anders Jenbo 53ccf38a8c Bool types 2020-04-06 05:43:20 +02:00
Anders Jenbo 31181b77c4 Bool comparisons 2020-04-06 05:43:20 +02:00
Anders Jenbo a02167a648 Use correct defines for variables
This also defines MAXRESIST and DEBUGSEEDS
2020-04-06 05:43:20 +02:00
Anders Jenbo 8f635b779c Correct style of checks 2020-04-06 05:43:20 +02:00
Anders Jenbo e8454376d3 Semantically get the first item instead of the array 2020-04-06 05:43:20 +02:00
Anders Jenbo 711665ee96 Assign correct data types 2020-04-06 05:43:20 +02:00
Anders Jenbo cab3ebddf5 Avoid some arrays being of predefined size
This makes it easier to change the array size via content
2020-04-06 05:43:20 +02:00
Anders Jenbo 0a1b4d347c Create defines for spell icons
This will avoids a lot of Hellfire ifdef and generally makes the
caluclations cleaner
2020-04-06 05:43:20 +02:00
Anders Jenbo c39f668deb Enable some asserts that are helpful for testing 2020-04-06 05:43:20 +02:00
Anders Jenbo 95a3aa985a Fix byte shift
There is no issue associated with this for the vanila game as all skills
are within the first 32 spells.
This fix can also be found in Hellfire.
2020-04-01 04:16:11 +02:00
Anders Jenbo 187a021b30 More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz c632e2d1d0 Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
Anders Jenbo d6f70c56ce Format files 2020-03-01 22:48:17 +01:00
Anders Jenbo 3c276a3cd3 Add documentation
- Add file documentation to about 1/4 of the files in Source
- Copy over a lot of the documentation from the sanctuary/notes repo
- Standardise all the existing documentation
- Create a configuration for Doxygen
- Add more documentation (engine.cpp is now fully documented)
2020-03-01 22:18:00 +01:00
Anders Jenbo 58e3192ef9 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #620
2020-02-29 18:18:45 +01:00
galaxyhaxz 81ff8e6287 Metallic hydrogen neural array 2020-02-28 16:35:57 -06:00
qndel d51eee6916 CheckPanelInfo cleanup 2020-02-17 20:59:02 +01:00
Anders Jenbo 9c06b7f60c Merge branch 'master' of github.com:diasurgical/devilution 2020-02-16 05:08:40 +01:00
Anders Jenbo f1616060e5 Document CL2 render functions 2020-02-15 17:06:31 +01:00
Anders Jenbo 25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Anders Jenbo 20621a0642 add all.h and use in place of diablo.h (#2005)
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
2020-02-14 13:12:54 +01:00
Anders Jenbo 40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
qndel c2587d9786 use enums (#1997) 2020-01-28 17:33:34 +01:00
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
qndel 3008439bc7 enums and stuff 2020-01-15 15:46:21 +01:00
Marco 29b9c99e5a added some more values from enums (#1955) 2020-01-14 17:30:13 +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