diff options
author | Aki <please@ignore.pl> | 2024-03-26 01:45:33 +0100 |
---|---|---|
committer | Aki <please@ignore.pl> | 2024-03-26 01:49:16 +0100 |
commit | ea4c0557d0b7c2317e03d3d3aaefd6063c99f091 (patch) | |
tree | dad4634faf3c17f3642d736f62350df88c117a59 /StarsEx/Sim.cpp | |
parent | 38332f77dc1e7bb03776631101eff6e8ad8bcaef (diff) | |
download | starshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.zip starshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.tar.gz starshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.tar.bz2 |
DWORD replaced with std::uint32_t in non-Win32-related parts
With the exception of some netcode. This brings some important questions
and solidifies me in pursuing better abstract over definitions. It might
also be a good idea to have distinct aliases or compound types for time
and (net) identifiers.
Diffstat (limited to 'StarsEx/Sim.cpp')
-rw-r--r-- | StarsEx/Sim.cpp | 109 |
1 files changed, 55 insertions, 54 deletions
diff --git a/StarsEx/Sim.cpp b/StarsEx/Sim.cpp index 23b01c9..bdf843b 100644 --- a/StarsEx/Sim.cpp +++ b/StarsEx/Sim.cpp @@ -12,71 +12,72 @@ */ #include "Sim.h" -#include "SimEvent.h" -#include "SimObject.h" -#include "Starshatter.h" -#include "StarSystem.h" + +#include <cstdint> + +#include "Asteroid.h" +#include "AudioConfig.h" +#include "Bitmap.h" +#include "Bolt.h" +#include "Callsign.h" +#include "CameraDirector.h" +#include "Clock.h" +#include "Combatant.h" +#include "CombatGroup.h" +#include "CombatUnit.h" #include "Contact.h" -#include "Ship.h" -#include "ShipDesign.h" -#include "Element.h" -#include "Instruction.h" -#include "RadioTraffic.h" -#include "Shot.h" -#include "Drone.h" -#include "Explosion.h" +#include "ContentBundle.h" #include "Debris.h" -#include "Asteroid.h" #include "Drive.h" -#include "QuantumDrive.h" -#include "Sensor.h" -#include "NavLight.h" -#include "Shield.h" -#include "Weapon.h" -#include "WeaponGroup.h" -#include "Hangar.h" +#include "Drone.h" +#include "Element.h" +#include "Explosion.h" #include "FlightDeck.h" -#include "Sky.h" +#include "Game.h" +#include "GameScreen.h" #include "Grid.h" +#include "Hangar.h" +#include "HUDView.h" +#include "Instruction.h" +#include "Light.h" #include "Mfd.h" -#include "AudioConfig.h" -#include "Mission.h" #include "MissionEvent.h" -#include "CameraDirector.h" +#include "Mission.h" +#include "MouseController.h" #include "MusicDirector.h" -#include "Combatant.h" -#include "CombatGroup.h" -#include "CombatUnit.h" -#include "HUDView.h" -#include "SeekerAI.h" -#include "ShipAI.h" -#include "Power.h" -#include "Callsign.h" -#include "GameScreen.h" -#include "Terrain.h" -#include "TerrainPatch.h" - -#include "NetGame.h" +#include "NavLight.h" #include "NetClientConfig.h" -#include "NetServerConfig.h" +#include "NetData.h" +#include "NetGame.h" #include "NetPlayer.h" +#include "NetServerConfig.h" #include "NetUtil.h" -#include "NetData.h" - -#include "Game.h" -#include "Clock.h" -#include "ContentBundle.h" -#include "Sound.h" -#include "Bolt.h" -#include "Solid.h" -#include "Sprite.h" -#include "Light.h" -#include "Bitmap.h" #include "ParseUtil.h" -#include "MouseController.h" #include "Player.h" +#include "Power.h" +#include "QuantumDrive.h" +#include "RadioTraffic.h" #include "Random.h" +#include "SeekerAI.h" +#include "Sensor.h" +#include "Shield.h" +#include "ShipAI.h" +#include "ShipDesign.h" +#include "Ship.h" +#include "Shot.h" +#include "SimEvent.h" +#include "SimObject.h" +#include "Sky.h" +#include "Solid.h" +#include "Sound.h" +#include "Sprite.h" +#include "Starshatter.h" +#include "StarSystem.h" +#include "Terrain.h" +#include "TerrainPatch.h" #include "Video.h" +#include "WeaponGroup.h" +#include "Weapon.h" const char* FormatGameTime(); @@ -1048,7 +1049,7 @@ Sim::NetDockShip(Ship* ship, Ship* carrier, FlightDeck* deck) } Ship* -Sim::FindShipByObjID(DWORD objid) +Sim::FindShipByObjID(std::uint32_t objid) { Ship* ship = 0; @@ -1060,7 +1061,7 @@ Sim::FindShipByObjID(DWORD objid) } Shot* -Sim::FindShotByObjID(DWORD objid) +Sim::FindShotByObjID(std::uint32_t objid) { Shot* shot = 0; @@ -3302,7 +3303,7 @@ SimRegion::FindShip(const char* ship_name) } Ship* -SimRegion::FindShipByObjID(DWORD objid) +SimRegion::FindShipByObjID(std::uint32_t objid) { Ship* ship = 0; @@ -3317,7 +3318,7 @@ SimRegion::FindShipByObjID(DWORD objid) } Shot* -SimRegion::FindShotByObjID(DWORD objid) +SimRegion::FindShotByObjID(std::uint32_t objid) { Shot* shot = 0; |