Skip to content

Fix CScriptNetMsgHelper::WriteEntity() #206

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 22, 2022
Merged

Fix CScriptNetMsgHelper::WriteEntity() #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bf1fb4
Fix CScriptNetMsgHelper::WriteEntity()
samisalreadytaken Oct 14, 2022
7849b14
Clarify comment
samisalreadytaken Oct 14, 2022
a2cf90e
Remove redundant SquirrelSafeCheck instance
samisalreadytaken Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions sp/src/game/shared/mapbase/vscript_singletons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,11 @@ void CScriptGameEventListener::StopListeningForEvent()
#ifdef _DEBUG
// Event listeners are iterated forwards in the game event manager,
// removing while iterating will cause it to skip one listener.
// This could be prevented by writing a custom game event manager.
//
// Fix this in engine without altering any behaviour by
// changing event exeuction order to tail->head,
// changing listener removal to tail->head,
// changing listener addition to head
if ( m_nEventTick == gpGlobals->tickcount )
{
Warning("CScriptGameEventListener stopped in the same frame it was fired. This will break other event listeners!\n");
Expand Down Expand Up @@ -1749,8 +1753,8 @@ void CNetMsgScriptHelper::WriteEntity( HSCRIPT hEnt )
{
SCRIPT_NETMSG_WRITE_FUNC
CBaseEntity *p = ToEnt(hEnt);
int i = p ? p->entindex() : -1;
m_MsgOut.WriteSBitLong( i, MAX_EDICT_BITS );
int i = p ? p->entindex() : 0;
m_MsgOut.WriteUBitLong( i, MAX_EDICT_BITS );
}

void CNetMsgScriptHelper::WriteEHandle( HSCRIPT hEnt )
Expand Down Expand Up @@ -1861,7 +1865,11 @@ bool CNetMsgScriptHelper::ReadBool()

HSCRIPT CNetMsgScriptHelper::ReadEntity()
{
int index = m_MsgIn_()ReadSBitLong( MAX_EDICT_BITS );
int index = m_MsgIn_()ReadUBitLong( MAX_EDICT_BITS );

if ( !index )
return NULL;

#ifdef GAME_DLL
edict_t *e = INDEXENT(index);
if ( e && !e->IsFree() )
Expand Down
1 change: 0 additions & 1 deletion sp/src/vscript/vscript_squirrel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2779,7 +2779,6 @@ bool SquirrelVM::GenerateUniqueKey(const char* pszRoot, char* pBuf, int nBufSize
static int keyIdx = 0;
// This gets used for script scope, still confused why it needs to be inside IScriptVM
// is it just to be a compatible name for CreateScope?
SquirrelSafeCheck safeCheck(vm_);
V_snprintf(pBuf, nBufSize, "%08X_%s", ++keyIdx, pszRoot);
return true;
}
Expand Down