Commit graph

258 commits

Author SHA1 Message Date
Anders Jenbo
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +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
aa50489569 Clean up generated comments 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
7441f29867 Use TRUE value for _iIdentified. 2019-07-19 11:56:30 +02:00
Robin Eklind
105a583ce0 Use TRUE and FALSE enums for setlevel.
Also simplify if conditions to make
use of boolean values.

(If the cleanup4 PR ends up increasing
inserts/deletions, then this commit is
probably at fault.)
2019-07-17 20:42:26 +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
4ff5197291 merge devilution 2019-06-28 21:53:52 +02:00
Joan Karadimov
fce804a09a Use the dungeon_type enum for leveltype 2019-06-28 11:58:44 +03:00
Anders Jenbo
f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Anders Jenbo
a7788ccddf Format bin exact code 2019-06-17 04:55:41 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Manuel K
ce1f397658 Use MAX_PLRS 2019-06-05 17:27:26 +02:00
Anders Jenbo
58bbfcf8ad Fix OperateLazStand 2019-06-05 12:56:49 +02:00
Anders Jenbo
635deebbd4 Apply enums to SpawnQuestItem 2019-06-05 03:15:23 +02:00
Anders Jenbo
ce056b02d8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-30 14:40:33 +02:00
Anders Jenbo
565bb5aa7d Adust dFlag enums 2019-05-29 16:23:08 +01:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00
Sergey Semushin
6ec6e3c530 Make MonstrStruct::_msquelch and DMonstrStr::_mactive unsigned.
Also utilize UCHAR_MAX for value of 255 used extensively for those flags.
2019-05-10 21:52:23 +01:00
Anders Jenbo
0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin
33e9005239 Make OperateL{1-3}Door bin exact. 2019-05-05 23:33:28 +01:00
Sergey Semushin
187bf5844e Make ActivateTrapLine bin exact. 2019-05-05 23:33:28 +01:00
Sergey Semushin
94632eb2a6 Make Obj_Circle bin exact. 2019-05-05 23:33:28 +01:00
Sergey Semushin
43d63110f1 Make AddTorturedBody bin exact. 2019-05-05 23:33:28 +01:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #92
2019-05-05 00:27:08 +02:00
Anders Jenbo
46d96eacad Clean up objects.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
35b6b738af Merge branch 'master' of github.com:diasurgical/devilution 2019-05-01 15:17:36 +02:00
Sergey Semushin
8bc995e681 Add _uniq_monsterid enum for indexes in UniqMonst for special unique monsters.
Apply it where necessary.
2019-05-01 13:45:14 +01:00
Sergey Semushin
07f076d2fa Clean up OperateShrine. 2019-05-01 11:22:34 +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
Anders Jenbo
9890fbf89e Apply itype enum 2019-04-28 21:47:09 +02:00
qndel
308c79b723 LoadMapObjects bin exact 2019-04-27 15:59:25 +02:00
Sergey Semushin
ab0bba9826 Clean up SetMapObjects. 2019-04-27 14:10:06 +02:00
Sergey Semushin
c9d10fcc4b Clean up LoadMapObjs. 2019-04-27 14:06:51 +02:00
Anders Jenbo
2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
Anders Jenbo
4c77edc67b Fix SyncL1Doors
Fixes #1050
2019-04-26 19:21:05 +02:00
Sergey Semushin
acdc7648f1 Clean up objects_set_door_piece. 2019-04-26 19:19:29 +02:00
galaxyhaxz
029b15f298 Fix type for Dungeon Micros 2019-04-26 03:17:06 +02:00
Sergey Semushin
91c602de13 Clean up Obj_Door. 2019-04-26 02:43:23 +02:00
Sergey Semushin
e032fe0f44 Fix min diff in OperateWeaponRack. 2019-04-25 23:55:14 +02:00
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
qndel
a36c6276ce BreakObject bin exact (#1027) 2019-04-25 20:25:15 +02:00
Anders Jenbo
dd6a237390 Clean up AddTrap 2019-04-25 15:11:00 +02:00
Sergey Semushin
bef1e7d616 Clean up AddObject.
Also adds unused arguments to AddBarrel and AddTrap.
2019-04-25 13:53:45 +02:00
Sergey Semushin
0c71dd35fc Add 6 functions duplicating some existing ones.
Necessary to get AddObject bin exact.
Order and names provided by @galaxyhaxz.
2019-04-25 13:53:45 +02:00
Sergey Semushin
82bbef8ab7 Stylistic changes for OperateL1RDoor. 2019-04-25 04:16:55 +02:00
Sergey Semushin
b099d74e06 Clean up OperateL3LDoor. 2019-04-25 04:16:55 +02:00