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

155 commits

Author SHA1 Message Date
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel
b81d2eb831
 		some cleanups (#2099) 2020-10-12 00:42:02 +02:00
qndel
b0142637b7
 		Ear cleanup #2 (#2100) 2020-10-12 00:14:24 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo
8272a37aea Add connection state and player state enums 2020-09-25 06:47:11 +02:00
qndel
166029c95b apply enums 2020-09-01 07:00:49 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +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
Anders Jenbo
cc0f92d45b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 06:09:30 +02:00
Anders Jenbo
a291939a7d Value types 2020-04-06 05:43:20 +02:00
Anders Jenbo
b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
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
Anders Jenbo
8491a67135 [hellfire] NetSendCmdMonDmg 2020-03-12 04:27:37 +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
galaxyhaxz
38c748b6fd
 		Add network commands and cursors (#1967) 2020-01-17 13:37:22 -06: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
7369deba1b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-25 20:25:56 +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
85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +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
babddf2921 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-10-08 00:35:03 +02:00
Anders Jenbo
683a50527d Correct missmatched bool types 2019-10-04 09:26:26 +02:00
galaxyhaxz
e49036a801 Fix net commands in hellfire 2019-09-20 07:10:55 +02:00
Anders Jenbo
0bdd819ca9 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-18 01:00:24 +02:00
Sergey Semushin
e133d23946 hellfire: InvPutItem and it callers bin exact. 
Callers:
On_GETITEM
On_AGETITEM
On_PUTITEM
On_SYNCPUTITEM
On_RESPAWNITEM
 2019-09-16 12:52:15 +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
d26fe48942 [hellfire] Correct player structure and related functions 2019-09-04 22:20:54 +02:00
Anders Jenbo
69a1c6db3f [hellfire] On_ENDREFLECT 2019-08-30 16:22:17 +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