Loading

Paste #prwmmzcsg

  1. Index: road.h
  2. ===================================================================
  3. --- road.h  (revision 22654)
  4. +++ road.h  (working copy)
  5. @@ -215,6 +215,7 @@
  6.     bool IsRoad();
  7.     bool IsTram();
  8.  
  9. +   RoadTypeIdentifier() : basetype(INVALID_ROADTYPE), subtype(INVALID_ROADSUBTYPE) {}
  10.     RoadTypeIdentifier(RoadType basetype, RoadSubType subtype) : basetype(basetype), subtype(subtype) {}
  11.     explicit RoadTypeIdentifier(uint8 data);
  12.  };
  13. Index: road_map.h
  14. ===================================================================
  15. --- road_map.h  (revision 22654)
  16. +++ road_map.h  (working copy)
  17. @@ -643,11 +643,11 @@
  18.  }
  19.  
  20.  struct RoadTypeIdentifiers {
  21. -   RoadTypeIdentifier road_identifier = RoadTypeIdentifier(INVALID_ROADTYPE, INVALID_ROADSUBTYPE);
  22. -   RoadTypeIdentifier tram_identifier = RoadTypeIdentifier(INVALID_ROADTYPE, INVALID_ROADSUBTYPE);
  23. +   RoadTypeIdentifier road_identifier;
  24. +   RoadTypeIdentifier tram_identifier;
  25.  
  26.     /* Creates an INVALID RoadTypeIdentifiers */
  27.     RoadTypeIdentifiers() {}
  28.  
  29.     /* Extracts the RoadTypeIdentifiers from the given tile
  30.      * @param tile The tile to read the informations from

Comments