Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
6b5667df
There was an error fetching the commit references. Please try again later.
Commit
6b5667df
authored
3 years ago
by
FearlessTobi
Browse files
Options
Downloads
Patches
Plain Diff
yuzu_cmd: Fix compilation
parent
7d82e57b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/network/room_member.h
+0
-12
0 additions, 12 deletions
src/network/room_member.h
src/yuzu_cmd/yuzu.cpp
+1
-1
1 addition, 1 deletion
src/yuzu_cmd/yuzu.cpp
with
1 addition
and
13 deletions
src/network/room_member.h
+
0
−
12
View file @
6b5667df
...
...
@@ -8,7 +8,6 @@
#include
<memory>
#include
<string>
#include
<vector>
#include
<boost/serialization/vector.hpp>
#include
"common/announce_multiplayer_room.h"
#include
"common/common_types.h"
#include
"network/room.h"
...
...
@@ -35,17 +34,6 @@ struct WifiPacket {
MacAddress
transmitter_address
;
///< Mac address of the transmitter.
MacAddress
destination_address
;
///< Mac address of the receiver.
u8
channel
;
///< WiFi channel where this frame was transmitted.
private
:
template
<
class
Archive
>
void
serialize
(
Archive
&
ar
,
const
unsigned
int
)
{
ar
&
type
;
ar
&
data
;
ar
&
transmitter_address
;
ar
&
destination_address
;
ar
&
channel
;
}
friend
class
boost
::
serialization
::
access
;
};
/// Represents a chat message.
...
...
This diff is collapsed.
Click to expand it.
src/yuzu_cmd/yuzu.cpp
+
1
−
1
View file @
6b5667df
...
...
@@ -359,7 +359,7 @@ int main(int argc, char** argv) {
system
.
TelemetrySession
().
AddField
(
Common
::
Telemetry
::
FieldType
::
App
,
"Frontend"
,
"SDL"
);
if
(
use_multiplayer
)
{
if
(
auto
member
=
Network
::
GetRoomMember
().
lock
())
{
if
(
auto
member
=
system
.
GetRoom
Network
().
GetRoomMember
().
lock
())
{
member
->
BindOnChatMessageRecieved
(
OnMessageReceived
);
member
->
BindOnStatusMessageReceived
(
OnStatusMessageReceived
);
member
->
BindOnStateChanged
(
OnStateChanged
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment