From 7b42aba5eaa5c7f66caad8a14dafc0bd8c00f748 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Mon, 18 Feb 2013 20:13:08 -0500 Subject: [PATCH] Fixed startup crash regression (bug 5607, r=dvander). --- core/logic/common_logic.cpp | 4 ++-- core/logic/intercom.h | 4 ++-- core/logic_bridge.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/logic/common_logic.cpp b/core/logic/common_logic.cpp index eea2642f..7610923b 100644 --- a/core/logic/common_logic.cpp +++ b/core/logic/common_logic.cpp @@ -124,8 +124,8 @@ static void logic_init(const sm_core_t* core, sm_logic_t* _logic) playerhelpers = core->playerhelpers; adminsys = core->adminsys; gamehelpers = core->gamehelpers; - g_pSourcePawn = core->spe1; - g_pSourcePawn2 = core->spe2; + g_pSourcePawn = *core->spe1; + g_pSourcePawn2 = *core->spe2; } PLATFORM_EXTERN_C ITextParsers *get_textparsers() diff --git a/core/logic/intercom.h b/core/logic/intercom.h index 8f484a82..7e89af52 100644 --- a/core/logic/intercom.h +++ b/core/logic/intercom.h @@ -99,8 +99,8 @@ struct sm_core_t IPlayerManager *playerhelpers; IAdminSystem *adminsys; IGameHelpers *gamehelpers; - ISourcePawnEngine *spe1; - ISourcePawnEngine2 *spe2; + ISourcePawnEngine **spe1; + ISourcePawnEngine2 **spe2; /* Functions */ void (*AddNatives)(sp_nativeinfo_t* nlist); ConVar * (*FindConVar)(const char*); diff --git a/core/logic_bridge.cpp b/core/logic_bridge.cpp index 37e4393b..94d2b4ab 100644 --- a/core/logic_bridge.cpp +++ b/core/logic_bridge.cpp @@ -224,8 +224,8 @@ static sm_core_t core_bridge = &g_Players, &g_Admins, &g_HL2, - g_pSourcePawn, - g_pSourcePawn2, + &g_pSourcePawn, + &g_pSourcePawn2, /* Functions */ add_natives, find_convar,