Commits that were missing in #67 #68
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's the same value d3xp uses and thus probably a better default for mods.
"Fix "t->c->value.argSize == func->parmTotal" Assertion in Scripts, #303" had broken old savegames because the script checksum (idProgram::CalculateChecksum()) changed, see #344. This is fixed now, also the BUILD_NUMBER is increased so old savegames can be identified for a workaround. Don't use this commit without the "Add information about dhewm3 build to savegames" commit, which further modifies the savegame format (for the new BUILD_NUMBER 1305). In dhewm3-sdk this commit is directly before that commit, but unfortunately I fucked up when cherry-picking the "newer" commits onto librecoop, missing a few of them, so this one and the previous one and the next three commits are out of order
in dhewm3-sdk this commit was called "From dhewm3: Add absolute mouse mode and refactor mouse grabbing code", but the sys.h changes are already merged The change in Stub_SDL_endian.h is just me being paranoid. (side-note: it *might* make sense to replace all that inline-asm in Stub_SDL_endian.h with compiler intrinsics like GCC/clangs __builtin_bswap* and MSVCs _byteswap_* - if they are supported in all relevant compiler versions. GCC supports 32 and 64 bit swaps since 4.3, 16bit since 4.8 and 128bit since 11.x; clang supports 32 and 64 bit swaps at least since 3.0 and 16bit swaps since 3.2; VS introduced _byteswap_ushort, .._ulong and .._uint64 in VS2003)
Some level scripts in d3xp (erebus4, erebus4, phobos2) use $entity.startSoundShader( "", SND_CHANNEL_BODY ); (or whatever channel) to stop the sound currently playing there. With s_playDefaultSound 1 that results in a beep.. Added a special case to that event implementation to call StopSound() instead when the soundName is "" (or NULL)
|
|
|
ok, it at least builds, I guess it can be merged, I hope I didn't miss anything this time ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because I didn't use git cherry-pick correctly, a few commits were missing in #67.
Here they are.