Commit Graph
104 Commits
Author SHA1 Message Date
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 7c071924ad Format recently cleaned code 2019-07-06 05:13:01 +02:00
Anders Jenbo f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Sergey Semushin 813d6693fb Add macro for aligning by 1 and apply it to 3 functions to make them bin exact. 2019-06-17 21:33:06 +03:00
Anders Jenbo e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Sergey Semushin 19d9fec7f8 Clean up delta_get_item. 2019-06-13 23:56:52 +01:00
Sergey Semushin a9a431fc12 Fix small diff in NetSendCmdString. 2019-06-13 08:27:00 +01:00
Manuel K ce1f397658 Use MAX_PLRS 2019-06-05 17:27:26 +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 f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
Anders Jenbo 1d7a548cd7 Clean up nthread.cpp 2019-05-21 00:32:10 +01:00
galaxyhaxz 150cb875ff On_DLEVEL 2019-05-20 10:02:49 +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 23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #92
2019-05-05 00:27:08 +02:00
Robin Eklind 39d20dd7bc Merge pull request #1097 from qndel/DeltaAddItem
DeltaAddItem bin exact
2019-05-02 13:32:20 +09:00
qndel f896cd4c2c delta_put_item bin exact 2019-05-02 01:49:36 +02:00
qndel 66c1e8a0e0 DeltaAddItem bin exact 2019-05-02 00:29:48 +02:00
Anders Jenbo 35b6b738af Merge branch 'master' of github.com:diasurgical/devilution 2019-05-01 15:17:36 +02:00
galaxyhaxz e2146d5b6e Fix DeltaJunk multiplayer 2019-05-01 09:48:50 +02:00
Anders Jenbo 2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
Anders Jenbo 7dc47ed8ce Clean up multi_player_left_msg 2019-04-26 01:19:24 +02:00
Xadhoom 6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo 9f2a6f5ba4 Clean up after merge 2019-04-25 03:06:04 +02:00
Anders Jenbo 631305035a Brute fix compile errors 2019-04-24 21:16:05 +02:00
Anders Jenbo 65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz d13f453410 multi_player_joins + dumphist 2019-04-22 18:53:50 -05:00
Anders Jenbo 55a0396f8f Clean up mem_free_dbg style 2019-04-22 13:22:57 +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
Anders Jenbo d8bb37349e Merge branch 'master' of github.com:diasurgical/devilution 2019-04-06 04:34:49 +02:00
Anders Jenbo d2174e3454 Apply code style 2019-04-05 21:54:45 +02:00
Anders Jenbo a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz 40ffc0d00c Clean the dirty sink 2019-04-05 12:17:26 +02:00
galaxyhaxz ec2029e0ba Fix sync.cpp names p1 (#828) 2019-04-04 14:44:37 -05:00
galaxyhaxz 5238265702 Implement assert support (#791) 2019-03-29 21:26:37 -05:00
Xadhoom ecb242ae62 Merge branch 'master' 2019-03-12 09:36:42 +02:00
Anders Jenbo 9358465bb5 AddMissile bin exact (#621)
* AddMissile bin exact

* Clean up bools
2019-03-11 23:59:26 +01:00
Xadhoom 5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Anders Jenbo 192da1853b Clean up DeltaExportData 2019-03-02 03:03:51 +01:00
Anders Jenbo b582709d38 dthread_send_delta bin exact (#563) 2019-01-14 02:20:53 +01:00
Anders Jenbo c6d8b533e6 Fix delta_get_item 2019-01-06 20:33:40 +01:00
Anders Jenbo 9a71c4b646 Merge pull request #505 from AJenbo/msg.cpp2
Msg.cpp min diff
2019-01-06 07:22:10 +01:00
Anders Jenbo 275e28581a BOOLEAN sgbDeltaChanged 2019-01-06 07:20:08 +01:00
Anders Jenbo 841f5af199 Compile effects.cpp and wave.cpp as C (#530)
* Correct SFileReadFile signature

* Compile as C

Source/effects.cpp
Source/wave.cpp

* Make diabloui.h C frindly
2018-12-30 19:22:40 +01:00
Anders Jenbo 9cb6f0748c Merge branch 'nightly' into msg.cpp2 2018-12-29 18:26:51 +01:00
Anders Jenbo 4a62a7c678 Code style 2018-12-29 02:15:20 +01:00
Anders Jenbo 5bc5da3597 Clean up DeltaLoadLevel 2018-12-22 13:23:59 +01:00