Merge pull request #189 from kaitlynia/patch-3

sjrc6 · web-flow · commit 70db873f7ceb · 2026-02-28T03:59:36.000-06:00
Mumble fixes
diff --git a/src/game/client/components/tclient/mumble.cpp b/src/game/client/components/tclient/mumble.cpp
@@ -9,6 +9,8 @@
 
 #include <game/client/gameclient.h>
 
+#define MUMBLE_2D_SCALE 128.0f
+
 void CMumble::MakeContext()
 {
 	mumble_destroy_context(&m_pContext);
@@ -71,12 +73,12 @@ void CMumble::OnRender()
 	{
 		char aIdentity[16];
 		str_format(aIdentity, sizeof(aIdentity), "%d", ClientId);
-		if(!mumble_set_context(m_pContext, aIdentity))
+		if(!mumble_set_identity(m_pContext, aIdentity))
 			log_error("mumble", "Failed to set identity");
 		m_LastClientId = ClientId;
 	}
 	const auto &Pos = GameClient()->m_aClients[ClientId].m_RenderPos;
-	mumble_2d_update(m_pContext, Pos.x, Pos.y);
+	mumble_2d_update(m_pContext, Pos.x / MUMBLE_2D_SCALE, Pos.y / MUMBLE_2D_SCALE);
 }
 
 void CMumble::OnConsoleInit()

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`#include <game/client/gameclient.h>`
`11`	`11`
	`12`	`+#define MUMBLE_2D_SCALE 128.0f`
	`13`	`+`
`12`	`14`	`void CMumble::MakeContext()`
`13`	`15`	`{`
`14`	`16`	`mumble_destroy_context(&m_pContext);`
`@@ -71,12 +73,12 @@ void CMumble::OnRender()`
`71`	`73`	`{`
`72`	`74`	`char aIdentity[16];`
`73`	`75`	`str_format(aIdentity, sizeof(aIdentity), "%d", ClientId);`
`74`		`- if(!mumble_set_context(m_pContext, aIdentity))`
	`76`	`+ if(!mumble_set_identity(m_pContext, aIdentity))`
`75`	`77`	`log_error("mumble", "Failed to set identity");`
`76`	`78`	`m_LastClientId = ClientId;`
`77`	`79`	`}`
`78`	`80`	`const auto &Pos = GameClient()->m_aClients[ClientId].m_RenderPos;`
`79`		`- mumble_2d_update(m_pContext, Pos.x, Pos.y);`
	`81`	`+ mumble_2d_update(m_pContext, Pos.x / MUMBLE_2D_SCALE, Pos.y / MUMBLE_2D_SCALE);`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`void CMumble::OnConsoleInit()`