summaryrefslogtreecommitdiffhomepage
path: root/StarsEx/Thruster.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'StarsEx/Thruster.cpp')
-rw-r--r--StarsEx/Thruster.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/StarsEx/Thruster.cpp b/StarsEx/Thruster.cpp
index 16f3710..3d80a30 100644
--- a/StarsEx/Thruster.cpp
+++ b/StarsEx/Thruster.cpp
@@ -12,25 +12,27 @@
*/
#include "Thruster.h"
+
+#include <cstdint>
+
+#include "AudioConfig.h"
+#include "Bitmap.h"
+#include "Bolt.h"
+#include "CameraDirector.h"
#include "Component.h"
+#include "ContentBundle.h"
+#include "DataLoader.h"
#include "Drive.h"
#include "FlightComp.h"
-#include "SystemDesign.h"
-#include "Ship.h"
+#include "Game.h"
+#include "Light.h"
+#include "Random.h"
#include "ShipDesign.h"
+#include "Ship.h"
#include "Sim.h"
-#include "CameraDirector.h"
-#include "AudioConfig.h"
-#include "Random.h"
-
-#include "Light.h"
-#include "Bitmap.h"
#include "Sound.h"
-#include "DataLoader.h"
-#include "ContentBundle.h"
-#include "Bolt.h"
#include "Sprite.h"
-#include "Game.h"
+#include "SystemDesign.h"
// +----------------------------------------------------------------------+
@@ -44,7 +46,7 @@ extern Bitmap* drive_trail_bitmap[8];
// +----------------------------------------------------------------------+
-ThrusterPort::ThrusterPort(int t, const Point& l, DWORD f, float s)
+ThrusterPort::ThrusterPort(int t, const Point& l, std::uint32_t f, float s)
: type(t), loc(l), flare(0), trail(0), fire(f), burn(0), scale(s)
{ }
@@ -498,7 +500,7 @@ Thruster::ExecTrans(double x, double y, double z)
// +--------------------------------------------------------------------+
void
-Thruster::AddPort(int type, const Point& loc, DWORD fire, float flare_scale)
+Thruster::AddPort(int type, const Point& loc, std::uint32_t fire, float flare_scale)
{
if (flare_scale == 0) flare_scale = scale;
ThrusterPort* port = new ThrusterPort(type, loc, fire, flare_scale);
@@ -506,7 +508,7 @@ Thruster::AddPort(int type, const Point& loc, DWORD fire, float flare_scale)
}
void
-Thruster::CreatePort(int type, const Point& loc, DWORD fire, float flare_scale)
+Thruster::CreatePort(int type, const Point& loc, std::uint32_t fire, float flare_scale)
{
Bitmap* flare_bmp = drive_flare_bitmap[subtype];
Bitmap* trail_bmp = drive_trail_bitmap[subtype];