Anders Jenbo
94e7ee9496
Add test for PM_DoGotHit
...
This maintains the lack of zen combination in Hellfire but uses the
frame spacing from Diablo for both.
2021-01-21 03:09:34 +01:00
Anders Jenbo
aa7354aa57
Merge branch 'master' of github.com:diasurgical/devilution
2021-01-19 03:48:13 +01:00
FluffyQuack
e3d1b19761
A bunch of comments explaining how variables are used. Mainly for structs.h, but a tiny bit for movement code and game loop as well.
2021-01-19 03:44:47 +01:00
Anders Jenbo
b0ef605e02
Fix build
2021-01-18 03:38:42 +01:00
Anders Jenbo
c17b4bb4d3
[hellfire] Fix defaying items in right hand multiplayer
2021-01-18 03:32:02 +01:00
Anders Jenbo
d68c8c1cc8
Fix issues related to cross loading save games
2021-01-17 04:49:23 +01:00
Anders Jenbo
00e3ff08ae
Unify majorty of monster.cpp
2021-01-17 03:55:23 +01:00
Anders Jenbo
ccd0e7fd23
Merge branch 'master' of github.com:diasurgical/devilution
2021-01-16 02:10:25 +01:00
Anders Jenbo
0c01aa9928
[hellfire] M_TryH2HHit
2021-01-15 00:42:37 +01:00
Anders Jenbo
1e86577fc8
Some random cleanups
2021-01-14 00:05:30 +01:00
Anders Jenbo
2f4b66f844
Unify most of Hellfire's player code
2021-01-11 20:11:22 +01:00
Anders Jenbo
6786ebbd1a
Merge branch 'master' of github.com:diasurgical/devilution
2021-01-11 19:28:45 +01:00
Anders Jenbo
e19150bd0a
[hellfire] NetInit
2021-01-11 19:12:56 +01:00
Anders Jenbo
abec004ba6
[hellfire] PosOkPlayer
2021-01-10 22:48:42 +01:00
Anders Jenbo
8bf14c1e13
[hellfire] PM_DoAttack
2021-01-10 22:47:56 +01:00
Anders Jenbo
7c22dd2bd5
[hellfire] PlrHitPlr
2021-01-10 17:37:22 +01:00
Anders Jenbo
51c6104edf
[hellfire] StartPlrHit
2021-01-10 10:02:55 +01:00
Anders Jenbo
8d27b1db63
[hellfire] CreatePlayer
2021-01-10 09:52:31 +01:00
Anders Jenbo
d05f4fbe15
Merge recently cleaned hellfire code
2021-01-09 22:36:59 +01:00
Anders Jenbo
f9aacc8704
Merge branch 'master' of github.com:diasurgical/devilution
2021-01-09 19:36:09 +01:00
Anders Jenbo
8c261d0966
Merge remaning clean Hellfire code paths
2021-01-09 19:04:31 +01:00
Anders Jenbo
9cefb7dab5
Remove invalid BUGFIX
...
Because else it will strip half the players gold
2021-01-09 18:57:27 +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
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
aa3c0242e7
Merge branch 'master' of github.com:diasurgical/devilution
2020-12-31 02:12:23 +01:00
qndel
1dfa505895
[hellfire] CheckPlrSpell bin exact
2020-12-28 16:03:35 +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
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
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
Anders Jenbo
38dbcf7641
Format source
2020-12-02 00:52:38 +01:00
qndel
a2dc735f6b
some cleanup
2020-11-23 17:04:50 +01:00
qndel
0947ede2fe
Cleanup11 ( #2156 )
2020-11-12 15:11:07 +01:00
Anders Jenbo
d4976f70ac
Merge branch 'master' of github.com:diasurgical/devilution
2020-11-09 06:36:10 +01:00
Anders Jenbo
f7290182fd
Reorder player.cpp
2020-11-09 03:24:05 +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
e90f84dd03
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-22 22:14:49 +02:00
qndel
36dba1cc1c
cleanup ( #2127 )
2020-10-22 17:26:24 +02: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
13258db968
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-13 23:51:12 +02:00
Anders Jenbo
3157885502
Correct shareware ifdefs
2020-10-13 07:42:35 +02:00
Anders Jenbo
57f0f5f4c7
Handle hellfire save game differences
2020-10-13 05:12:20 +02:00
Anders Jenbo