dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:43:49 +01:00
parent 6d4f616706 88cf99017a
commit fc4ea241b0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/tcp_game.h
View File

@@ -175,7 +175,7 @@ protected:
/** /**
* Try to join the server: * Try to join the server:
* string OpenTTD revision (norev000 if no revision). * string OpenTTD revision (norev0000 if no revision).
* string Name of the client (max NETWORK_NAME_LENGTH). * string Name of the client (max NETWORK_NAME_LENGTH).
* uint8_t ID of the company to play as (1..MAX_COMPANIES). * uint8_t ID of the company to play as (1..MAX_COMPANIES).
* uint8_t ID of the clients Language. * uint8_t ID of the clients Language.

2
src/rev.cpp.in
View File

@@ -28,7 +28,7 @@ bool IsReleasedVersion()
* - "<tag>", like "<major>.<minor>.<build>[-RC<rc>]", * - "<tag>", like "<major>.<minor>.<build>[-RC<rc>]",
* - "<commitdate>-g<shorthash><modified>" in "master", * - "<commitdate>-g<shorthash><modified>" in "master",
* - "<commitdate>-<branch>-g<shorthash><modified>" in other branches, or * - "<commitdate>-<branch>-g<shorthash><modified>" in other branches, or
* - "norev000", if the version is unknown. * - "norev0000", if the version is unknown.
* *
* The major, minor and build are the numbers that describe releases of * The major, minor and build are the numbers that describe releases of
* OpenTTD (like 0.5.3). "-RC" is used to flag release candidates. * OpenTTD (like 0.5.3). "-RC" is used to flag release candidates.