Skip to content

Updates for Blade Symphony and x64#1586

Merged
psychonic merged 13 commits intomasterfrom
blade-2021
Oct 13, 2021
Merged

Updates for Blade Symphony and x64#1586
psychonic merged 13 commits intomasterfrom
blade-2021

Conversation

@psychonic
Copy link
Member

@psychonic psychonic commented Sep 24, 2021

Multiple changes here to fix support for Blade Symphony and some things on x64 in general. BS is largely on the CS:GO engine now, and for Linux, only supports x64.

  • Enable more CS:GO-specific logic on Blade Symphony (fixes and workarounds for engine quirks)
  • Massive gamedata updates
  • Remove some gamedata in favor of using the IServerTools helper functions that will soon be available (like in TF2, etc.)
  • Fix a crash bug in Bintools for x64 funcs with void return
  • Fix assumption of 4-byte pointer sizes in multiple SDKTools calls

This won't build without errors until the blade-2021 branch of the hl2sdk is merged into the blade branch, after the next game update.

@psychonic psychonic added the WIP work in progress label Sep 24, 2021
@psychonic psychonic marked this pull request as draft September 24, 2021 03:40
bakugo
bakugo reviewed Sep 24, 2021
View reviewed changes
@peace-maker
Copy link
Member

peace-maker commented Sep 24, 2021

We'll have to build against mmsource-1.11 for x64 support in sourcehook. I think the buildbots still use mms-1.10.

There are lots of interfaces using int as an equivalent of size_t which throws a bunch of compile warnings, but those can be addressed later after we ship some usable x64 builds.

@psychonic
Copy link
Member Author

psychonic commented Sep 24, 2021

We'll have to build against mmsource-1.11 for x64 support in sourcehook. I think the buildbots still use mms-1.10.

Thanks. I'll get that updated as well.

@psychonic psychonic mentioned this pull request Sep 29, 2021
Merged
@psychonic
Add ValveType_Object type.
4e41746 
This is for the few cases where we have function parameters to objects that
don't fit our other predefined types (CBaseEntity, CBasePlayer, string).

Most calls currently pass those as POD (which is incorrect, but works on
x86), or one of the other pointer types (which is also incorrect, and can
lead to confusion, but works on x86 and x86-64).

This type only works when manually buffering the parameter for calls, and
is not supported for return types.
@psychonic
Fix Blade Symphony GiveNamedItem call on x64.
95e6fe9
@psychonic
Remove manual ptr math in vnatives for params not mapped to cell params.
4accf3b
@psychonic
Fix incorrect param types in CS:GO GNI (otherwise broken for x64).
4b23c47
@psychonic psychonic removed the WIP work in progress label Oct 12, 2021
@psychonic psychonic marked this pull request as ready for review October 12, 2021 17:39
@psychonic psychonic requested a review from asherkin October 12, 2021 17:40
asherkin
asherkin approved these changes Oct 12, 2021
View reviewed changes
Copy link
Member

@asherkin asherkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@psychonic psychonic merged commit ed96da1 into master Oct 13, 2021
@psychonic psychonic deleted the blade-2021 branch October 13, 2021 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asherkin asherkin asherkin approved these changes

+1 more reviewer

@bakugo bakugo bakugo left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@psychonic @peace-maker @asherkin @bakugo