Commit Graph

154 Commits

Author SHA1 Message Date
Thomas Otto
0037e5206e Fix a vexing parse 2024-04-20 16:33:22 +02:00
Azamat H. Hackimov
f023d24b5b
Merge pull request #104 from Lgt2x/cmake-format
Standardize CMake formatting
2024-04-20 16:33:09 +03:00
Louis Gombert
ac2b95b645 Remove deprecated CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 2024-04-20 14:45:49 +02:00
Louis Gombert
c2b71b8147 Standardize CMake formatting
lowercase function names, blocks indent
2024-04-20 14:45:49 +02:00
Louis Gombert
ad6c3ee5a9
Merge pull request #86 from Lgt2x/d3-install
Remove D3_GAMEDIR hard-coded CMake variable
2024-04-20 11:13:51 +00:00
Louis Gombert
4b53454c0f Remove D3_GAMEDIR hard-coded CMake variable 2024-04-20 13:02:40 +02:00
Louis Gombert
a9b491e1b9
Merge pull request #97 from MaddTheSane/clangStatic
Quiet Clang Static Analyzer warnings.
2024-04-20 10:55:43 +00:00
Azamat H. Hackimov
12141e7cd5
Merge pull request #99 from Arcnor/fix-presets
fix CMakePresets for Windows, add build presets
2024-04-20 10:50:10 +03:00
Edu Garcia
76ebfa19a0 fix CMakePresets for Windows, add build presets 2024-04-20 07:47:09 +01:00
C.W. Betts
7d7f5bf896 Quiet Clang Static Analyzer warnings.
Most of the warnings were caused by uninitialized values. Some were in plug-ins that didn't have a break in a switch, causing the memory to be deleted twice.
2024-04-19 17:42:17 -06:00
Louis Gombert
0d6fcb1e7e
Merge pull request #78 from MaddTheSane/snprintf
Change most sprintf to snprintf
2024-04-19 21:12:51 +00:00
C.W. Betts
57078ae4b5 Change most sprintf to snprintf.
This also includes vsprintf to vsnprintf.
2024-04-19 12:31:28 -06:00
Jeod
99f86c5c1f
Merge pull request #85 from MaddTheSane/endianFix
Fix endian read-write for doubles.
2024-04-19 12:16:16 -04:00
Jeod
1fb980d2b1
Merge pull request #87 from Arcnor/msvc-warnings
enable stricter MSVC warnings, fix some of them
2024-04-19 12:15:03 -04:00
Edu Garcia
4289427c37
Merge pull request #89 from kevinbentley/revert-76-cfile-update
Revert "Cfile module update"
2024-04-19 14:15:24 +01:00
Edu Garcia
066b436fd9
Revert "Cfile module update" 2024-04-19 13:57:55 +01:00
Edu Garcia
6e772ca4da enable stricter MSVC warnings, fix some of them 2024-04-19 12:38:44 +01:00
Louis Gombert
82ca58219a
Merge pull request #75 from petesimard/main
Add the out directory to .gitignore
2024-04-19 11:31:24 +00:00
Louis Gombert
21fb443cb3
Merge pull request #74 from GravisZro/fix/warnings
Fix build warnings (NULL instead of '\0')
2024-04-19 11:21:14 +00:00
Jeod
2d4d82d469
Accurately find the linux artifacts (#80)
use ninja for Linux builds, fixes missing Linux artifacts on CI
2024-04-19 12:13:19 +01:00
Edu Garcia
a282b8b234
Merge pull request #79 from InsanityBringer/rawinput_fixes
Unregister raw input device when DDIO shuts down
2024-04-19 11:05:57 +01:00
Edu Garcia
09cb56f269
Merge pull request #76 from winterheart/cfile-update
Cfile module update
2024-04-19 11:02:58 +01:00
C.W. Betts
c88af830e6 Fix endian read-write for doubles. 2024-04-18 23:35:58 -06:00
Kevin Bentley
98ed4599a5
Merge pull request #84 from midnite8177/fix-libmve
Fix libmve so movies rendering correctly
2024-04-18 22:25:31 -06:00
Jeff Slutter
2c4c3b339b Fixing an accidental change back 2024-04-18 22:52:05 -05:00
Jeff Slutter
6fc71b1e13 Enable all codec opcodes. We had disabled some when trying to debug the code years ago and not all got re-enabled. 2024-04-18 22:43:04 -05:00
InsanityBringer
0be24877d8 oops, left a comment incompl 2024-04-18 17:54:41 -05:00
InsanityBringer
396131c15b Remove unneded mprintfs 2024-04-18 17:46:20 -05:00
InsanityBringer
766e6420c4 Deregister the raw input device on DDIO shutdown, to avoid excessive capturing of the mouse. 2024-04-18 17:38:29 -05:00
Jeod
1edaa3b628
Merge pull request #77 from jcoby/remove-dmono 2024-04-18 17:35:37 -04:00
Azamat H. Hackimov
7dd6dab98b Rename names of enums
Some of them interferer with WinAPI.
2024-04-19 00:17:15 +03:00
Azamat H. Hackimov
5b88526752 Rename WRITE_FILE_ENTRY() to WriteHogEntry hogfile
Rename for consistency.
2024-04-19 00:17:15 +03:00
Azamat H. Hackimov
906a9258a7 Remove duplicated code in hogfile
NewHogFile() and CreateNewHogFile() are practically identical.
2024-04-19 00:17:15 +03:00
Azamat H. Hackimov
7bfea728b8 Minor fixes to cfile code
Formatting, fixes minor warnings.
2024-04-19 00:17:15 +03:00
Azamat H. Hackimov
9b45091633 Rename/move cfile related files
Rename to lowercase and move headers to own directory.
2024-04-19 00:17:15 +03:00
Jacob Coby
95f1cad545 Remove MONO define
Fixes `mprintf` and `mprintf_at` calls from causing a segfault.

MONO was used to output debugging info to a monochrome monotor.
2024-04-18 17:15:32 -04:00
Peter Simard
d6d0106ca8 Add the out directory to .gitignore 2024-04-18 16:36:07 -04:00
GravisZro
b5632bbc3e Fix simple warnings
Most of these warnings are due to the use of NULL instead of 0 or NULL instead of '\0'.
Some are macro redefinitions. None of them are pointer storage related. Those will be
in another PR.
2024-04-18 15:13:35 -04:00
Jeod
4f5bd86c1c
Merge pull request #70 from Lgt2x/linux-clang
Fix Linux clang build
2024-04-18 14:50:55 -04:00
Louis Gombert
2760c3c3fc
Merge pull request #18 from danra/fix_SetSearchPath
Fix cf_SetSearchPath bad memory access
2024-04-18 18:48:18 +00:00
Dan Raviv
aaefe86a2a Fix cf_SetSearchPath bad memory access (tested on macOS) 2024-04-18 10:33:21 -07:00
Louis Gombert
c68d6419c9 Linux-clang: also apply -Wno-address-of-temporary 2024-04-18 19:15:58 +02:00
Louis Gombert
47f0f6e443 UIEdit: set char to 0 instead of NULL 2024-04-18 19:14:25 +02:00
Azamat H. Hackimov
6572274883
Merge pull request #69 from GravisZro/fix/gitignore
Add Linux and D3 specific .gitignore entries
2024-04-18 19:54:09 +03:00
GravisZro
435c1dd056 Add Linux and D3 specific .gitignore entries
Ignore these:
build/ (CMake build directory)
*.so (Linux)
*.hog (D3)
2024-04-18 12:27:20 -04:00
Azamat H. Hackimov
780ce5e34e
Merge pull request #63 from Jayman2000/allow-additional-cmake-flags
Allow user to specify additional compiler flags
2024-04-18 14:42:18 +03:00
Jason Yundt
0dfbcb5076 Allow user to specify additional compiler flags
I’m trying to compile Descent 3 on NixOS, but when I run
“cmake --build <path>”, I get this error:

/home/jayman/Documents/Home/VC/Git/Partially mine/Descent3/repo/Descent3/multi_connect.cpp: In function 'int TryToJoinServer(network_address*)':
/home/jayman/Documents/Home/VC/Git/Partially mine/Descent3/repo/Descent3/multi_connect.cpp:358:16: error: format not a string literal and no format arguments [-Werror=format-security]
  358 |         sprintf(str, TXT(Join_response_strings[Ok_to_join]));
      |         ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Eventually, we should actually fix that sprintf call (and any other
calls that would trigger format security warnings), but it would be nice
if users could just temporarily ignore stuff like that.

This commit makes it so that users can set custom complier flags by
doing this:

	$ cmake \
		--preset <preset> \
		-B build \
		-DCMAKE_C_FLAGS=<additional-c-flags> \
		-DCMAKE_CXX_FLAGS=<additional-cxx-flags>
	$ cmake --build build
2024-04-18 07:21:43 -04:00
Louis Gombert
ee5478328c
Merge pull request #60 from Arcnor/macos-runners
enable both Intel & M1 macOS runners
2024-04-18 07:40:13 +00:00
Edu Garcia
099d6980f1
Merge pull request #54 from winterheart/cmake-fixes
Fixes and enhancements to CMake build system
2024-04-18 08:21:46 +01:00
Edu Garcia
dcfdbf0fcf enable both Intel & M1 macOS runners 2024-04-18 08:18:08 +01:00