From ff280d6886f222df3e0195aba3bdba499b6e9e30 Mon Sep 17 00:00:00 2001 From: Borja Ferrer Date: Mon, 1 Oct 2007 21:20:30 +0000 Subject: [PATCH] fixed amb991, dispatchkeyvalue natives had wrong offsets --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401521 --- extensions/sdktools/inputnatives.cpp | 2 +- extensions/sdktools/vnatives.cpp | 4 ++-- gamedata/sdktools.games.txt | 32 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extensions/sdktools/inputnatives.cpp b/extensions/sdktools/inputnatives.cpp index 28aeba21..86435fd1 100644 --- a/extensions/sdktools/inputnatives.cpp +++ b/extensions/sdktools/inputnatives.cpp @@ -93,7 +93,7 @@ static cell_t AcceptEntityInput(IPluginContext *pContext, const cell_t *params) pass[1].flags = pass[2].flags = PASSFLAG_BYVAL; pass[1].size = pass[2].size = sizeof(CBaseEntity *); pass[3].type = PassType_Object; - pass[3].flags = PASSFLAG_BYVAL|PASSFLAG_OCTOR|PASSFLAG_ODTOR; + pass[3].flags = PASSFLAG_BYVAL|PASSFLAG_OCTOR|PASSFLAG_ODTOR|PASSFLAG_OASSIGNOP; pass[3].size = SIZEOF_VARIANT_T; pass[4].type = PassType_Basic; pass[4].flags = PASSFLAG_BYVAL; diff --git a/extensions/sdktools/vnatives.cpp b/extensions/sdktools/vnatives.cpp index 09d56161..689a3e9a 100644 --- a/extensions/sdktools/vnatives.cpp +++ b/extensions/sdktools/vnatives.cpp @@ -733,7 +733,7 @@ static cell_t DispatchKeyValueFloat(IPluginContext *pContext, const cell_t *para { ValvePassInfo pass[3]; InitPass(pass[0], Valve_String, PassType_Basic, PASSFLAG_BYVAL); - InitPass(pass[1], Valve_Float, PassType_Basic, PASSFLAG_BYVAL); + InitPass(pass[1], Valve_Float, PassType_Float, PASSFLAG_BYVAL); InitPass(pass[2], Valve_Bool, PassType_Basic, PASSFLAG_BYVAL); if (!CreateBaseCall("DispatchKeyValueFloat", ValveCall_Entity, &pass[2], pass, 2, &pCall)) { @@ -760,7 +760,7 @@ static cell_t DispatchKeyValueVector(IPluginContext *pContext, const cell_t *par { ValvePassInfo pass[3]; InitPass(pass[0], Valve_String, PassType_Basic, PASSFLAG_BYVAL); - InitPass(pass[1], Valve_Vector, PassType_Basic, PASSFLAG_BYVAL); + InitPass(pass[1], Valve_Vector, PassType_Object, PASSFLAG_BYVAL|PASSFLAG_OCTOR|PASSFLAG_OASSIGNOP); InitPass(pass[2], Valve_Bool, PassType_Basic, PASSFLAG_BYVAL); if (!CreateBaseCall("DispatchKeyValueVector", ValveCall_Entity, &pass[2], pass, 2, &pCall)) { diff --git a/gamedata/sdktools.games.txt b/gamedata/sdktools.games.txt index c7ac8cc3..ca80a401 100644 --- a/gamedata/sdktools.games.txt +++ b/gamedata/sdktools.games.txt @@ -306,7 +306,7 @@ } "DispatchKeyValue" { - "windows" "29" + "windows" "31" "linux" "30" } "DispatchKeyValueFloat" @@ -316,7 +316,7 @@ } "DispatchKeyValueVector" { - "windows" "31" + "windows" "29" "linux" "32" } } @@ -379,7 +379,7 @@ } "DispatchKeyValue" { - "windows" "29" + "windows" "31" "linux" "30" } "DispatchKeyValueFloat" @@ -389,7 +389,7 @@ } "DispatchKeyValueVector" { - "windows" "31" + "windows" "29" "linux" "32" } } @@ -452,7 +452,7 @@ } "DispatchKeyValue" { - "windows" "29" + "windows" "31" "linux" "30" } "DispatchKeyValueFloat" @@ -462,7 +462,7 @@ } "DispatchKeyValueVector" { - "windows" "31" + "windows" "29" "linux" "32" } } @@ -521,7 +521,7 @@ } "DispatchKeyValue" { - "windows" "33" + "windows" "35" "linux" "34" } "DispatchKeyValueFloat" @@ -531,7 +531,7 @@ } "DispatchKeyValueVector" { - "windows" "35" + "windows" "33" "linux" "36" } @@ -603,7 +603,7 @@ } "DispatchKeyValue" { - "windows" "29" + "windows" "31" "linux" "30" } "DispatchKeyValueFloat" @@ -613,7 +613,7 @@ } "DispatchKeyValueVector" { - "windows" "31" + "windows" "29" "linux" "32" } @@ -695,7 +695,7 @@ } "DispatchKeyValue" { - "windows" "28" + "windows" "30" "linux" "29" } "DispatchKeyValueFloat" @@ -705,7 +705,7 @@ } "DispatchKeyValueVector" { - "windows" "30" + "windows" "28" "linux" "31" } } @@ -789,7 +789,7 @@ } "DispatchKeyValue" { - "windows" "29" + "windows" "31" "linux" "30" } "DispatchKeyValueFloat" @@ -799,7 +799,7 @@ } "DispatchKeyValueVector" { - "windows" "31" + "windows" "29" "linux" "32" } @@ -859,7 +859,7 @@ } "DispatchKeyValue" { - "windows" "28" + "windows" "30" "linux" "29" } "DispatchKeyValueFloat" @@ -869,7 +869,7 @@ } "DispatchKeyValueVector" { - "windows" "30" + "windows" "28" "linux" "31" }