Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest openjk master commit #3

Merged
merged 168 commits into from
Oct 8, 2022

Conversation

AlexCS1337
Copy link
Owner

No description provided.

deathsythe47 and others added 30 commits January 22, 2016 15:01
* Consistently declare Com_Error implementations as noreturn

According to comments in code/game/g_public.h (whose version was
already tagged noreturn), for function pointers this only works with
the gcc/clang-specific spelling __attribute__((noreturn)), and not with
the gcc/clang/MSVC abstraction NORETURN. For function implementations,
we can use NORETURN to get MSVC support too.

This lets the compiler reason about what returns and what doesn't,
and in particular silences gcc warnings about functions that
are declared NORETURN but that did appear to return. They didn't,
because they ended with a call to (a function pointer that
eventually calls) Com_Error, but without these annotations
the compiler couldn't know that.

Signed-off-by: Simon McVittie <smcv@debian.org>

* AI_ClosestGroupEntityNumToPoint: Remove, unused

It issues compiler warnings (or did until recently), and git grep says
nothing actually calls or mentions this function.

Signed-off-by: Simon McVittie <smcv@debian.org>

* Icarus: Squash a compiler warning about possibly uninitialized length

clang can see that BufferRead() does not always assign to length,
issuing this warning:

IcarusImplementation.cpp|601 col 13| warning: ‘length’ may be used uninitialized in this function [-Wmaybe-uninitialized]

(This only happens if the buffer is null, in which case we have
bigger problems.)

Signed-off-by: Simon McVittie <smcv@debian.org>

* Move definition of NORETURN to q_platform.h

Signed-off-by: Simon McVittie <smcv@debian.org>

* Introduce NORETURN_PTR, a version of NORETURN for function pointers

This expands to the same thing as NORETURN on gcc (and clang), but
expands to nothing on MSVC.

Signed-off-by: Simon McVittie <smcv@debian.org>

* Define NORETURN, NORETURN_PTR for non-gcc non-MSVC compilers

Signed-off-by: Simon McVittie <smcv@debian.org>
This patch comes from the ec-/Quake3e repository.

Cvars marked with CVAR_NODEFAULT explicitly or with CVAR_ARCHIVE_ND (Both) will not be written to config files when they match the default value and are marked for archive.

Also speeds up sorting and listing because sorts now only happen whenever a write would happen instead of at every list and every write.

Several cvars are marked in this commit based on whether they are often set differnetly or not (or if changed values would matter betweeen mods). No cvars in mod code are set as such for the time being.

See original commit: ec-/Quake3e@da8c757
Sorting commit see: ec-/Quake3e@14a5f02
cvar_usercreated - Lists all user created cvars.
unset_usercreated - Destroys all user created cvars. (USE with caution because it will unset valid cvars that are not currently valid)

Scenarios where valid cvars that might be unset:
At main menu and your cg_ g_ ui_ cvars might be not yet active.
This fixes issues with text scaling on Windows.

Note: only works with msvc compiles right now

CMake script comes from ouned/jk2mv and the manifest file is credits to ioquake3.
Fixes Issue #922

Using official libsdl.org bins and libs
Rage force power no longer acted like undying due to a typo in this commit
…l angle

Default sv_filterCommands to 1, move ';' filtering to value 2
everon and others added 29 commits November 8, 2020 14:27
* Fixed issue with toolchain not being detected

* Updated to use absolute path
qsort() uses a byte copy (like memcpy()) internally to swap elements.
std::vector<StringAndSize_t>s got sorted using qsort(), although
StringAndSize_t is not trivially copyable (i.e. copyable via byte copy)
due to its std::string member.
The fix is to use std::sort() instead.
Such as git hash, source date (for reproducible builds), portable builds, etc.
Not very useful after all
Fix seeker drone crashing SP on maptransition
Powerpc and ARM default to unsigned char which causes an immediate
crash when starting the game.
build: pass -fsigned-char on clang
Co-authored-by: Alex Lo <xycaleth@gmail.com>
Co-authored-by: Alex Lo <xycaleth@gmail.com>
When loading a game in SP, UI_FreeAllSpecies can be called twice without an initialization in between if the SP game library could not be loaded. This results in a double free crash. This commit fixes the issue by resetting some variables after freeing so that calling free again is a no-op.
Reserve space for end of list and swap buffer commands. These are absolutely
required and cannot be dropped. Dropping swap buffer command causes screen
to not update and possible crash from drawsurf buffer overflow if not enough
cmd buffer space for many continous frames.

Fix reserved size for swap buffer command being too small on x86_64

Replace 4 with sizeof( int ) in R_GetCommandBufferReserved

ioquake/ioq3@8531162
ioquake/ioq3@81e2b6c
ioquake/ioq3@41f83ac

Also make sure all renderer commands do not function when the renderer is not loaded (tr.registered)
Simplify the setColor(NULL) command
Fix incorrect null pointer check on an array
Remove unused variables in SP tr_cmds
Doubled the size of renderer command buffers to match other engines.

Fixes and replaces/supersedes #1109
@AlexCS1337 AlexCS1337 merged commit ddff0f2 into AlexCS1337:openjk-alt Oct 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet