diff options
Diffstat (limited to 'StarsEx/NetPlayer.cpp')
-rw-r--r-- | StarsEx/NetPlayer.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/StarsEx/NetPlayer.cpp b/StarsEx/NetPlayer.cpp index d098e5c..ed27751 100644 --- a/StarsEx/NetPlayer.cpp +++ b/StarsEx/NetPlayer.cpp @@ -15,32 +15,32 @@ #define NOMINMAX #endif +#include "NetPlayer.h" + #include <algorithm> -#include "NetPlayer.h" +#include "Element.h" +#include "Explosion.h" +#include "Farcaster.h" +#include "Game.h" +#include "HUDView.h" +#include "Light.h" +#include "NetData.h" #include "NetGame.h" +#include "NetHost.h" #include "NetMsg.h" -#include "NetData.h" #include "NetUtil.h" -#include "Ship.h" -#include "ShipDesign.h" +#include "RadioMessage.h" +#include "RadioTraffic.h" #include "Shield.h" +#include "ShipDesign.h" +#include "Ship.h" #include "Shot.h" -#include "Sim.h" #include "SimEvent.h" +#include "Sim.h" #include "System.h" -#include "Weapon.h" #include "WeaponGroup.h" -#include "Element.h" -#include "HUDView.h" -#include "Explosion.h" -#include "Farcaster.h" -#include "RadioMessage.h" -#include "RadioTraffic.h" - -#include "NetHost.h" -#include "Game.h" -#include "Light.h" +#include "Weapon.h" // +--------------------------------------------------------------------+ @@ -136,8 +136,8 @@ NetPlayer::DoObjHyper(NetObjHyper* obj_hyper) if (ship && obj_hyper) { Sim* sim = Sim::GetSim(); SimRegion* rgn = sim->FindRegion(obj_hyper->GetRegion()); - DWORD fc1_id = obj_hyper->GetFarcaster1(); - DWORD fc2_id = obj_hyper->GetFarcaster2(); + auto fc1_id = obj_hyper->GetFarcaster1(); + auto fc2_id = obj_hyper->GetFarcaster2(); Ship* fc1 = 0; Ship* fc2 = 0; int trans = obj_hyper->GetTransitionType(); @@ -189,7 +189,7 @@ bool NetPlayer::DoObjTarget(NetObjTarget* obj_target) { if (ship && obj_target) { - DWORD tgtid = obj_target->GetTgtID(); + auto tgtid = obj_target->GetTgtID(); int subid = obj_target->GetSubtarget(); SimObject* target = 0; System* subtgt = 0; @@ -236,7 +236,7 @@ NetPlayer::DoWepTrigger(NetWepTrigger* trigger) if (ship && trigger) { int index = trigger->GetIndex(); int count = trigger->GetCount(); - DWORD tgtid = trigger->GetTgtID(); + auto tgtid = trigger->GetTgtID(); int subid = trigger->GetSubtarget(); bool decoy = trigger->GetDecoy(); bool probe = trigger->GetProbe(); @@ -272,7 +272,7 @@ NetPlayer::DoWepTrigger(NetWepTrigger* trigger) net_game->SendData(trigger); } else { - DWORD wepid = NetGame::GetNextObjID(NetGame::SHOT); + auto wepid = NetGame::GetNextObjID(NetGame::SHOT); Shot* shot = w->NetFireSecondary(target, subtgt, wepid); if (shot && shot->IsDrone()) { @@ -315,8 +315,8 @@ NetPlayer::DoWepRelease(NetWepRelease* release) { if (ship && release) { int index = release->GetIndex(); - DWORD tgtid = release->GetTgtID(); - DWORD wepid = release->GetWepID(); + auto tgtid = release->GetTgtID(); + auto wepid = release->GetWepID(); int subid = release->GetSubtarget(); bool decoy = release->GetDecoy(); bool probe = release->GetProbe(); |