1
This commit is contained in:
parent
7129bcb4be
commit
571fc0f58c
@ -540,10 +540,14 @@ void Room::CreateAndroid(int robot_num, std::shared_ptr<Team> team)
|
|||||||
hum->Initialize();
|
hum->Initialize();
|
||||||
AddToEntityHash(hum);
|
AddToEntityHash(hum);
|
||||||
AddToHumanHash(hum);
|
AddToHumanHash(hum);
|
||||||
if (team) {
|
if (GetMapModeMeta()->mapMode() != mt::kCircuitMatchMode) {
|
||||||
team->AddMember(hum);
|
|
||||||
} else {
|
|
||||||
MatchTeam(hum);
|
MatchTeam(hum);
|
||||||
|
} else {
|
||||||
|
if (team) {
|
||||||
|
team->AddMember(hum);
|
||||||
|
} else {
|
||||||
|
MatchTeam(hum);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!hum->IsOb()) {
|
if (!hum->IsOb()) {
|
||||||
IncAliveCount();
|
IncAliveCount();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user