Use different stopping margin depending on whether the next track is a turnout

[r2c2.git] / source / network / packets.h

diff --git a/source/network/packets.h b/source/network/packets.h
index 31fd56d11350ff8390585cdfa7c97745956b1319..8001b8c1baa721beab957a34459e843d3c063219 100644 (file)
--- a/source/network/packets.h
+++ b/source/network/packets.h
@@ -1,29 +1,29 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLINNET_PACKETS_H_
-#define MARKLINNET_PACKETS_H_
+#ifndef R2C2_NET_PACKETS_H_
+#define R2C2_NET_PACKETS_H_
 
 #include <string>
 
-namespace Marklin {
+namespace R2C2 {
 
 struct TrainInfoPacket
 {
        unsigned address;
-       unsigned loco_type;
+       std::string loco_type;
        std::string name;
 };
 
-struct TrainSpeedPacket
+struct TrainControlPacket
 {
        unsigned address;
-       unsigned speed;
-       char reverse;
+       std::string control;
+       float value;
 };
 
 struct TrainFunctionPacket
@@ -54,6 +54,6 @@ struct ErrorPacket
        std::string message;
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif