Commit Graph
72 Commits
Author SHA1 Message Date
Anders Jenbo ac8a2a410e Fix building Hellfire with CLang 2020-10-19 06:33:17 +02:00
Anders Jenbo ad2ac2aeeb Merge branch 'master' of github.com:diasurgical/devilution 2020-10-15 03:55:36 +02:00
Anders Jenbo 77038ddd77 Share pDiabloKillLevel in UnPackPlayer
pDiabloKillLevel is handled the same so no reason for ifdefing it
2020-10-15 03:47:01 +02:00
Anders Jenbo bd5c7233d4 Add missing bit to UnPackPlayer
Ther is still a small diff, but should be functinoally identical
2020-10-15 03:32:32 +02:00
Anders Jenbo 57326c6c7f Merge branch 'master' of github.com:diasurgical/devilution 2020-10-14 11:02:48 +02:00
Anders Jenbo c5d02b21bd Load hellfire spells from hero save 2020-10-14 08:57:43 +02:00
Anders Jenbo 2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel b0142637b7 Ear cleanup #2 (#2100) 2020-10-12 00:14:24 +02:00
Anders Jenbo 7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Troy Bronzan 8960450560 Fixed player base block is zero bug after loading a new game. This value is not saved in single player or multiplayer, so when a character is loaded, the value is always zero. Now when a player is loaded, it is set to the default. See section 2.1.4 in Jarulf's Guide. 2020-09-17 13:39:31 +02:00
Anders Jenbo 1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo 3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo cc0f92d45b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 06:09:30 +02:00
Anders Jenbo e8454376d3 Semantically get the first item instead of the array 2020-04-06 05:43:20 +02:00
Anders Jenbo b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02: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 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
Samuel-DEVULDER 9c516819c1 Make save game code big-endian compatible 2020-01-27 00:03:02 +01:00
Anders Jenbo 85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
Anders Jenbo c86ab3bed3 Merge branch 'master' of github.com:diasurgical/devilution 2019-11-17 21:46:59 +01:00
Robin Eklind c583d82a1c pack: use IDI_GOLD enum instead of boolean operation for is->IDidx 2019-11-13 13:55:22 -06:00
Anders Jenbo b6695fe26b Merge branch 'master' of github.com:diasurgical/devilution 2019-11-04 21:33:38 +01:00
galaxyhaxz 3bd28cc0c1 Fix function order [spells+pack.cpp] 2019-11-03 14:45:32 +01: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
qndel 7129558d0b apply enums 2019-10-05 15:24:44 +02:00
Robin Eklind d16f603537 all: remove unused storm imports
While no storm functions are called from these source files
it is determined that they included storm in the original
source files as made visible by the inclusion of infinity
in the data segments of the respective source files.

ref: diasurgical/devilution#1695.
2019-09-20 11:05:25 +02:00
Anders Jenbo 0bdd819ca9 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-18 01:00:24 +02:00
Anders Jenbo 14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel c26ec70434 VerifyGoldSeeds cleanup 2019-09-12 11:39:44 +02:00
Anders Jenbo d26fe48942 [hellfire] Correct player structure and related functions 2019-09-04 22:20:54 +02:00
Anders Jenbo e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Anders Jenbo 0022702c38 Clean up CalcPlrInv calls 2019-06-09 19:42:10 +02:00
Xadhoom 6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo 65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz 540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz 4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
Anders Jenbo 4c497e1775 Use values from defs.h 2019-03-27 18:02:01 +01:00
Anders Jenbo 614ebe2e5c Make pack.cpp bin exact 2019-03-27 02:30:22 +01:00
qndel 3573a086e3 UnPackPlayer bin exact (#745) 2019-03-27 02:00:09 +01:00
qndel c5c3564b42 UnPackItem bin exact 2019-03-25 18:57:07 +01:00