Merge branch 'master' into jgrpp
# Conflicts: # src/cheat_gui.cpp # src/main_gui.cpp # src/network/network_gui.cpp # src/saveload/saveload.h # src/smallmap_gui.cpp # src/station_cmd.cpp # src/timetable_cmd.cpp # src/toolbar_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown_type.h
This commit is contained in:
@@ -30,7 +30,8 @@
|
||||
#include <functional>
|
||||
#include <algorithm>
|
||||
|
||||
static const byte INITIAL_STATION_RATING = 175;
|
||||
static const uint8_t INITIAL_STATION_RATING = 175;
|
||||
static const uint8_t MAX_STATION_RATING = 255;
|
||||
|
||||
static const uint MAX_EXTRA_STATION_NAMES = 1024;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user