Remove inline from multiplayer()

theonlypwner · theonlypwner · commit 8ddae258bc73 · 2016-01-02T16:52:54.000-07:00
We should force this to be inlined some other way.
diff --git a/source/src/client.cpp b/source/src/client.cpp
@@ -14,7 +14,8 @@ extern int searchlan;
 int getclientnum() { return player1 ? player1->clientnum : -1; }
 bool isowned(playerent *p) { return player1 && p && p->ownernum >= 0 && p->ownernum == player1->clientnum; }
 
-inline bool multiplayer(bool msg)
+// is there any way to force the compiler to inline this function?
+bool multiplayer(bool msg)
 {
     // check not correct on listen server?
     if(curpeer && msg) conoutf(_("operation not available in multiplayer"));

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ extern int searchlan;`
`14`	`14`	`int getclientnum() { return player1 ? player1->clientnum : -1; }`
`15`	`15`	`bool isowned(playerent *p) { return player1 && p && p->ownernum >= 0 && p->ownernum == player1->clientnum; }`
`16`	`16`
`17`		`-inline bool multiplayer(bool msg)`
	`17`	`+// is there any way to force the compiler to inline this function?`
	`18`	`+bool multiplayer(bool msg)`
`18`	`19`	`{`
`19`	`20`	`// check not correct on listen server?`
`20`	`21`	`if(curpeer && msg) conoutf(_("operation not available in multiplayer"));`