MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3,739 commits 1 branch 0 tags 51 MiB
Commit graph

131 commits

Author SHA1 Message Date
Anders Jenbo
776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz
c632e2d1d0
 		Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
galaxyhaxz
71565b9c02
 		Several updates [enums+names] (#2002) 
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <mewmew@users.noreply.github.com>

Co-authored-by: Robin Eklind <mewmew@users.noreply.github.com>
 2020-03-11 21:27:40 -05:00
Anders Jenbo
0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01: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
08aa6a860a Move generic helpers out of miniwin 2020-02-01 13:56:08 +01:00
Anders Jenbo
40cea40aa4 Remove windows call types collisions 2019-12-26 05:00:02 +01:00
Anders Jenbo
da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo
0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +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
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Anders Jenbo
3e7d352fde Format files 2019-10-21 20:04:14 +02:00
Anders Jenbo
d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00
Anders Jenbo
683a50527d Correct missmatched bool types 2019-10-04 09:26:26 +02:00
Anders Jenbo
bf973d0872 Use sizeof directly instead of definging TMEGAPKT_SIZE 2019-09-14 23:03:56 +02:00
Anders Jenbo
b7a4d32e91
 		Use sizeof(TMegaPkt) 2019-09-14 22:55:40 +02:00
Nam Nguyen
f7ceadf6dc pack the TMegaPkt struct. define TMEGAPKT_SIZE. 
memcpy((char *)&packeta[1] - packeta->dwSpaceLeft, packet, dwSize);

Source/msg.cpp does this calculation, which will be wrong if any padding is
added. To get this to work correctly, pack the structures, as suggested by
@AJenbo.

Also, define TMEGAPKT_SIZE because pNext can be 4 or 8 bytes.
 2019-09-14 22:08:07 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +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
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Robin Eklind
eaf8fbd0e7
 		Merge pull request #1312 from mewpull/cleanup4 
Update player struct to use more booleans.
 2019-07-18 02:50:53 +02:00
Robin Eklind
29eb52b6d0 Make _pLvlVisited into a boolean. 
_pLvlVisited is only ever used in boolean contexts.
 2019-07-17 20:34:45 +02:00
Robin Eklind
59167447ba msg: use enum for RSPLTYPE_INVALID in msg.cpp 2019-07-17 12:30:00 +02:00
Robin Eklind
983d2d6769 Make _pLvlChanging into a boolean. 
_pLvlChanging is only ever used in boolean contexts.
 2019-07-17 12:24:07 +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
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