Switch CS:GO Clantag set/get to use netprops + offset over sig + offset. #922
Conversation
Drifter321
added
Needs Testing
|
L 11/07/2018 - 07:42:18: [SM] Exception reported: Failed to locate ClanTagSize offset in gamedata |
|
517f7d3 |
|
Call stack windbg thanks to sneak because he's a cutie EDIT: I ran into #910 instead of being able to actually fix/test this one |
|
This should be it ty @Headline 👍 |
|
|
||
| if (pVar) | ||
| { | ||
| char *newValue; | ||
| pContext->LocalToString(params[2], &newValue); | ||
| Q_strncpy(*pVar, newValue, maxlen); | ||
| Q_strncpy(pVar, newValue, maxlen); |
| #if SOURCE_ENGINE == SE_CSGO | ||
| return SetPlayerStringVar(pContext, params, "ClanTag"); | ||
| #else | ||
| static ICallWrapper *pWrapper = NULL; |
| pass[0].flags = PASSFLAG_BYVAL; \ | ||
| pass[0].type = PassType_Basic; \ | ||
| pass[0].size = sizeof(char *); \ | ||
| pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 1)) |
| vptr += sizeof(CBaseEntity *); | ||
| *(char **)vptr = szNewTag; | ||
|
|
||
| pWrapper->Execute(vstk, NULL); |
|
No more crashes with latest commit (windows)! :) |
|
As mentioned on IRC, I'm going to ignore the nits, the main goal of this pr is to actually fix and is currently inline with the remainder of the extension. A separate PR should be done fixing all of them at once after this gets merged. |
|
@asherkin I have no preference. I have the sig already fixed locally if we want to keep 1.9 the same. |
|
@asherkin Is it possible that we can take these changes into both, but also update that gamedata signature so people don’t have to update entire sm installations for this signature change in particular? |
| } | ||
|
|
||
| char *pVar = GetPlayerVarAddressOrError<char>(varName, pContext, pPlayer); | ||
| if (pVar) |
There was a problem hiding this comment.
style would be !pVar here but this is okay too.
| g_pSM->Format(szSizeName, sizeof(szSizeName), "%sSize", varName); | ||
|
|
||
| int maxlen = 0; | ||
| if(!g_pGameConf->GetOffset(szSizeName, &maxlen)) |
|
I'm not too worked up about any of this (I don't like the style of the existing code now that was shuffled; but that's okay). My preference would be for 1.9 to preserve the gamedata method and 1.10 we move onwards and forwards with this. If it breaks irrevocably we'll backport or pin 1.10. |
|
Updated the gamedata in 1.9 this time it will hopefully not break as easily. Instead of matching the offset of the member to make it unique, it now matches the max length of the member. So this will now be 1.10/central only. Credit to 🦆 for the idea. |
|
Could 1.10 also get the updated gamedata committed and/or pushed through the updater since this PR hasn't been merged yet? |
I rather just merge this in. I think we are good to do so, @psychonic any objections? |
There was a problem hiding this comment.
Looks good to me.
@Headline I think there's some benefit to keeping consistency with existing code surrounding the rest, at least enough that it doesn't need to be a priority to change. We could still do that in large passes though if we deem necessary. If this were a new extension or a total revamp of one, it'd be different.
So since this stupid sig keeps breaking... Here is a change to switch to grabbing a netprop address and using an offset to get the address of the clantag. Completely untested, will test if no one does prior later this week.