Anders Jenbo
893efd51ea
Merge branch 'master' of github.com:diasurgical/devilution
2020-09-27 03:34:42 +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
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
qndel
5191237f42
enums and stuff ( #2024 )
2020-04-06 08:04:14 +02: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
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
Anders Jenbo
4b74890489
GetManaAmount prevent shift of negative value
...
Also make GetManaAmount more readable
Thanks to @glebm for finding the issue
2019-11-17 23:08:52 +01: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
4e8a8d2157
Merge remote-tracking branch 'refs/remotes/devilution/master'
2019-10-26 13:43:28 +02:00
Robin Eklind
e155a9423e
rename random to random_ to avoid collision with random in stdlib.h
...
Fixes #1813 .
2019-10-21 09:56:36 +02:00
Anders Jenbo
fae2be813a
Merge branch 'master' of github.com:diasurgical/devilution
2019-09-28 04:31:04 +02:00
qndel
1516ad57ac
GetManaAmount cleanup ( #1737 )
2019-09-27 03:16:26 +02:00
qndel
449b9fd2dc
CastSpell cleanup
2019-09-27 02:46:00 +02:00
Anders Jenbo
14f8c9368a
Merge branch 'master' of github.com:diasurgical/devilution
2019-09-13 17:51:58 +02:00
qndel
7ab48ad756
UseMana clean up
2019-08-31 07:46:40 +02:00
qndel
a17e34c4bf
applied enums to _pmode and untangled ifs
2019-08-31 06:23:35 +02:00
Anders Jenbo
60ee365dff
Merge branch 'master' of github.com:diasurgical/devilution
2019-07-20 19:52:50 +02:00
Robin Eklind
f59439a8ff
Make _pInvincible into a boolean.
...
_pInvincible is only ever used in boolean contexts.
2019-07-17 12:14:16 +02:00
Xadhoom
148a7be44d
Merge upstream branch 'devilution/master'
2019-07-10 17:04:38 +00:00
Anders Jenbo
32a51d17ca
Align function signatures with PSX symbols
...
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
2019-07-08 04:12:12 +02:00
Anders Jenbo
23e7737c75
Merge branch 'master' of github.com:diasurgical/devilution
...
Fixes #92
2019-05-05 00:27:08 +02:00
Anders Jenbo
66438890aa
Clean up spells.cpp
2019-05-02 00:16:46 +01:00
Anders Jenbo
a46ef68b2c
Merge branch 'master' of github.com:diasurgical/devilution
2019-04-29 02:29:39 +02:00
galaxyhaxz
610580625e
Split data from files
2019-04-29 01:40:44 +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
Xadhoom
5283a9ffd1
Put everything into namespace dvl
2019-03-11 20:10:23 +00:00
Xadhoom
fa90e6720a
Revert random_ to random and remove extern "C" linkage
2019-01-21 20:39:55 +00:00
Xadhoom
3dd6cf1671
First try, merge compiles, but immediate crash
2019-01-21 09:48:53 +00:00
Anders Jenbo
429ececce0
Fix debug build as C ( #566 )
...
* Clean up todo
* Fix debug build
2019-01-14 18:54:12 +01:00
Anders Jenbo
024d99fc9e
C compatability from s ( #521 )
2018-12-29 21:15:33 +01:00
Anders Jenbo
0fb5c0bf9c
Additional tab indentation
2018-10-27 17:38:40 +02:00
Anders Jenbo
b1f6d3698f
Update style to use tabs
2018-10-25 22:53:04 +02:00
Anders Jenbo
f1d4e707f7
Auto format
2018-10-19 02:39:19 +02:00
Anders Jenbo
4708345d31
Align spelldata data table
2018-10-18 02:43:18 +02:00
Robin Eklind
7515655efb
Run format.sh
2018-10-06 22:52:58 +02:00
Anders Jenbo
744e225618
Clean up player.cpp ( #387 )
2018-10-06 00:33:58 +02:00
Andrew Dunstan
344d259066
make DoHealOther bin exact
2018-09-29 00:58:59 +10:00
squidcc
4ed6d83265
fix regression in DrawSpellList() that caused only the first 1/4 spells to be drawn ( #355 )
...
fix places where sTownSpell was still being cast to DWORD
change SpellData::sTargeted to BOOL, fix spelldata[] definition to use TRUE/FALSE
2018-09-28 10:46:36 +02:00
Anders Jenbo
b7dfcf5ed5
Clean up CheckPlrSpell ( #339 )
2018-09-28 01:49:17 +02:00
Andrew Dunstan
71cae5f8c2
add enums for known actions (to be performed in response to commands)
2018-09-25 10:14:12 +10:00
Anders Jenbo
db77557dce
ValidatePlayer ( #318 )
...
* ValidatePlayer
* Add MAX_SPELLS define
2018-09-23 09:40:05 +02:00
Anders Jenbo
e05679b1c9
Clean up ProcessPlayers ( #319 )
...
* Clean up ProcessPlayers
* Change drawhpflag and drawmanaflag to BOOL
2018-09-23 09:38:34 +02:00