Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
4ad99d3a4a |
@ -10,17 +10,6 @@ void FrameData::ClearFrameData(Human* hum)
|
||||
new_objects.clear();
|
||||
}
|
||||
if (!del_objects.empty()) {
|
||||
if (!a8::HasBitFlag(hum->status, CS_Disable)) {
|
||||
for (auto& itr : del_objects) {
|
||||
Entity* entity = hum->room->GetEntityByUniId(itr);
|
||||
if (entity) {
|
||||
hum->RemovePartObjects(entity);
|
||||
if (entity->IsEntityType(ET_Player)) {
|
||||
((Human*)entity)->RemovePartObjects(hum);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
del_objects.clear();
|
||||
}
|
||||
if (!out_objects.empty()) {
|
||||
|
@ -93,6 +93,7 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
|
||||
cs::SMUpdate* msg = new cs::SMUpdate;
|
||||
Room* room = hum->room;
|
||||
|
||||
if (hum->IsPlayer() || hum->HasObserver) {
|
||||
PreProcess(msg, room, hum, framedata);
|
||||
SerializeNewObjects(msg, room, hum, framedata);
|
||||
SerializePartObjects(msg, room, hum, framedata);
|
||||
@ -116,7 +117,7 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
|
||||
SerializeChgedProps(msg, room, hum, framedata);
|
||||
SerializeDelBullets(msg, room, hum, framedata);
|
||||
PostProcess(msg, room, hum, framedata);
|
||||
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
|
@ -1300,7 +1300,7 @@ void Human::RemoveObserver(Human* observer)
|
||||
|
||||
bool Human::HasObserver()
|
||||
{
|
||||
return !observers_.empty();
|
||||
return observers_.size() > 1;
|
||||
}
|
||||
|
||||
void Human::SendUpdateMsg()
|
||||
|
Loading…
x
Reference in New Issue
Block a user