Commit graph

282 commits

Author SHA1 Message Date
Anders Jenbo
d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00
qndel
7129558d0b apply enums 2019-10-05 15:24:44 +02:00
Anders Jenbo
683a50527d Correct missmatched bool types 2019-10-04 09:26:26 +02:00
qndel
6b286941f3 enums 2019-10-02 22:24:37 +02:00
qndel
23386285a9 GetStaffPower cleanup 2019-10-02 06:47:17 +02:00
Anders Jenbo
c5a9917aee Merge branch 'master' of github.com:diasurgical/devilution 2019-09-17 03:29:59 +02:00
qndel
8741ddc6c2 SetupItem cleanup 2019-09-16 02:51:10 +02:00
qndel
afa1306e91 GetUniqueItem cleanup 2019-09-16 02:50:05 +02:00
qndel
2f6a428f4b ProcessItems cleanup 2019-09-16 02:48:07 +02:00
qndel
a47a797468 RecreateEar cleanup 2019-09-16 02:26:34 +02:00
Robin Eklind
46add07dbf
Merge pull request #1654 from qndel/SortSmith
SortSmith cleanup
2019-09-16 01:50:57 +02:00
Robin Eklind
c9f9e70139
Merge pull request #1653 from qndel/SortHealer
SortHealer cleanup
2019-09-16 01:44:22 +02:00
qndel
33b3711662 SortSmith cleanup 2019-09-16 01:37:03 +02:00
qndel
b47af60b6f SortHealer cleanup 2019-09-16 01:11:21 +02:00
qndel
a5de88ab39 SortWitch cleanup 2019-09-16 01:08:30 +02:00
qndel
a05071551a CalcPlrItemMin cleanup 2019-09-16 00:00:19 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel
d9fdfdaeec RecreateHealerItem cleanup 2019-09-08 10:25:27 +02:00
qndel
9f3bb09635 RecreateSmithItem cleanup 2019-09-08 10:24:54 +02:00
qndel
607051c0b6 ItemNoFlippy cleanup 2019-09-08 10:17:31 +02:00
qndel
d4ae8e5606 Clean up CreatePlrItems 2019-08-31 08:30:56 +02:00
Anders Jenbo
1f715f86f6 Clean up 2019-08-27 17:06:54 +02:00
galaxyhaxz
8a22ab6f24 Fixes to item.cpp 2019-08-27 01:57:48 -05:00
Anders Jenbo
f605138c79 Strip ASM code 2019-08-26 13:33:03 +02:00
galaxyhaxz
a3ce219891 Fix bug in InitItems 2019-08-24 05:18:28 -05:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind
2669223cc1 items: rename ItemDropStrs to ItemDropNames
The rationate for preferring Name over Str is that Str
suggest a string for printing and Name a file name,
also based on the following associated PSX debug info:

	char *FileName;
	unsigned char mAnimName;

ItemDropNames correspond to the base file name (e.g. foo) of

	diabdat.mpq/items/foo.cel
2019-08-18 07:46:56 +02:00
Anders Jenbo
68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
Martin Hauke
6fc09ea8a6 Fix some typos 2019-07-23 14:33:42 +02:00
Anders Jenbo
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo
9d3ce818f0 Correct BOOLS 2019-07-21 19:11:11 +02:00
Anders Jenbo
6fba17eec5 Correct GLOBAL types based on PSX SYM 3 2019-07-21 04:10:31 +02:00
Anders Jenbo
b023104434 Remove u from values 2019-07-21 00:57:53 +02:00
Anders Jenbo
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Robin Eklind
107282953c Use ITEM_QUALITY_MAGIC for _iMagical. 2019-07-20 13:28:39 +02:00
Robin Eklind
a6d948f87d Use hex literal for iCreateInfo and boolean values for _iPostDraw. 2019-07-19 11:43:56 +02:00
Robin Eklind
3c182c7135 Remove u suffix from integer literals. 2019-07-19 01:53:23 +02:00
Robin Eklind
d4d466b30c Use FALSE value for _iAnimFlag and update comment of ghit. 2019-07-19 01:49:36 +02:00
Robin Eklind
5371d13154 Make use of item_special_effect enums. 2019-07-18 00:30:49 +02:00
Robin Eklind
a443e5091e Make _pInfraFlag a boolean.
_pInfraFlag is only ever used in boolean contexts.
2019-07-17 15:12:11 +02:00
Robin Eklind
3f4a539bf7 Make _pBlockFlag into a boolean.
_pBlockFlag is only ever used in boolean contexts.
2019-07-17 12:10:34 +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
87d8588f67 Compare int to numbers 2019-07-07 03:47:06 +02:00
Anders Jenbo
7c071924ad Format recently cleaned code 2019-07-06 05:13:01 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Duarte Alvim
6a4142fb08 Add gold constants 2019-06-16 02:24:09 +02:00
Anders Jenbo
0022702c38 Clean up CalcPlrInv calls 2019-06-09 19:42:10 +02:00
Anders Jenbo
334c06c6d3 Correct type in calls to AddPanelString 2019-06-08 13:06:26 +02:00