Replaced remaining calls to old MM:S usermessages functions when using protobuf system (bug 5579, bug 5588).

This commit is contained in:
Nicholas Hastings 2013-01-26 12:14:40 -05:00
parent ee8b180341
commit 7c03276b50

View File

@ -262,7 +262,14 @@ google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const
m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New(); m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
buffer = m_FakeEngineBuffer; buffer = m_FakeEngineBuffer;
} else { } else {
protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id)); char messageName[32];
if (!GetMessageName(msg_id, messageName, sizeof(messageName)))
{
m_InExec = false;
return NULL;
}
protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
switch (m_FakeMetaRes) switch (m_FakeMetaRes)
{ {
case MRES_IGNORED: case MRES_IGNORED:
@ -279,7 +286,7 @@ google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const
break; break;
} }
OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id)); OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
} }
return buffer; return buffer;