From d5ca9a38727c93732e6eca24e566b2dfe9073408 Mon Sep 17 00:00:00 2001 From: Borja Ferrer Date: Fri, 16 Mar 2007 18:05:47 +0000 Subject: [PATCH] synced and fixed linux build --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40635 --- core/Makefile | 4 ++-- core/smn_functions.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 2cbb9229..f1368bda 100644 --- a/core/Makefile +++ b/core/Makefile @@ -26,8 +26,8 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp \ sourcemm_api.cpp sourcemod.cpp OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \ - smn_filesystem.cpp smn_float.cpp smn_halflife.cpp smn_handles.cpp smn_lang.cpp \ - smn_player.cpp smn_sorting.cpp smn_textparse.cpp smn_usermsgs.cpp + smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_halflife.cpp smn_handles.cpp smn_lang.cpp \ + smn_player.cpp smn_string.cpp smn_sorting.cpp smn_textparse.cpp smn_timers.cpp smn_usermsgs.cpp OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \ systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \ systems/ShareSys.cpp vm/sp_vm_basecontext.cpp vm/sp_vm_engine.cpp \ diff --git a/core/smn_functions.cpp b/core/smn_functions.cpp index b0f9154e..e31b9c0a 100644 --- a/core/smn_functions.cpp +++ b/core/smn_functions.cpp @@ -442,7 +442,7 @@ static cell_t sm_CallPushArray(IPluginContext *pContext, const cell_t *params) pContext->LocalToPhysAddr(params[1], &addr); - err = s_pCallable->PushArray(addr, params[2], NULL); + err = s_pCallable->PushArray(addr, params[2]); if (err) { @@ -528,7 +528,7 @@ static cell_t sm_CallPushStringEx(IPluginContext *pContext, const cell_t *params static cell_t sm_CallFinish(IPluginContext *pContext, const cell_t *params) { - int err; + int err = SP_ERROR_NOT_RUNNABLE; cell_t *result; if (!s_CallStarted)