Commit graph

151 commits

Author SHA1 Message Date
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +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
187a021b30
More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +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
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
Gleb Mazovetskiy
4e29a4b8aa Single-player: Use loopback instead of TCP
Previously, single-player games initialized a TCP connection!
Changes this to loopback.

Refs #555
2020-02-02 19:38:54 +01:00
Anders Jenbo
40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
Anders Jenbo
08aa6a860a Move generic helpers out of miniwin 2020-02-01 13:56:08 +01:00
Anders Jenbo
cc4d6b57d8 Remove unused miniwin IO 2020-01-31 22:30:13 +01:00
galaxyhaxz
6605e1de5e Fix variable 'gbSelectProvider' 2020-01-17 21:07:10 +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
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
qndel
57f1fcce4c some enums (#1816) 2019-10-20 20:40:35 +02:00
Anders Jenbo
73a7a1ae6d Remove unimplemented functions that aren't needed with SDL 2019-10-08 23:04:39 +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
fae2be813a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-28 04:31:04 +02:00
Anders Jenbo
06bcd3c3f9 Handle file paths in a clean way
Belated birthday present for @mewmew

Functions for gettings paths have sensible names
It's using snprintf for safe? string concat
Paths don't use \ as path reporator, or magic marker
Drop code for copying pre 1.09 save games from the windows folder
2019-09-26 07:32:47 +02:00
Gleb Mazovetskiy
2cc0c2cfbb Clang: Remove -fms-extensions -fms-compatibility 2019-09-25 03:32:00 +02:00
Robin Eklind
0b7fca12af multi: use sizeof(sgGameInitInfo) for initdatabytes 2019-09-19 03:32:40 +02:00
Anders Jenbo
cf359d9ea2 Remove server chat 2019-09-13 03:56:47 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Alex Yatskov
6dffe84f67 Fix drive-letter relative path log path (#221) 2019-08-18 07:42:59 +02:00
galaxyhaxz
f13512bbb8 Clean multi_send_zero_packet right 2019-08-16 14:06:22 +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
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Anders Jenbo
e2bff090d6 Come up with names for all remaning arguments 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
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
Robin Eklind
983d2d6769 Make _pLvlChanging into a boolean.
_pLvlChanging is only ever used in boolean contexts.
2019-07-17 12:24:07 +02:00
Robin Eklind
9b6e866878
Update Source/multi.cpp
Co-Authored-By: Anders Jenbo <anders@jenbo.dk>
2019-07-16 22:38:59 +02:00
Robin Eklind
98ac9ebaf3 multi: use name from PSX for InitLevelType 2019-07-16 14:10:40 +02:00
Robin Eklind
f47e29d60d multi: rename InitNewSeed to DTypeFromDLvl 2019-07-16 12:20:48 +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
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