Commit graph

474 commits

Author SHA1 Message Date
Anders Jenbo
4ffbb32952 [hellfire] Allow continuing Diablo saves in Hellfire and vice versa 2021-01-13 16:10:21 +01:00
Anders Jenbo
d05f4fbe15 Merge recently cleaned hellfire code 2021-01-09 22:36:59 +01:00
Anders Jenbo
82083762fe Fix SpawnSmith 2021-01-09 19:49:13 +01:00
Anders Jenbo
f9aacc8704 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-09 19:36:09 +01:00
Anders Jenbo
b5e1ef0708 Fix WitchItemOk 2021-01-09 19:25:11 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
be917d43c2 Make diablo vegan frindly 2021-01-09 16:48:32 +01:00
Anders Jenbo
c7b32ec4e4 Clean ups 2021-01-08 21:23:00 +01:00
Anders Jenbo
0c96e32f19 Unify all defines, enums and structs 2021-01-08 20:53:06 +01:00
Anders Jenbo
6f8f4c3293 Unify another chunk of simple Hellfire code paths 2021-01-07 07:19:07 +01:00
Anders Jenbo
3a21479ff5 Add bugfix comments 2021-01-07 07:19:03 +01:00
Anders Jenbo
74daab442a Fix building Hellfire on multiple platforms 2021-01-07 02:55:28 +01:00
Anders Jenbo
01590d3757 Merge a section of the Hellfire item and quest code 2021-01-07 02:29:06 +01:00
Anders Jenbo
e609e170d0 Merge a large chunk of Hellfire the code paths 2021-01-06 08:07:20 +01:00
Anders Jenbo
61a580588c Unify save game loading 2021-01-02 22:35:42 +01:00
Anders Jenbo
d20eddf48e Unifcy a chunk of Hellfire's code pathts 2020-12-28 01:11:25 +01:00
Anders Jenbo
c1a126868b Merge branch 'master' of github.com:diasurgical/devilution 2020-12-28 01:06:38 +01:00
Anders Jenbo
448281a916 [hellfire] SpawnWitch 2020-12-27 18:26:16 +01:00
Anders Jenbo
557af48363 [hellfire] SpawnBoy 2020-12-27 18:25:57 +01:00
Anders Jenbo
f7a8d515fe [hellfire] CalcPlrItemVals 2020-12-27 06:27:26 +01:00
Anders Jenbo
a23e039412 Clean up PrintItemPower 2020-12-27 06:27:19 +01:00
Anders Jenbo
e80d87a9bc [hellfire] UseItem 2020-12-27 06:27:14 +01:00
Anders Jenbo
21d18d5c31 [hellfire] SpawnOnePremium 2020-12-27 06:27:07 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
qndel
e73e1fc114 some cleanup 2020-12-06 23:45:33 +01:00
Anders Jenbo
5b085ad957 [hellfire] GetItemPower 2020-12-05 22:52:38 +01:00
Juliano Goncalves
00f3b753ee Extract valid readied spell logic 2020-12-04 19:29:23 +01:00
Juliano Goncalves
c2ed83eb5e Ensure consistent types for '_pScrlSpells' and '_pISpells' operations 2020-12-04 19:29:23 +01:00
qndel
c4c2e0420c
spell defines and macros (#2162) 2020-12-04 19:18:22 +01:00
qndel
7f7ae623df
Goe (#2163)
* proper random_ comparisons
* proper mienemy comparisons
* add mienemy/micaster enum
* GOE enum
2020-12-04 19:16:58 +01:00
qndel
a597e6d0d5
fix compiling (#2166) 2020-12-04 08:31:45 +01:00
Anders Jenbo
38dbcf7641 Format source 2020-12-02 00:52:38 +01:00
qndel
f2c7ee7dfd ids next to items 2020-11-29 13:42:31 +01:00
qndel
a2dc735f6b some cleanup 2020-11-23 17:04:50 +01:00
Anders Jenbo
d4976f70ac Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 06:36:10 +01:00
Anders Jenbo
3b04a4d6d9 [hellfire] SpawnPremium min diff 2020-11-09 02:06:09 +01:00
Anders Jenbo
fa3785a475 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-04 03:02:48 +01:00
Anders Jenbo
9f9a7920d4 Reorder items.cpp 2020-11-03 02:05:01 +01:00
Anders Jenbo
72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy
ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo
e073422ce7 Unify executable for Spawn and Retail
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
2020-10-20 19:42:01 +02:00
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
d665dfae9a Clean up RndItem 2020-10-15 03:08:16 +02:00
Anders Jenbo
e0825eb60a Clean up SaveItemPower 2020-10-15 03:03:09 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel
95e084dbd3
apply enums (#2088) 2020-10-12 00:23:59 +02:00
qndel
7b8dd91979 [hellfire] HealerItemOk bin exact 2020-10-12 00:14:56 +02:00
qndel
b0142637b7
Ear cleanup #2 (#2100) 2020-10-12 00:14:24 +02:00
qndel
46e38e025e RechargeItem cleanup 2020-10-12 00:04:02 +02:00