ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2018-09-03 10:13:01 +10:00
commit 3d34c2893b
105 changed files with 1850 additions and 910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@ -24,6 +24,8 @@ option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angels
option(USE_SYSTEM_ENET "Use system ENET instead of the built-in version, when available." ON)
option(USE_SYSTEM_GLEW "Use system GLEW instead of the built-in version, when available." ON)
CMAKE_DEPENDENT_OPTION(USE_CRYPTO_OPENSSL "Use OpenSSL instead of Nettle for cryptography in STK." OFF
"NOT APPLE" ON)
CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
"NOT SERVER_ONLY;NOT APPLE" OFF)
CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
@ -453,26 +455,45 @@ else()
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
endif()
# CURL and OpenSSL
# CURL and OpenSSL or Nettle
# 1.0.1d for compatible AES GCM handling
SET(OPENSSL_MINIMUM_VERSION "1.0.1d")
if(MSVC)
set(USE_CRYPTO_OPENSSL ON)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurl.lib)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.lib)
elseif(MINGW)
set(USE_CRYPTO_OPENSSL ON)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurldll.a)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.dll)
else()
find_package(CURL REQUIRED)
find_package(OpenSSL REQUIRED)
if(${OPENSSL_VERSION} VERSION_LESS ${OPENSSL_MINIMUM_VERSION} OR
(${OPENSSL_VERSION} VERSION_EQUAL ${OPENSSL_MINIMUM_VERSION} AND ${OPENSSL_VERSION} STRLESS ${OPENSSL_MINIMUM_VERSION}))
message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OPENSSL_MINIMUM_VERSION}), aborting.")
endif()
include_directories(${CURL_INCLUDE_DIRS})
include_directories(${OpenSSL_INCLUDE_DIRS})
find_path(NETTLE_INCLUDE_DIRS nettle/gcm.h nettle/sha.h nettle/base64.h nettle/yarrow.h)
find_library(NETTLE_LIBRARY NAMES nettle libnettle)
if (NOT NETTLE_INCLUDE_DIRS OR NOT NETTLE_LIBRARY OR USE_CRYPTO_OPENSSL)
set(USE_CRYPTO_OPENSSL ON)
find_package(OpenSSL REQUIRED)
if(${OPENSSL_VERSION} VERSION_LESS ${OPENSSL_MINIMUM_VERSION} OR
(${OPENSSL_VERSION} VERSION_EQUAL ${OPENSSL_MINIMUM_VERSION} AND ${OPENSSL_VERSION} STRLESS ${OPENSSL_MINIMUM_VERSION}))
message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OPENSSL_MINIMUM_VERSION}), aborting.")
endif()
include_directories(${OpenSSL_INCLUDE_DIRS})
else()
set(USE_CRYPTO_OPENSSL OFF)
include_directories(${NETTLE_INCLUDE_DIRS})
endif()
endif()
if (USE_CRYPTO_OPENSSL)
message(STATUS "OpenSSL will be used for cryptography in STK.")
add_definitions(-DENABLE_CRYPTO_OPENSSL)
else()
message(STATUS "Nettle will be used for cryptography in STK.")
add_definitions(-DENABLE_CRYPTO_NETTLE)
endif()
# Common library dependencies
@ -484,9 +505,14 @@ target_link_libraries(supertuxkart
stkirrlicht
${Angelscript_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_CRYPTO_LIBRARY}
)
if (USE_CRYPTO_OPENSSL)
target_link_libraries(supertuxkart ${OPENSSL_CRYPTO_LIBRARY})
else()
target_link_libraries(supertuxkart ${NETTLE_LIBRARY})
endif()
if(NOT SERVER_ONLY)
if(NOT USE_GLES2)
target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES})

1
android/Android.mk
View File

@ -161,6 +161,7 @@ LOCAL_CFLAGS := -I../lib/angelscript/include \
-Iobj/openssl/include \
-DUSE_GLES2 \
-DENABLE_SOUND \
-DENABLE_CRYPTO_OPENSSL \
-DNDEBUG \
-DANDROID_PACKAGE_NAME=\"$(PACKAGE_NAME)\" \
-DANDROID_APP_DIR_NAME=\"$(APP_DIR_NAME)\" \

BIN
data/gui/blue_flag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

2
data/gui/help7.stkgui
View File

@ -59,7 +59,7 @@
<spacer width="25" height="25"/>
<bubble proportion="1" height="100%"
I18N="In the help menu"
text="When input devices are configured, select the 'multiplayer race' icon in the main menu. Each player can press the 'fire' key of their gamepad or keyboard to join the game, and use their input device to select their kart. The game continues when everyone selected their kart. Note that the mouse may not be used for this operation."/>
text="When input devices are configured, select the 'multiplayer' icon in the main menu. Each player can press the 'fire' key of their gamepad or keyboard to join the game, and use their input device to select their kart. The game continues when everyone selected their kart. Note that the mouse may not be used for this operation."/>
</div>
<spacer width="50" height="25" />
</box>

BIN
data/gui/hourglass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

6
data/gui/main_menu.stkgui
View File

@ -25,9 +25,9 @@
I18N="Main menu button" text="Addons"/>
</buttonbar>
<spacer width="10" height="7%"/>
<spacer width="10" height="6%"/>
<bottombar width="100%" height="10%" layout="horizontal-row">
<bottombar width="100%" height="11%" layout="horizontal-row">
<spacer width="10" height="10" />
@ -38,7 +38,7 @@
<spacer width="10" height="10" />
<buttonbar id="menu_bottomrow" x="0" y="0" width="38%" height="100%" align="center">
<buttonbar id="menu_bottomrow" x="0" y="0" width="42%" height="100%" align="center">
<icon-button id="test_gpwin" width="64" height="64" icon="gui/main_options.png"
raw_text="TEST: GPWin" label_location="hover"/>
<icon-button id="test_gplose" width="64" height="64" icon="gui/main_options.png"

14
data/gui/online/networking_lobby.stkgui
View File

@ -15,14 +15,14 @@
</div>
</div>
<spacer height="2%"/>
<div proportion="2" x="2%" width="96%" layout="horizontal-row">
<box proportion="4" height="100%" layout="vertical-row">
<textbox id="chat" width="100%" height="30%"/>
<div x="2%" width="96%" height="fit" layout="horizontal-row">
<box proportion="4" height="fit" layout="vertical-row">
<textbox id="chat" width="100%"/>
<spacer height="10"/>
<div width="100%" height="30%" proportion="1" layout="horizontal-row">
<button id="send" width="10%" height="fit" I18N="In the network lobby" text="Send" />
<spacer width="10"/>
<label id="timeout-message" width="80%" height="fit"/>
<div width="100%" height="fit" layout="horizontal-row">
<button id="send" width="20%" height="fit" I18N="In the network lobby" text="Send" />
<spacer width="1%"/>
<label id="timeout-message" width="79%" height="fit"/>
</div>
</box>
<spacer width="3%"/>

4
data/gui/online/server_selection.stkgui
View File

@ -17,6 +17,10 @@
<spacer width="10"/>
<label proportion="1" height="100%" text_align="left"
I18N="In the server selection screen" text="Show only private server(s)"/>
<checkbox width="fit" id="game_started" text_align="left"/>
<spacer width="10"/>
<label proportion="1" height="100%" text_align="left"
I18N="In the server selection screen" text="Hide servers with an ongoing game"/>
</div>
</div>
</div>

2
data/gui/overworld_dialog.stkgui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
<header id="title" width="100%" text_align="center" text="Paused" proportion="3" />
<header id="title" width="100%" text_align="center" text="Paused" proportion="2" />
<!-- FIXME: some play in proportions occur below because the text of an icon
button is added UNDER it and not within its allocated height -->

4
data/gui/race_paused_dialog.stkgui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
<header id="title" width="100%" text_align="center" text="Paused" proportion="3" />
<div x="2%" y="5%" width="90%" height="90%" layout="vertical-row" >
<header id="title" width="100%" text_align="center" text="Paused" proportion="2" />
<!-- FIXME: some play in proportions occur below because the text of an icon
button is added UNDER it and not within its allocated height -->

BIN
data/gui/red_flag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

28
data/gui/track_info.stkgui
View File

@ -2,12 +2,12 @@
<stkgui>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<div x="2%" y="2%" width="96%" height="98%" layout="vertical-row">
<header id="name" height="7%" width="80%" align="center" text_align="center"/>
<spacer width="1" height="1%"/>
<box width="100%" height="40%" padding="10" layout="horizontal-row">
<box width="100%" height="42%" padding="10" layout="horizontal-row">
<!-- Left pane -->
<div proportion="1" height="100%" layout="vertical-row">
<icon-button proportion="1" width="100%" height="100%" id="screenshot" custom_ratio="1.33333"/>
@ -24,7 +24,7 @@
<label id="highscore1" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="2%"/>
<spacer width="1" height="1%"/>
<div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
@ -32,7 +32,7 @@
<label id="highscore2" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="2%"/>
<spacer width="1" height="1%"/>
<div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
@ -40,6 +40,22 @@
<label id="highscore3" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="1%"/>
<div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore4" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="2%" height="1"/>
<label id="highscore4" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="1%"/>
<div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore5" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="2%" height="1"/>
<label id="highscore5" proportion="1" text="(Empty)"/>
</div>
<spacer width="1" height="2%"/>
<label id="author" width="100%" text_align="center" word_wrap="true"/>
@ -50,7 +66,7 @@
</box>
<spacer width="1" height="1%"/>
<box width="100%" height="33%" padding="15" layout="vertical-row">
<box width="100%" height="32%" padding="15" layout="vertical-row">
<div width="100%" height="fit" layout="horizontal-row" >
<label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
<spacer width="40"/>
@ -90,7 +106,7 @@
<spacer width="1" height="1%"/>
</box>
<spacer width="1" height="1%"/>
<buttonbar id="buttons" height="15%" width="100%" align="center">
<buttonbar id="buttons" height="14%" width="100%" align="center">
<icon-button id="start" width="64" height="64" icon="gui/green_check.png"
I18N="In the track info screen" text="Start Race"/>

2
data/gui/user_screen_tab.stkgui
View File

@ -75,7 +75,7 @@
<spacer width="20" height="2%"/>
<div width="90%" align="center" layout="vertical-row" height="18%">
<div width="100%" align="center" layout="vertical-row" height="18%">
<buttonbar id="options" width="100%" height="100%" align="center">
<icon-button id="ok" width="fit" height="fit" icon="gui/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>

265
data/po/supertuxkart.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: supertuxkart\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-23 07:47+0800\n"
"POT-Creation-Date: 2018-09-01 09:37+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -306,10 +306,10 @@ msgstr ""
#. I18N: ./data/gui/confirm_dialog.stkgui
#. I18N: In a 'are you sure?' dialog
#: src/network/protocols/client_lobby.cpp:419
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:169
#: src/network/protocols/client_lobby.cpp:436
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:197
#: src/states_screens/edit_gp_screen.cpp:255
#: src/states_screens/ghost_replay_selection.cpp:311
#: src/states_screens/ghost_replay_selection.cpp:373
msgid "Yes"
msgstr ""
@ -591,6 +591,11 @@ msgstr ""
msgid "Only show replays matching the current difficulty"
msgstr ""
#. I18N: ./data/gui/ghost_replay_selection.stkgui
#. I18N: In the ghost replay selection screen
msgid "Hide multiplayer replays"
msgstr ""
#. I18N: ./data/gui/ghost_replay_selection.stkgui
#. I18N: In the ghost replay selection screen
msgid "Only show replays matching the current version"
@ -608,8 +613,8 @@ msgstr ""
#. I18N: ./data/gui/gp_info.stkgui
#. I18N: In the grand prix info screen
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:135
#: src/states_screens/ghost_replay_selection.cpp:112
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:143
#: src/states_screens/ghost_replay_selection.cpp:128
msgid "Reverse"
msgstr ""
@ -1068,9 +1073,9 @@ msgstr ""
#. I18N: ./data/gui/help7.stkgui
#. I18N: In the help menu
msgid ""
"When input devices are configured, select the 'multiplayer race' icon in the "
"main menu. Each player can press the 'fire' key of their gamepad or keyboard "
"to join the game, and use their input device to select their kart. The game "
"When input devices are configured, select the 'multiplayer' icon in the main "
"menu. Each player can press the 'fire' key of their gamepad or keyboard to "
"join the game, and use their input device to select their kart. The game "
"continues when everyone selected their kart. Note that the mouse may not be "
"used for this operation."
msgstr ""
@ -1228,9 +1233,9 @@ msgstr ""
#. I18N: ./data/gui/online/create_server.stkgui
#. I18N: In the server creation screen
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:137
#: src/states_screens/ghost_replay_selection.cpp:114
#: src/states_screens/server_selection.cpp:105
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:145
#: src/states_screens/ghost_replay_selection.cpp:130
#: src/states_screens/server_selection.cpp:118
msgid "Difficulty"
msgstr ""
@ -1242,7 +1247,7 @@ msgstr ""
#. I18N: Difficulty
#. I18N: ./data/gui/select_challenge.stkgui
#. I18N: Difficulty
#: src/race/race_manager.hpp:579
#: src/race/race_manager.hpp:582
msgid "Novice"
msgstr ""
@ -1254,7 +1259,7 @@ msgstr ""
#. I18N: Difficulty
#. I18N: ./data/gui/select_challenge.stkgui
#. I18N: Difficulty
#: src/race/race_manager.hpp:580
#: src/race/race_manager.hpp:583
msgid "Intermediate"
msgstr ""
@ -1266,7 +1271,7 @@ msgstr ""
#. I18N: Difficulty
#. I18N: ./data/gui/select_challenge.stkgui
#. I18N: Difficulty
#: src/race/race_manager.hpp:581
#: src/race/race_manager.hpp:584
msgid "Expert"
msgstr ""
@ -1276,13 +1281,13 @@ msgstr ""
#. I18N: Difficulty
#. I18N: ./data/gui/select_challenge.stkgui
#. I18N: Difficulty
#: src/race/race_manager.hpp:582
#: src/race/race_manager.hpp:585
msgid "SuperTux"
msgstr ""
#. I18N: ./data/gui/online/create_server.stkgui
#. I18N: In the server creation screen
#: src/states_screens/server_selection.cpp:106
#: src/states_screens/server_selection.cpp:119
msgid "Game mode"
msgstr ""
@ -1384,7 +1389,7 @@ msgstr ""
#. I18N: ./data/gui/online/networking_lobby.stkgui
#. I18N: In networking lobby
#. I18N: In the networking lobby
#: src/states_screens/networking_lobby.cpp:146
#: src/states_screens/networking_lobby.cpp:151
msgid "Lobby"
msgstr ""
@ -1648,6 +1653,11 @@ msgstr ""
msgid "Show only private server(s)"
msgstr ""
#. I18N: ./data/gui/online/server_selection.stkgui
#. I18N: In the server selection screen
msgid "Hide servers with an ongoing game"
msgstr ""
#. I18N: ./data/gui/online/splitscreen_player_dialog.stkgui
#. I18N: Splitscreen player in network
msgid "Add player"
@ -1658,7 +1668,7 @@ msgstr ""
#. I18N: ./data/gui/online/user_info_dialog.stkgui
#. I18N: User info dialog
#: src/states_screens/online_profile_achievements.cpp:71
#: src/states_screens/server_selection.cpp:103
#: src/states_screens/server_selection.cpp:116
msgid "Name"
msgstr ""
@ -1784,8 +1794,8 @@ msgstr ""
#. I18N: Section in the settings menu
#. I18N: ./data/gui/user_screen_tab.stkgui
#. I18N: Section in the settings menu
#: src/states_screens/ghost_replay_selection.cpp:110
#: src/states_screens/server_selection.cpp:104
#: src/states_screens/ghost_replay_selection.cpp:137
#: src/states_screens/server_selection.cpp:117
msgid "Players"
msgstr ""
@ -1833,7 +1843,7 @@ msgstr ""
#. I18N: in the graphical options tooltip;
#. indicates a graphical feature is enabled
#: src/states_screens/dialogs/custom_video_settings.cpp:64
#: src/states_screens/options_screen_video.cpp:412
#: src/states_screens/options_screen_video.cpp:428
msgid "Enabled"
msgstr ""
@ -2093,7 +2103,7 @@ msgstr ""
#. I18N: ./data/gui/track_info.stkgui
#. I18N: for empty highscores entries
#: src/states_screens/track_info_screen.cpp:332
#: src/states_screens/track_info_screen.cpp:328
msgid "(Empty)"
msgstr ""
@ -2448,7 +2458,7 @@ msgstr ""
msgid "Encoding progress:"
msgstr ""
#: src/graphics/irr_driver.cpp:1775 src/graphics/irr_driver.cpp:1780
#: src/graphics/irr_driver.cpp:1778 src/graphics/irr_driver.cpp:1783
#, c-format
msgid "FPS: %d/%d/%d - %d KTris, Ping: %dms"
msgstr ""
@ -2479,7 +2489,7 @@ msgstr ""
#: src/guiengine/widgets/player_kart_widget.cpp:756
#: src/karts/controller/local_player_controller.cpp:415
#: src/karts/controller/player_controller.cpp:410
#: src/network/protocols/client_lobby.cpp:629
#: src/network/protocols/client_lobby.cpp:660
#: src/states_screens/dialogs/splitscreen_player_dialog.cpp:120
#, c-format
msgid "%s (handicapped)"
@ -3172,7 +3182,7 @@ msgstr ""
msgid "You finished the race!"
msgstr ""
#: src/main.cpp:1781
#: src/main.cpp:1788
msgid ""
"SuperTuxKart may connect to a server to download add-ons and notify you of "
"updates. We also collect anonymous hardware statistics to help with the "
@ -3182,23 +3192,23 @@ msgid ""
"edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
msgstr ""
#: src/main.cpp:1973
#: src/main.cpp:1980
msgid "Your screen resolution is too low to run STK."
msgstr ""
#: src/main.cpp:2002
#: src/main.cpp:2009
msgid ""
"Your driver version is too old. Please install the latest video drivers."
msgstr ""
#: src/main.cpp:2020
#: src/main.cpp:2027
#, c-format
msgid ""
"Your OpenGL version appears to be too old. Please verify if an update for "
"your video driver is available. SuperTuxKart requires %s or better."
msgstr ""
#: src/main_loop.cpp:336 src/network/protocols/client_lobby.cpp:78
#: src/main_loop.cpp:333 src/network/protocols/client_lobby.cpp:80
msgid "Server connection timed out."
msgstr ""
@ -3234,7 +3244,7 @@ msgstr ""
msgid "The blue flag has returned!"
msgstr ""
#: src/modes/easter_egg_hunt.cpp:231
#: src/modes/easter_egg_hunt.cpp:236
#, c-format
msgid "Eggs: %d / %d"
msgstr ""
@ -3302,36 +3312,37 @@ msgstr ""
msgid "Capture The Flag"
msgstr ""
#: src/network/protocols/client_lobby.cpp:79
#: src/network/protocols/client_lobby.cpp:81
msgid "Server has been shut down."
msgstr ""
#: src/network/protocols/client_lobby.cpp:80
#: src/network/protocols/client_lobby.cpp:82
msgid "You were kicked from the server."
msgstr ""
#: src/network/protocols/client_lobby.cpp:82
#: src/network/protocols/client_lobby.cpp:650
#: src/network/protocols/client_lobby.cpp:84
#: src/network/protocols/client_lobby.cpp:222
#: src/network/protocols/client_lobby.cpp:681
msgid "Bad network connection is detected."
msgstr ""
#. I18N: Message shown in network lobby to tell user that
#. player name is clickable
#: src/network/protocols/client_lobby.cpp:86
#: src/network/protocols/client_lobby.cpp:88
msgid ""
"Press player name in the list for player management and ranking information."
msgstr ""
#: src/network/protocols/client_lobby.cpp:420
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:169
#: src/network/protocols/client_lobby.cpp:437
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:197
#: src/states_screens/dialogs/message_dialog.cpp:129
#: src/states_screens/edit_gp_screen.cpp:255
#: src/states_screens/ghost_replay_selection.cpp:311
#: src/states_screens/ghost_replay_selection.cpp:373
msgid "No"
msgstr ""
#. I18N: Vote message in network game from a player
#: src/network/protocols/client_lobby.cpp:426
#: src/network/protocols/client_lobby.cpp:443
#, c-format
msgid ""
"Track: %s,\n"
@ -3339,13 +3350,13 @@ msgid ""
msgstr ""
#. I18N: Vote message in network game from a player
#: src/network/protocols/client_lobby.cpp:434
#: src/network/protocols/client_lobby.cpp:451
#, c-format
msgid "Track: %s"
msgstr ""
#. I18N: Vote message in network game from a player
#: src/network/protocols/client_lobby.cpp:441
#: src/network/protocols/client_lobby.cpp:458
#, c-format
msgid ""
"Track: %s,\n"
@ -3354,7 +3365,7 @@ msgid ""
msgstr ""
#. I18N: Vote message in network game from a player
#: src/network/protocols/client_lobby.cpp:448
#: src/network/protocols/client_lobby.cpp:465
#, c-format
msgid ""
"Track: %s,\n"
@ -3363,97 +3374,97 @@ msgid ""
msgstr ""
#. I18N: Vote message in network game from a player
#: src/network/protocols/client_lobby.cpp:456
#: src/network/protocols/client_lobby.cpp:473
#, c-format
msgid ""
"Track: %s,\n"
"laps: %d, reversed: %s"
msgstr ""
#: src/network/protocols/client_lobby.cpp:486
#: src/network/protocols/client_lobby.cpp:503
#, c-format
msgid "%s disconnected."
msgstr ""
#. I18N: In the networking lobby
#: src/network/protocols/client_lobby.cpp:530
#: src/network/protocols/client_lobby.cpp:547
#, c-format
msgid "Server name: %s"
msgstr ""
#. I18N: In the networking lobby
#: src/network/protocols/client_lobby.cpp:538
#: src/network/protocols/client_lobby.cpp:555
#: src/states_screens/race_result_gui.cpp:1640
#, c-format
msgid "Difficulty: %s"
msgstr ""
#. I18N: In the networking lobby
#: src/network/protocols/client_lobby.cpp:543
#: src/network/protocols/client_lobby.cpp:560
#, c-format
msgid "Max players: %d"
msgstr ""
#: src/network/protocols/client_lobby.cpp:560
#: src/network/protocols/client_lobby.cpp:577
#, c-format
msgid "Game mode: %s"
msgstr ""
#. I18N: In the create server screen for soccer server
#: src/network/protocols/client_lobby.cpp:572
#: src/network/protocols/client_lobby.cpp:589
#: src/states_screens/create_server_screen.cpp:193
msgid "Time limit"
msgstr ""
#. I18N: In the create server screen for soccer server
#: src/network/protocols/client_lobby.cpp:573
#: src/network/protocols/client_lobby.cpp:590
#: src/states_screens/create_server_screen.cpp:195
msgid "Goals limit"
msgstr ""
#. I18N: In the networking lobby
#: src/network/protocols/client_lobby.cpp:577
#: src/network/protocols/client_lobby.cpp:594
#, c-format
msgid "Soccer game type: %s"
msgstr ""
#: src/network/protocols/client_lobby.cpp:587
#: src/network/protocols/client_lobby.cpp:604
#, c-format
msgid "Grand prix progress: %d / %d"
msgstr ""
#. I18N: Display when all players are in red or blue team, which the race
#. will not be allowed to start
#: src/network/protocols/client_lobby.cpp:642
#: src/network/protocols/client_lobby.cpp:673
msgid "All players joined red or blue team."
msgstr ""
#. I18N: Display when a player is allow to control the server
#: src/network/protocols/client_lobby.cpp:672
#: src/network/protocols/client_lobby.cpp:703
msgid "You are now the owner of server."
msgstr ""
#: src/network/protocols/client_lobby.cpp:710
#: src/network/protocols/client_lobby.cpp:741
msgid "Connection refused: Server is busy."
msgstr ""
#: src/network/protocols/client_lobby.cpp:714
#: src/network/protocols/client_lobby.cpp:745
msgid "Connection refused: You are banned from the server."
msgstr ""
#: src/network/protocols/client_lobby.cpp:718
#: src/network/protocols/client_lobby.cpp:749
msgid "Connection refused: Server password is incorrect."
msgstr ""
#: src/network/protocols/client_lobby.cpp:722
#: src/network/protocols/client_lobby.cpp:753
msgid "Connection refused: Game data is incompatible."
msgstr ""
#: src/network/protocols/client_lobby.cpp:726
#: src/network/protocols/client_lobby.cpp:757
msgid "Connection refused: Server is full."
msgstr ""
#: src/network/protocols/client_lobby.cpp:730
#: src/network/protocols/client_lobby.cpp:761
msgid "Connection refused: Invalid player connecting."
msgstr ""
@ -3468,7 +3479,7 @@ msgid "Cannot connect to server %s."
msgstr ""
#. I18N: Official means this server is hosted by STK team
#: src/network/server.cpp:73
#: src/network/server.cpp:74
msgid "Official"
msgstr ""
@ -3664,7 +3675,7 @@ msgstr ""
#: src/states_screens/dialogs/custom_video_settings.cpp:62
#: src/states_screens/dialogs/custom_video_settings.cpp:69
#: src/states_screens/dialogs/custom_video_settings.cpp:85
#: src/states_screens/options_screen_video.cpp:415
#: src/states_screens/options_screen_video.cpp:431
msgid "Disabled"
msgstr ""
@ -3794,7 +3805,7 @@ msgstr[1] ""
#. I18N: if only important particles effects is enabled
#: src/states_screens/dialogs/custom_video_settings.cpp:63
#: src/states_screens/options_screen_video.cpp:417
#: src/states_screens/options_screen_video.cpp:433
msgid "Important only"
msgstr ""
@ -3804,7 +3815,7 @@ msgstr ""
#: src/states_screens/dialogs/custom_video_settings.cpp:71
#: src/states_screens/dialogs/custom_video_settings.cpp:80
#: src/states_screens/dialogs/custom_video_settings.cpp:86
#: src/states_screens/options_screen_video.cpp:424
#: src/states_screens/options_screen_video.cpp:440
msgid "Low"
msgstr ""
@ -3814,35 +3825,40 @@ msgstr ""
#: src/states_screens/dialogs/custom_video_settings.cpp:73
#: src/states_screens/dialogs/custom_video_settings.cpp:81
#: src/states_screens/dialogs/custom_video_settings.cpp:87
#: src/states_screens/options_screen_video.cpp:427
#: src/states_screens/options_screen_video.cpp:443
msgid "High"
msgstr ""
#. I18N: in the graphical options tooltip;
#. indicates the rendered image quality is very low
#: src/states_screens/dialogs/custom_video_settings.cpp:79
#: src/states_screens/options_screen_video.cpp:421
#: src/states_screens/options_screen_video.cpp:437
msgid "Very Low"
msgstr ""
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:140
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:148
#: src/states_screens/edit_gp_screen.cpp:65
#: src/states_screens/ghost_replay_selection.cpp:116
#: src/states_screens/ghost_replay_selection.cpp:132
msgid "Laps"
msgstr ""
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:142
#: src/states_screens/ghost_replay_selection.cpp:117
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:150
#: src/states_screens/ghost_replay_selection.cpp:133
msgid "Time"
msgstr ""
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:144
#: src/states_screens/ghost_replay_selection.cpp:118
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:152
#: src/states_screens/ghost_replay_selection.cpp:134
msgid "Kart"
msgstr ""
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:154
#: src/states_screens/ghost_replay_selection.cpp:135
msgid "User"
msgstr ""
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:146
#: src/states_screens/ghost_replay_selection.cpp:120
#: src/states_screens/dialogs/ghost_replay_info_dialog.cpp:156
#: src/states_screens/ghost_replay_selection.cpp:139
msgid "Version"
msgstr ""
@ -3992,7 +4008,7 @@ msgid "Random Track"
msgstr ""
#: src/states_screens/edit_gp_screen.cpp:64
#: src/states_screens/ghost_replay_selection.cpp:109
#: src/states_screens/ghost_replay_selection.cpp:126
msgid "Track"
msgstr ""
@ -4001,7 +4017,7 @@ msgid "Reversed"
msgstr ""
#: src/states_screens/edit_gp_screen.cpp:122
#: src/states_screens/ghost_replay_selection.cpp:406
#: src/states_screens/ghost_replay_selection.cpp:478
#: src/states_screens/grand_prix_editor_screen.cpp:109
#, c-format
msgid "Are you sure you want to remove '%s'?"
@ -4132,7 +4148,7 @@ msgid "Locked"
msgstr ""
#: src/states_screens/kart_selection.cpp:982
#: src/states_screens/networking_lobby.cpp:248
#: src/states_screens/networking_lobby.cpp:292
msgid ""
"Everyone:\n"
"Press the 'Select' button to join the game"
@ -4170,7 +4186,18 @@ msgstr ""
msgid "Please wait while the add-ons are loading"
msgstr ""
#: src/states_screens/networking_lobby.cpp:227
#: src/states_screens/networking_lobby.cpp:229
#, c-format
msgid "Lobby (ping: %dms)"
msgstr ""
#. I18N: In the networking lobby, show when player is required to wait
#. before the current game finish
#: src/states_screens/networking_lobby.cpp:239
msgid "Please wait for current game to end."
msgstr ""
#: src/states_screens/networking_lobby.cpp:267
#, c-format
msgid "Game will start if there is more than %d player."
msgid_plural "Game will start if there are more than %d players."
@ -4179,27 +4206,22 @@ msgstr[1] ""
#. I18N: In the networking lobby, display the starting timeout
#. for owner-less server
#: src/states_screens/networking_lobby.cpp:240
#: src/states_screens/networking_lobby.cpp:280
#, c-format
msgid "Game will start after %d second."
msgid_plural "Game will start after %d seconds."
msgstr[0] ""
msgstr[1] ""
#: src/states_screens/networking_lobby.cpp:269
#: src/states_screens/networking_lobby.cpp:312
#, c-format
msgid "Connecting to server %s"
msgstr ""
#: src/states_screens/networking_lobby.cpp:274
#: src/states_screens/networking_lobby.cpp:317
msgid "Finding a quick play server"
msgstr ""
#: src/states_screens/networking_lobby.cpp:303
#, c-format
msgid "Lobby (ping: %dms)"
msgstr ""
#: src/states_screens/online_profile_achievements.cpp:77
msgid "Progress"
msgstr ""
@ -4415,81 +4437,81 @@ msgid ""
msgstr ""
#. I18N: custom video settings
#: src/states_screens/options_screen_video.cpp:394
#: src/states_screens/options_screen_video.cpp:410
msgid "Custom"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:430
#: src/states_screens/options_screen_video.cpp:446
#, c-format
msgid "Particles Effects: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:436
#: src/states_screens/options_screen_video.cpp:452
#, c-format
msgid "Animated Characters: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:439
#: src/states_screens/options_screen_video.cpp:455
#, c-format
msgid "Dynamic lights: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:442
#: src/states_screens/options_screen_video.cpp:458
#, c-format
msgid "Motion blur: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:445
#: src/states_screens/options_screen_video.cpp:461
#, c-format
msgid "Anti-aliasing: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:448
#: src/states_screens/options_screen_video.cpp:464
#, c-format
msgid "Ambient occlusion: %s"
msgstr ""
#: src/states_screens/options_screen_video.cpp:452
#: src/states_screens/options_screen_video.cpp:468
#, c-format
msgid "Shadows: %s"
msgstr ""
#: src/states_screens/options_screen_video.cpp:454
#: src/states_screens/options_screen_video.cpp:470
#, c-format
msgid "Shadows: %i"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:457
#: src/states_screens/options_screen_video.cpp:473
#, c-format
msgid "Bloom: %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:461
#: src/states_screens/options_screen_video.cpp:477
#, c-format
msgid "Glow (outlines): %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:465
#: src/states_screens/options_screen_video.cpp:481
#, c-format
msgid "Light shaft (God rays): %s"
msgstr ""
#. I18N: in graphical options
#: src/states_screens/options_screen_video.cpp:469
#: src/states_screens/options_screen_video.cpp:485
#, c-format
msgid "Depth of field: %s"
msgstr ""
#: src/states_screens/options_screen_video.cpp:474
#: src/states_screens/options_screen_video.cpp:490
#, c-format
msgid "Rendered image quality: %s"
msgstr ""
@ -4514,26 +4536,33 @@ msgstr ""
msgid "GOAL!"
msgstr ""
#. I18N: Shown waiting for other players in network to finish loading or
#. waiting
#: src/states_screens/race_gui_base.cpp:75
#: src/states_screens/race_result_gui.cpp:268
msgid "Waiting for others"
msgstr ""
#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
#: src/states_screens/race_gui_base.cpp:552
#: src/states_screens/race_gui_base.cpp:555
msgid "by"
msgstr ""
#: src/states_screens/race_gui_base.cpp:662
#: src/states_screens/race_gui_base.cpp:677
msgid "Collect nitro!"
msgstr ""
#: src/states_screens/race_gui_base.cpp:664
#: src/states_screens/race_gui_base.cpp:679
msgid "Follow the leader!"
msgstr ""
#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
#: src/states_screens/race_gui_base.cpp:845
#: src/states_screens/race_gui_base.cpp:860
#, c-format
msgid "Top %i"
msgstr ""
#: src/states_screens/race_gui.cpp:403 src/states_screens/race_gui.cpp:405
#: src/states_screens/race_gui.cpp:401 src/states_screens/race_gui.cpp:403
msgid "Challenge Failed"
msgstr ""
@ -4586,10 +4615,6 @@ msgstr ""
msgid "Back to the menu"
msgstr ""
#: src/states_screens/race_result_gui.cpp:268
msgid "Waiting for others"
msgstr ""
#: src/states_screens/race_result_gui.cpp:379
msgid "Do you really want to abort the Grand Prix?"
msgstr ""
@ -4720,51 +4745,51 @@ msgstr ""
#. I18N: In server selection screen, owner of server, only displayed
#. if it's localhost or friends'
#: src/states_screens/server_selection.cpp:111
#: src/states_screens/server_selection.cpp:124
msgid "Owner"
msgstr ""
#. I18N: In server selection screen, distance to server
#: src/states_screens/server_selection.cpp:113
#: src/states_screens/server_selection.cpp:126
msgid "Distance (km)"
msgstr ""
#. I18N: In server selection screen, unknown distance to server
#: src/states_screens/server_selection.cpp:189
#: src/states_screens/server_selection.cpp:209
msgid "Unknown"
msgstr ""
#: src/states_screens/server_selection.cpp:295
#: src/states_screens/server_selection.cpp:315
msgid "No server is available."
msgstr ""
#: src/states_screens/server_selection.cpp:303
#: src/states_screens/server_selection.cpp:323
msgid "Fetching servers"
msgstr ""
#. I18N: when showing who is the author of track '%s'
#. I18N: (place %s where the name of the author should appear)
#: src/states_screens/track_info_screen.cpp:110
#: src/states_screens/track_info_screen.cpp:108
#, c-format
msgid "Track by %s"
msgstr ""
#. I18N: the max players supported by an arena.
#: src/states_screens/track_info_screen.cpp:118
#: src/states_screens/track_info_screen.cpp:116
#, c-format
msgid "Max players supported: %d"
msgstr ""
#. I18N: In the track info screen
#. I18N: In track screen
#: src/states_screens/track_info_screen.cpp:216
#: src/states_screens/track_info_screen.cpp:214
#: src/states_screens/tracks_screen.cpp:317
msgid "Drive in reverse"
msgstr ""
#. I18N: In the track info screen
#. I18N: In track screen
#: src/states_screens/track_info_screen.cpp:221
#: src/states_screens/track_info_screen.cpp:219
#: src/states_screens/tracks_screen.cpp:266
#: src/states_screens/tracks_screen.cpp:302
msgid "Random item location"
@ -4792,7 +4817,7 @@ msgid ""
msgstr ""
#. I18N: In tracks screen, about voting of tracks in network
#: src/states_screens/tracks_screen.cpp:465
#: src/states_screens/tracks_screen.cpp:480
#, c-format
msgid "Remaining time: %d"
msgstr ""

2
sources.cmake
View File

@ -1,5 +1,5 @@
# Modify this file to change the last-modified date when you add/remove a file.
# This will then trigger a new cmake run automatically.
# This will then trigger a new cmake run automatically.
file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")

4
src/config/user_config.hpp
View File

@ -774,8 +774,8 @@ namespace UserConfigParams
PARAM_PREFIX IntUserConfigParam m_jitter_tolerance
PARAM_DEFAULT(IntUserConfigParam(100, "jitter-tolerance",
&m_network_group, "Tolerance of jitter in network allowed (in ms)."));
PARAM_PREFIX IntUserConfigParam m_timer_sync_tolerance
PARAM_DEFAULT(IntUserConfigParam(50, "timer-sync-tolerance",
PARAM_PREFIX IntUserConfigParam m_timer_sync_difference_tolerance
PARAM_DEFAULT(IntUserConfigParam(5, "timer-sync-difference-tolerance",
&m_network_group, "Max time difference tolerance (in ms) to synchronize timer with server."));
PARAM_PREFIX BoolUserConfigParam m_kick_high_ping_players
PARAM_DEFAULT(BoolUserConfigParam(false, "kick-high-ping-players",

9
src/graphics/2dutils.cpp
View File

@ -700,5 +700,14 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
glGetError();
} // GL32_draw2DRectangle
void preloadShaders()
{
Primitive2DList::getInstance();
UniformColoredTextureRectShader::getInstance();
TextureRectShader::getInstance();
ColoredRectShader::getInstance();
ColoredTextureRectShader::getInstance();
} // preloadShaders
#endif // !SERVER_ONLY

2
src/graphics/2dutils.hpp
View File

@ -28,6 +28,8 @@
#include <SColor.h>
#include <SVertexIndex.h>
void preloadShaders();
void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
const irr::core::rect<irr::s32>& destRect,
const irr::core::rect<irr::s32>& sourceRect,

22
src/graphics/cpu_particle_manager.cpp
View File

@ -134,6 +134,28 @@ CPUParticleManager::GLParticle::GLParticle(bool flips)
glBindVertexArray(0);
} // GLParticle
// ----------------------------------------------------------------------------
CPUParticleManager::CPUParticleManager()
{
assert(CVS->isGLSL());
const float vertices[] =
{
-0.5f, 0.5f, 0.0f, 0.0f,
0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, 1.0f, 1.0f,
};
glGenBuffers(1, &m_particle_quad);
glBindBuffer(GL_ARRAY_BUFFER, m_particle_quad);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
// For preloading shaders
ParticleRenderer::getInstance();
AlphaTestParticleRenderer::getInstance();
} // CPUParticleManager
// ----------------------------------------------------------------------------
void CPUParticleManager::addBillboardNode(scene::IBillboardSceneNode* node)
{

16
src/graphics/cpu_particle_manager.hpp
View File

@ -116,21 +116,7 @@ private:
public:
// ------------------------------------------------------------------------
CPUParticleManager()
{
const float vertices[] =
{
-0.5f, 0.5f, 0.0f, 0.0f,
0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, 1.0f, 1.0f,
};
glGenBuffers(1, &m_particle_quad);
glBindBuffer(GL_ARRAY_BUFFER, m_particle_quad);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices,
GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
CPUParticleManager();
// ------------------------------------------------------------------------
~CPUParticleManager()
{

5
src/graphics/irr_driver.cpp
View File

@ -638,8 +638,11 @@ void IrrDriver::initDevice()
#endif
#ifndef SERVER_ONLY
if(CVS->isGLSL())
if (CVS->isGLSL())
{
m_renderer = new ShaderBasedRenderer();
preloadShaders();
}
else
m_renderer = new FixedPipelineRenderer();
#endif

3
src/graphics/post_processing.cpp
View File

@ -758,6 +758,9 @@ PostProcessing::PostProcessing()
STKTexManager::getInstance()->addTexture(m_areamap);
areamap->drop();
// For preloading shaders
MotionBlurShader::getInstance();
LightningShader::getInstance();
} // PostProcessing
// ----------------------------------------------------------------------------

22
src/graphics/sp/sp_mesh_buffer.cpp
View File

@ -127,7 +127,7 @@ void SPMeshBuffer::uploadGLMesh()
{
m_textures[i][j] = SPTextureManager::get()->getTexture
(m_shaders[0]->hasTextureLayer(j) ?
std::get<2>(m_stk_material[i])->getSamplerPath(j) : "",
std::get<2>(m_stk_material[i])->getSamplerPath(j) : "",
j == 0 ? std::get<2>(m_stk_material[i]) : NULL,
m_shaders[0]->isSrgbForTextureLayer(j),
std::get<2>(m_stk_material[i])->getContainerId());
@ -469,10 +469,22 @@ void SPMeshBuffer::reloadTextureCompare()
void SPMeshBuffer::setSTKMaterial(Material* m)
{
m_stk_material[0] = std::make_tuple(0u, getIndexCount(), m);
m_shaders[0] = SPShaderManager::get()->getSPShader(
std::get<2>(m_stk_material[0])->getShaderName());
m_shaders[1] = SPShaderManager::get()->getSPShader(
std::get<2>(m_stk_material[0])->getShaderName() + "_skinned");
const std::string shader_name =
std::get<2>(m_stk_material[0])->getShaderName();
const std::string skinned_shader_name =
std::get<2>(m_stk_material[0])->getShaderName() + "_skinned";
m_shaders[0] = SPShaderManager::get()->getSPShader(shader_name);
if (!m_shaders[0])
{
Log::warn("SPMeshBuffer", "%s shader is missing, fallback to solid",
shader_name.c_str());
m_shaders[0] = SPShaderManager::get()->getSPShader("solid");
}
m_shaders[1] = SPShaderManager::get()->getSPShader(skinned_shader_name);
if (!m_shaders[1])
m_shaders[1] = SPShaderManager::get()->getSPShader("solid_skinned");
} // setSTKMaterial
}

5
src/guiengine/event_handler.cpp
View File

@ -821,7 +821,10 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
return EVENT_BLOCK;
}
w->onClick();
EventPropagation result = w->onClick();
if (result == EVENT_BLOCK)
return result;
// These events are only triggered by mouse (or so I hope)
// The player that owns the mouser receives "game master" priviledges

2
src/guiengine/widget.hpp
View File

@ -674,7 +674,7 @@ namespace GUIEngine
bool ok() const { return (m_magic_number == 0xCAFEC001); }
/** Gets called when the widget is active and got clicked. (Only works for button widgets for now.) */
virtual void onClick() { }
virtual EventPropagation onClick() { return EVENT_LET; }
virtual irr::core::dimension2di getDimension() const { return irr::core::dimension2di(m_w, m_h); }
};

5
src/guiengine/widgets/CGUISTKListBox.cpp
View File

@ -573,7 +573,10 @@ void CGUISTKListBox::draw()
}
//Position back to inital pos
if (IconBank && (Items[i].m_contents[x].m_icon > -1))
textRect.UpperLeftCorner.X -= ItemsIconWidth+6;
textRect.UpperLeftCorner.X -= ItemsIconWidth;
textRect.UpperLeftCorner.X -= 6;
//Calculate new beginning
textRect.UpperLeftCorner.X += Items[i].m_contents[x].m_proportion * part_size;
}

29
src/guiengine/widgets/list_widget.cpp
View File

@ -54,11 +54,11 @@ void ListWidget::setIcons(STKModifiedSpriteBank* icons, int size)
m_use_icons = (icons != NULL);
m_icons = icons;
CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
assert(list != NULL);
if (m_use_icons)
{
CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
assert(list != NULL);
list->setSpriteBank(m_icons);
// determine needed height
@ -83,6 +83,10 @@ void ListWidget::setIcons(STKModifiedSpriteBank* icons, int size)
list->setItemHeight( item_height );
}
}
else
{
list->setSpriteBank(NULL);
}
}
@ -145,7 +149,8 @@ void ListWidget::createHeader()
}
int x = m_x;
for (unsigned int n=0; n<m_header.size(); n++)
int scrollbar_width = GUIEngine::getSkin()->getSize(EGDS_SCROLLBAR_SIZE);
for (unsigned int n=0; n<m_header.size()+1; n++)
{
std::ostringstream name;
name << m_properties[PROP_ID];
@ -160,12 +165,22 @@ void ListWidget::createHeader()
header->m_h = header_height;
header->m_x = x;
header->m_w = (int)(m_w * float(m_header[n].m_proportion)
/float(proportion_total));
if (n == m_header.size())
{
header->m_w = scrollbar_width;
header->setActive(false);
}
else
{
int header_width = m_w - scrollbar_width;
header->m_w = (int)(header_width * float(m_header[n].m_proportion)
/float(proportion_total));
}
x += header->m_w;
header->setText( m_header[n].m_text );
if (n < m_header.size())
header->setText( m_header[n].m_text );
header->m_properties[PROP_ID] = name.str();
header->add();

4
src/guiengine/widgets/rating_bar_widget.cpp
View File

@ -112,10 +112,12 @@ void RatingBarWidget::setStepValuesByMouse(const core::position2di & mouse_posit
}
}
void RatingBarWidget::onClick()
EventPropagation RatingBarWidget::onClick()
{
if(m_allow_voting)
m_rating = m_hover_rating;
return EVENT_LET;
}

2
src/guiengine/widgets/rating_bar_widget.hpp
View File

@ -73,7 +73,7 @@ namespace GUIEngine
void setStepValuesByMouse(const core::position2di & mouse_position, const core::recti & stars_rect);
virtual void onClick();
virtual EventPropagation onClick();
void allowVoting() { m_allow_voting = true; }
};

8
src/guiengine/widgets/ribbon_widget.cpp
View File

@ -779,6 +779,14 @@ EventPropagation RibbonWidget::mouseHovered(Widget* child,
return EVENT_BLOCK;
} // mouseHovered
EventPropagation RibbonWidget::onClick()
{
if (m_ribbon_type == RIBBON_TOOLBAR)
return EVENT_BLOCK;
return EVENT_LET;
}
// ----------------------------------------------------------------------------
const std::string& RibbonWidget::getSelectionIDString(const int playerID)
{

2
src/guiengine/widgets/ribbon_widget.hpp
View File

@ -92,6 +92,8 @@ namespace GUIEngine
virtual EventPropagation focused(const int playerID) OVERRIDE;
virtual void unfocused(const int playerID, Widget* new_focus) OVERRIDE;
virtual EventPropagation onClick() OVERRIDE;
PtrVector<irr::gui::IGUIStaticText, REF> m_labels;
IRibbonListener* m_listener;

6
src/guiengine/widgets/spinner_widget.cpp
View File

@ -457,13 +457,13 @@ void SpinnerWidget::setCustomText(const core::stringw& text)
// -----------------------------------------------------------------------------
void SpinnerWidget::onClick()
EventPropagation SpinnerWidget::onClick()
{
if (m_children[1].m_deactivated ||
m_children[1].m_properties[PROP_ID] != "spinnerbody" ||
!isGauge())
{
return;
return EVENT_LET;
}
const core::position2di mouse_position
@ -487,6 +487,8 @@ void SpinnerWidget::onClick()
setValue(new_value);
}
return EVENT_LET;
}
// -----------------------------------------------------------------------------

2
src/guiengine/widgets/spinner_widget.hpp
View File

@ -96,7 +96,7 @@ namespace GUIEngine
virtual EventPropagation leftPressed(const int playerID);
/** \brief implementing method from base class Widget */
virtual void onClick();
virtual EventPropagation onClick();
/** When inferring widget size from its label length, this method will be called to
* if/how much space must be added to the raw label's size for the widget to be large enough */

3
src/items/attachment.cpp
View File

@ -607,7 +607,8 @@ void Attachment::update(int ticks)
m_bubble_explode_sound->play();
}
ItemManager::get()->dropNewItem(Item::ITEM_BUBBLEGUM, m_kart);
if (!m_kart->isGhostKart())
ItemManager::get()->dropNewItem(Item::ITEM_BUBBLEGUM, m_kart);
}
break;
} // switch

6
src/items/swatter.cpp
View File

@ -206,7 +206,7 @@ bool Swatter::updateAndTestFinished(int ticks)
float min_dist2
= m_kart->getKartProperties()->getSwatterDistance();
if (dist2 < min_dist2)
if (dist2 < min_dist2 && !m_kart->isGhostKart())
{
// Start squashing
m_animation_phase = SWATTER_TO_TARGET;
@ -312,6 +312,8 @@ void Swatter::chooseTarget()
void Swatter::pointToTarget()
{
#ifndef SERVER_ONLY
if (m_kart->isGhostKart()) return;
if(!m_target)
{
m_scene_node->setRotation(core::vector3df());
@ -334,6 +336,8 @@ void Swatter::pointToTarget()
*/
void Swatter::squashThingsAround()
{
if (m_kart->isGhostKart()) return;
const KartProperties *kp = m_kart->getKartProperties();
AbstractKart* closest_kart = m_closest_kart;

45
src/karts/controller/skidding_ai.cpp
View File

@ -562,7 +562,7 @@ void SkiddingAI::handleSteering(float dt)
// Potentially adjust the point to aim for in order to either
// aim to collect item, or steer to avoid a bad item.
if(m_ai_properties->m_collect_avoid_items)
if(m_ai_properties->m_collect_avoid_items && m_kart->getBlockedByPlungerTicks()<=0)
handleItemCollectionAndAvoidance(&aim_point, last_node);
steer_angle = steerToPoint(aim_point);
@ -2054,9 +2054,24 @@ void SkiddingAI::handleAcceleration(int ticks)
if(m_kart->getBlockedByPlungerTicks()>0)
{
if(m_kart->getSpeed() < m_kart->getCurrentMaxSpeed() / 2)
m_controls->setAccel(0.05f);
else
int item_skill = computeSkill(ITEM_SKILL);
float accel_threshold = 0.5f;
if (item_skill == 0)
accel_threshold = 0.3f;
else if (item_skill == 1)
accel_threshold = 0.5f;
else if (item_skill == 2)
accel_threshold = 0.6f;
else if (item_skill == 3)
accel_threshold = 0.7f;
else if (item_skill == 4)
accel_threshold = 0.8f;
// The best players, knowing the track, don't slow down with a plunger
else if (item_skill == 5)
accel_threshold = 1.0f;
if(m_kart->getSpeed() > m_kart->getCurrentMaxSpeed() * accel_threshold)
m_controls->setAccel(0.0f);
return;
}
@ -3071,10 +3086,28 @@ void SkiddingAI::setSteering(float angle, float dt)
else if(steer_fraction < -1.0f) steer_fraction = -1.0f;
// Restrict steering when a plunger is in the face
// The degree of restriction depends on item_skill
//FIXME : the AI speed estimate in curves don't account for this restriction
if(m_kart->getBlockedByPlungerTicks()>0)
{
if (steer_fraction > 0.5f) steer_fraction = 0.5f;
else if(steer_fraction < -0.5f) steer_fraction = -0.5f;
int item_skill = computeSkill(ITEM_SKILL);
float steering_limit = 0.5f;
if (item_skill == 0)
steering_limit = 0.35f;
else if (item_skill == 1)
steering_limit = 0.45f;
else if (item_skill == 2)
steering_limit = 0.55f;
else if (item_skill == 3)
steering_limit = 0.65f;
else if (item_skill == 4)
steering_limit = 0.75f;
else if (item_skill == 5)
steering_limit = 0.9f;
if (steer_fraction > steering_limit) steer_fraction = steering_limit;
else if(steer_fraction < -steering_limit) steer_fraction = -steering_limit;
}
const Skidding *skidding = m_kart->getSkidding();

10
src/karts/ghost_kart.cpp
View File

@ -92,6 +92,8 @@ void GhostKart::updateGraphics(float dt)
// immediately call Moveable's updateGraphics.
Moveable::updateSmoothedGraphics(dt);
Moveable::updateGraphics(center_shift, btQuaternion(0, 0, 0, 1));
// Also update attachment's graphics
m_attachment->updateGraphics(dt);
} // updateGraphics
// ----------------------------------------------------------------------------
@ -150,15 +152,15 @@ void GhostKart::update(int ticks)
Attachment::AttachmentType attach_type =
ReplayRecorder::codeToEnumAttach(m_all_bonus_info[idx].m_attachment);
int attach_ticks = 0;
int16_t attach_ticks = 0;
if (attach_type == Attachment::ATTACH_BUBBLEGUM_SHIELD)
attach_ticks = stk_config->time2Ticks(10);
attach_ticks = (int16_t)stk_config->time2Ticks(10);
else if (attach_type == Attachment::ATTACH_BOMB)
attach_ticks = stk_config->time2Ticks(30);
attach_ticks = (int16_t)stk_config->time2Ticks(30);
// The replay history will take care of clearing,
// just make sure it won't expire by itself
else
attach_ticks = stk_config->time2Ticks(300);
attach_ticks = 32767;
if ( attach_type == Attachment::ATTACH_NOTHING )
m_attachment->clear();

8
src/karts/max_speed.cpp
View File

@ -323,6 +323,14 @@ void MaxSpeed::update(int ticks)
m_current_max_speed += speedup.getSpeedIncrease();
m_add_engine_force += speedup.getEngineForce();
}
if (getSpeedIncreaseTicksLeft(MS_INCREASE_SKIDDING) > 0 &&
getSpeedIncreaseTicksLeft(MS_INCREASE_RED_SKIDDING) > 0)
{
SpeedIncrease &speedup = m_speed_increase[MS_INCREASE_SKIDDING];
m_current_max_speed -= speedup.getSpeedIncrease();
m_add_engine_force -= speedup.getEngineForce();
}
m_current_max_speed *= slowdown_factor;
// Then cap the current speed of the kart

1
src/karts/max_speed.hpp
View File

@ -37,6 +37,7 @@ public:
MS_INCREASE_NITRO,
MS_INCREASE_RUBBER,
MS_INCREASE_SKIDDING,
MS_INCREASE_RED_SKIDDING,
MS_INCREASE_MAX};
/** The categories to use for decreasing the speed of a kart:

4
src/karts/skidding.cpp
View File

@ -503,8 +503,10 @@ void Skidding::update(int ticks, bool is_on_ground,
->setCreationRateRelative(KartGFX::KGFX_SKIDL, 1.0f);
m_kart->getKartGFX()
->setCreationRateRelative(KartGFX::KGFX_SKIDR, 1.0f);
unsigned int bonus_cat = (level == 1) ? MaxSpeed::MS_INCREASE_SKIDDING :
MaxSpeed::MS_INCREASE_RED_SKIDDING;
m_kart->m_max_speed->
instantSpeedIncrease(MaxSpeed::MS_INCREASE_SKIDDING,
instantSpeedIncrease(bonus_cat,
bonus_speed, bonus_speed,
bonus_force,
stk_config->time2Ticks(bonus_time),

9
src/main.cpp
View File

@ -574,6 +574,7 @@ void cmdLineHelp()
" -v, --version Print version of SuperTuxKart.\n"
" --trackdir=DIR A directory from which additional tracks are "
"loaded.\n"
" --seed=n Seed for random number generation to provide reproducible behavior.\n"
" --profile-laps=n Enable automatic driven profile mode for n "
"laps.\n"
" --profile-time=n Enable automatic driven profile mode for n "
@ -906,6 +907,12 @@ int handleCmdLinePreliminary()
if (CommandLine::has("--no-sound"))
UserConfigParams::m_enable_sound = false;
if (CommandLine::has("--seed", &n))
{
srand(n);
Log::info("main", "STK using random seed (%d)", n);
}
return 0;
} // handleCmdLinePreliminary
@ -1187,7 +1194,7 @@ int handleCmdLine()
NetworkConfig::get()->setIsWAN();
NetworkConfig::get()->setIsServer(false);
auto server = std::make_shared<Server>(0, L"", 0, 0, 0, 0, server_addr,
!server_password.empty());
!server_password.empty(), false);
NetworkConfig::get()->addNetworkPlayer(
input_manager->getDeviceManager()->getLatestUsedDevice(),
PlayerManager::getCurrentPlayer(), PLAYER_DIFFICULTY_NORMAL);

27
src/main_loop.cpp
View File

@ -42,6 +42,7 @@
#include "race/race_manager.hpp"
#include "states_screens/state_manager.hpp"
#include "utils/profiler.hpp"
#include "utils/time.hpp"
#ifndef WIN32
#include <unistd.h>
@ -66,8 +67,6 @@ LRESULT CALLBACK separateProcessProc(_In_ HWND hwnd, _In_ UINT uMsg,
MainLoop::MainLoop(unsigned parent_pid)
: m_abort(false), m_ticks_adjustment(0), m_parent_pid(parent_pid)
{
m_network_timer.store(StkTime::getRealTimeMs());
m_start_game_ticks.store(0);
m_curr_time = 0;
m_prev_time = 0;
m_throttle_fps = true;
@ -113,11 +112,9 @@ float MainLoop::getLimitedDt()
return 1.0f/60.0f;
}
IrrlichtDevice* device = irr_driver->getDevice();
while( 1 )
{
m_curr_time = device->getTimer()->getRealTime();
m_curr_time = StkTime::getRealTimeMs();
dt = (float)(m_curr_time - m_prev_time);
// On a server (i.e. without graphics) the frame rate can be under
// 1 ms, i.e. dt = 0. Additionally, the resolution of a sleep
@ -133,7 +130,7 @@ float MainLoop::getLimitedDt()
while (dt <= 0 && !ProfileWorld::isProfileMode())
{
StkTime::sleep(1);
m_curr_time = device->getTimer()->getRealTime();
m_curr_time = StkTime::getRealTimeMs();
dt = (float)(m_curr_time - m_prev_time);
}
@ -281,9 +278,7 @@ void MainLoop::updateRace(int ticks)
*/
void MainLoop::run()
{
IrrlichtDevice* device = irr_driver->getDevice();
m_curr_time = device->getTimer()->getRealTime();
m_curr_time = StkTime::getRealTimeMs();
// DT keeps track of the leftover time, since the race update
// happens in fixed timesteps
float left_over_time = 0;
@ -495,18 +490,4 @@ void MainLoop::abort()
m_abort = true;
} // abort
//-----------------------------------------------------------------------------
/** Set game start ticks told by server somewhere in the future.
*/
void MainLoop::setStartNetworkGameTimer(uint64_t ticks)
{
uint64_t ticks_now = getNetworkTimer();
if (ticks < ticks_now)
{
Log::warn("MainLoop", "Network timer is too slow to catch up");
ticks = ticks_now;
}
m_start_game_ticks.store(ticks);
} // setStartNetworkGameTimer
/* EOF */

18
src/main_loop.hpp
View File

@ -21,7 +21,6 @@
#define HEADER_MAIN_LOOP_HPP
#include "utils/synchronised.hpp"
#include "utils/time.hpp"
#include "utils/types.hpp"
#include <atomic>
@ -40,10 +39,8 @@ private:
Synchronised<int> m_ticks_adjustment;
std::atomic<uint64_t> m_network_timer, m_start_game_ticks;
uint32_t m_curr_time;
uint32_t m_prev_time;
uint64_t m_curr_time;
uint64_t m_prev_time;
unsigned m_parent_pid;
float getLimitedDt();
void updateRace(int ticks);
@ -65,17 +62,6 @@ public:
m_ticks_adjustment.getData() += ticks;
m_ticks_adjustment.unlock();
}
// ------------------------------------------------------------------------
uint64_t getNetworkTimer() const
{ return StkTime::getRealTimeMs() - m_network_timer.load(); }
// ------------------------------------------------------------------------
void setNetworkTimer(uint64_t ticks)
{ m_network_timer.store(StkTime::getRealTimeMs() - ticks); }
// ------------------------------------------------------------------------
void resetStartNetworkGameTimer() { m_start_game_ticks.store(0); }
// ------------------------------------------------------------------------
void setStartNetworkGameTimer(uint64_t ticks);
}; // MainLoop
extern MainLoop* main_loop;

7
src/modes/easter_egg_hunt.cpp
View File

@ -33,6 +33,7 @@ EasterEggHunt::EasterEggHunt() : LinearWorld()
m_use_highscores = true;
m_eggs_found = 0;
m_only_ghosts = false;
m_finish_time = 0;
} // EasterEggHunt
//-----------------------------------------------------------------------------
@ -191,7 +192,11 @@ void EasterEggHunt::update(int ticks)
bool EasterEggHunt::isRaceOver()
{
if(!m_only_ghosts && m_eggs_found == m_number_of_eggs)
{
if (m_finish_time == 0)
m_finish_time = getTime();
return true;
}
else if (m_only_ghosts)
{
for (unsigned int i=0 ; i<m_eggs_collected.size();i++)
@ -263,5 +268,5 @@ float EasterEggHunt::estimateFinishTimeForKart(AbstractKart* kart)
return gk->getGhostFinishTime();
}
return getTime();
return m_finish_time;
} // estimateFinishTimeForKart

2
src/modes/easter_egg_hunt.hpp
View File

@ -45,6 +45,8 @@ private:
int m_eggs_found;
bool m_only_ghosts;
float m_finish_time;
public:
EasterEggHunt();
virtual ~EasterEggHunt();

2
src/modes/soccer_world.hpp
View File

@ -328,6 +328,8 @@ public:
virtual const std::string& getIdent() const OVERRIDE;
virtual void update(int ticks) OVERRIDE;
bool shouldDrawTimer() const OVERRIDE { return !isStartPhase(); }
// ------------------------------------------------------------------------
void onCheckGoalTriggered(bool first_goal);
// ------------------------------------------------------------------------

1
src/modes/tutorial_world.hpp
View File

@ -45,6 +45,7 @@ public:
return WorldWithRank::getRescueTransform(index);
}
bool shouldDrawTimer() const OVERRIDE { return false; }
}; // class TutorialWorld

2
src/modes/world.cpp
View File

@ -1116,7 +1116,7 @@ Highscores* World::getHighscores() const
Highscores * highscores =
highscore_manager->getHighscores(type,
getNumKarts(),
race_manager->getNumNonGhostKarts(),
race_manager->getDifficulty(),
race_manager->getTrackName(),
race_manager->getNumLaps(),

2
src/modes/world.hpp
View File

@ -327,7 +327,7 @@ public:
/** The code that draws the timer should call this first to know
* whether the game mode wants a timer drawn. */
virtual bool shouldDrawTimer() const
{ return isRacePhase() && getClockMode() != CLOCK_NONE; }
{ return isActiveRacePhase() && getClockMode() != CLOCK_NONE; }
// ------------------------------------------------------------------------
/** \return whether this world can generate/have highscores */
bool useHighScores() const { return m_use_highscores; }

42
src/modes/world_status.cpp
View File

@ -49,7 +49,6 @@ WorldStatus::WorldStatus()
m_play_track_intro_sound = UserConfigParams::m_music;
m_play_ready_set_go_sounds = true;
m_play_racestart_sounds = true;
m_server_is_ready.store(false);
IrrlichtDevice *device = irr_driver->getDevice();
@ -96,10 +95,6 @@ void WorldStatus::reset()
// Set the right music
Track::getCurrentTrack()->startMusic();
// In case of a networked race the race can only start once
// all protocols are up. This flag is used to wait for
// a confirmation before starting the actual race.
m_server_is_ready.store(false);
} // reset
//-----------------------------------------------------------------------------
@ -271,25 +266,13 @@ void WorldStatus::updateTime(int ticks)
return; // Don't increase time
case WAIT_FOR_SERVER_PHASE:
{
// Wait for all players to finish loading world
auto lobby = LobbyProtocol::get<LobbyProtocol>();
assert(lobby);
if (!lobby->allPlayersReady())
return;
// This stage is only reached in case of a networked game.
// The server waits for a confirmation from
// each client that they have started (to guarantee that the
// server is running with a local time behind all clients).
if (m_play_ready_set_go_sounds)
m_prestart_sound->play();
if (NetworkConfig::get()->isServer() &&
m_server_is_ready.load() == false) return;
m_phase = READY_PHASE;
auto cl = LobbyProtocol::get<ClientLobby>();
if (cl)
cl->startingRaceNow();
if (lobby && lobby->isRacing())
{
if (m_play_ready_set_go_sounds)
m_prestart_sound->play();
m_phase = READY_PHASE;
}
return; // Don't increase time
}
case READY_PHASE:
@ -463,19 +446,6 @@ void WorldStatus::updateTime(int ticks)
} // switch m_phase
} // update
//-----------------------------------------------------------------------------
/** Called on the client when it receives a notification from the server that
* all clients (and server) are ready to start the race. The server will
* then additionally wait for all clients to report back that they are
* starting, which guarantees that the server is running far enough behind
* clients time that at server time T all events from the clients at time
* T have arrived, minimising rollback impact.
*/
void WorldStatus::startReadySetGo()
{
m_server_is_ready.store(true);
} // startReadySetGo
//-----------------------------------------------------------------------------
/** Sets the time for the clock.
* \param time New time to set.

11
src/modes/world_status.hpp
View File

@ -19,7 +19,6 @@
#define HEADER_WORLD_STATUS_HPP
#include "utils/cpp2011.hpp"
#include <atomic>
class SFXBase;
@ -132,11 +131,6 @@ private:
int m_count_up_ticks;
bool m_engines_started;
/** In networked game a client must wait for the server to start 'ready
* set go' to make sure all client are actually ready to start the game.
* A server on the other hand will run behind all clients, so it will
* wait for all clients to indicate that they have started the race. */
std::atomic_bool m_server_is_ready;
void startEngines();
@ -162,6 +156,9 @@ public:
bool isRacePhase() const { return m_phase>=GO_PHASE &&
m_phase<FINISH_PHASE; }
// ------------------------------------------------------------------------
bool isActiveRacePhase() const { return m_phase>=GO_PHASE &&
m_phase<DELAY_FINISH_PHASE; }
// ------------------------------------------------------------------------
/** While the race menu is being displayed, m_phase is limbo, and
* m_previous_phase is finish. So we have to test this case, too. */
bool isFinishPhase() const { return m_phase==FINISH_PHASE ||
@ -207,8 +204,6 @@ public:
// ------------------------------------------------------------------------
/** Get the ticks since start regardless of which way the clock counts */
int getTicksSinceStart() const { return m_count_up_ticks; }
// ------------------------------------------------------------------------
void setReadyToRace() { m_server_is_ready.store(true); }
}; // WorldStatus

116
src/network/crypto.hpp
View File

@ -19,116 +19,10 @@
#ifndef HEADER_CRYPTO_HPP
#define HEADER_CRYPTO_HPP
#include "utils/string_utils.hpp"
#include <enet/enet.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <mutex>
#include <random>
#include <string>
#include <vector>
class BareNetworkString;
class NetworkString;
class Crypto
{
private:
static std::string m_client_key;
static std::string m_client_iv;
std::array<uint8_t, 12> m_iv;
uint32_t m_packet_counter;
EVP_CIPHER_CTX* m_encrypt;
EVP_CIPHER_CTX* m_decrypt;
std::mutex m_crypto_mutex;
public:
static std::unique_ptr<Crypto> getClientCrypto()
{
assert(!m_client_key.empty());
assert(!m_client_iv.empty());
auto c = std::unique_ptr<Crypto>(new Crypto(
StringUtils::decode64(m_client_key),
StringUtils::decode64(m_client_iv)));
c->m_packet_counter = 1;
return c;
}
// ------------------------------------------------------------------------
static void initClientAES()
{
std::random_device rd;
std::mt19937 g(rd());
// Default key and if RAND_bytes failed
std::vector<uint8_t> key;
for (int i = 0; i < 16; i++)
key.push_back((uint8_t)(g() % 255));
std::vector<uint8_t> iv;
for (int i = 0; i < 12; i++)
iv.push_back((uint8_t)(g() % 255));
if (!RAND_bytes(key.data(), 16))
{
Log::warn("Crypto",
"Failed to generate cryptographically strong key");
}
m_client_key = StringUtils::base64(key);
m_client_iv = StringUtils::base64(iv);
}
// ------------------------------------------------------------------------
static void resetClientAES()
{
m_client_key = "";
m_client_iv = "";
}
// ------------------------------------------------------------------------
static const std::string& getClientKey() { return m_client_key; }
// ------------------------------------------------------------------------
static const std::string& getClientIV() { return m_client_iv; }
// ------------------------------------------------------------------------
Crypto(const std::vector<uint8_t>& key,
const std::vector<uint8_t>& iv)
{
assert(key.size() == 16);
assert(iv.size() == 12);
std::copy_n(iv.begin(), 12, m_iv.begin());
m_packet_counter = (uint32_t)-1;
m_encrypt = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(m_encrypt);
EVP_EncryptInit_ex(m_encrypt, EVP_aes_128_gcm(), NULL, key.data(),
iv.data());
m_decrypt = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(m_decrypt);
EVP_DecryptInit_ex(m_decrypt, EVP_aes_128_gcm(), NULL, key.data(),
iv.data());
}
// ------------------------------------------------------------------------
~Crypto()
{
EVP_CIPHER_CTX_free(m_encrypt);
EVP_CIPHER_CTX_free(m_decrypt);
}
// ------------------------------------------------------------------------
bool encryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
bool decryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
ENetPacket* encryptSend(BareNetworkString& ns, bool reliable);
// ------------------------------------------------------------------------
NetworkString* decryptRecieve(ENetPacket* p);
};
#ifdef ENABLE_CRYPTO_OPENSSL
#include "network/crypto_openssl.hpp"
#else
#include "network/crypto_nettle.hpp"
#endif
#endif // HEADER_CRYPTO_HPP

141
src/network/crypto_nettle.cpp Normal file
View File

@ -0,0 +1,141 @@
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2018 SuperTuxKart-Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef ENABLE_CRYPTO_NETTLE
#include "network/crypto_nettle.hpp"
#include "network/network_config.hpp"
#include "network/network_string.hpp"
#include <nettle/base64.h>
// ============================================================================
std::string Crypto::base64(const std::vector<uint8_t>& input)
{
std::string result;
const size_t char_size = ((input.size() + 3 - 1) / 3) * 4;
result.resize(char_size, (char)0);
base64_encode_raw(&result[0], input.size(), input.data());
return result;
} // base64
// ============================================================================
std::vector<uint8_t> Crypto::decode64(std::string input)
{
size_t decode_len = calcDecodeLength(input);
std::vector<uint8_t> result(decode_len, 0);
struct base64_decode_ctx ctx;
base64_decode_init(&ctx);
size_t decode_len_by_nettle;
#ifdef DEBUG
int ret = base64_decode_update(&ctx, &decode_len_by_nettle, result.data(),
input.size(), input.c_str());
assert(ret == 1);
ret = base64_decode_final(&ctx);
assert(ret == 1);
assert(decode_len_by_nettle == decode_len);
#else
base64_decode_update(&ctx, &decode_len_by_nettle, result.data(),
input.size(), input.c_str());
base64_decode_final(&ctx);
#endif
return result;
} // decode64
// ============================================================================
std::string Crypto::m_client_key;
std::string Crypto::m_client_iv;
// ============================================================================
bool Crypto::encryptConnectionRequest(BareNetworkString& ns)
{
std::vector<uint8_t> cipher(ns.m_buffer.size() + 4, 0);
gcm_aes128_encrypt(&m_aes_context, ns.m_buffer.size(), cipher.data() + 4,
ns.m_buffer.data());
gcm_aes128_digest(&m_aes_context, 4, cipher.data());
std::swap(ns.m_buffer, cipher);
return true;
} // encryptConnectionRequest
// ----------------------------------------------------------------------------
bool Crypto::decryptConnectionRequest(BareNetworkString& ns)
{
std::vector<uint8_t> pt(ns.m_buffer.size() - 4, 0);
uint8_t* tag = ns.m_buffer.data();
std::array<uint8_t, 4> tag_after = {};
gcm_aes128_decrypt(&m_aes_context, ns.m_buffer.size() - 4, pt.data(),
ns.m_buffer.data() + 4);
gcm_aes128_digest(&m_aes_context, 4, tag_after.data());
handleAuthentication(tag, tag_after);
std::swap(ns.m_buffer, pt);
return true;
} // decryptConnectionRequest
// ----------------------------------------------------------------------------
ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
{
// 4 bytes counter and 4 bytes tag
ENetPacket* p = enet_packet_create(NULL, ns.m_buffer.size() + 8,
(reliable ? ENET_PACKET_FLAG_RELIABLE :
(ENET_PACKET_FLAG_UNSEQUENCED | ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT))
);
if (p == NULL)
return NULL;
std::array<uint8_t, 12> iv = m_iv;
std::unique_lock<std::mutex> ul(m_crypto_mutex);
uint32_t val = NetworkConfig::get()->isClient() ?
m_packet_counter++ : m_packet_counter--;
memcpy(iv.data(), &val, 4);
uint8_t* packet_start = p->data + 8;
gcm_aes128_set_iv(&m_aes_context, 12, iv.data());
gcm_aes128_encrypt(&m_aes_context, ns.m_buffer.size(), packet_start,
ns.m_buffer.data());
gcm_aes128_digest(&m_aes_context, 4, p->data + 4);
ul.unlock();
memcpy(p->data, iv.data(), 4);
return p;
} // encryptSend
// ----------------------------------------------------------------------------
NetworkString* Crypto::decryptRecieve(ENetPacket* p)
{
int clen = (int)(p->dataLength - 8);
auto ns = std::unique_ptr<NetworkString>(new NetworkString(p->data, clen));
std::array<uint8_t, 12> iv = m_iv;
memcpy(iv.data(), p->data, 4);
uint8_t* packet_start = p->data + 8;
uint8_t* tag = p->data + 4;
std::array<uint8_t, 4> tag_after = {};
gcm_aes128_set_iv(&m_aes_context, 12, iv.data());
gcm_aes128_decrypt(&m_aes_context, clen, ns->m_buffer.data(),
packet_start);
gcm_aes128_digest(&m_aes_context, 4, tag_after.data());
handleAuthentication(tag, tag_after);
NetworkString* result = ns.get();
ns.release();
return result;
} // decryptRecieve
#endif

151
src/network/crypto_nettle.hpp Normal file
View File

@ -0,0 +1,151 @@
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2018 SuperTuxKart-Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef ENABLE_CRYPTO_NETTLE
#ifndef HEADER_CRYPTO_NETTLE_HPP
#define HEADER_CRYPTO_NETTLE_HPP
#include "utils/log.hpp"
#include <enet/enet.h>
#include <nettle/gcm.h>
#include <nettle/yarrow.h>
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <mutex>
#include <random>
#include <string>
#include <vector>
class BareNetworkString;
class NetworkString;
class Crypto
{
private:
static std::string m_client_key;
static std::string m_client_iv;
std::array<uint8_t, 12> m_iv;
uint32_t m_packet_counter;
struct gcm_aes128_ctx m_aes_context;
std::mutex m_crypto_mutex;
// ------------------------------------------------------------------------
static size_t calcDecodeLength(const std::string& input)
{
// Calculates the length of a decoded string
size_t padding = 0;
const size_t len = input.size();
if (input[len - 1] == '=' && input[len - 2] == '=')
{
// last two chars are =
padding = 2;
}
else if (input[len - 1] == '=')
{
// last char is =
padding = 1;
}
return (len * 3) / 4 - padding;
} // calcDecodeLength
// ------------------------------------------------------------------------
void handleAuthentication(const uint8_t* tag,
const std::array<uint8_t, 4>& tag_after)
{
for (unsigned i = 0; i < tag_after.size(); i++)
{
if (tag[i] != tag_after[i])
throw std::runtime_error("Failed authentication.");
}
}
public:
// ------------------------------------------------------------------------
static std::string base64(const std::vector<uint8_t>& input);
// ------------------------------------------------------------------------
static std::vector<uint8_t> decode64(std::string input);
// ------------------------------------------------------------------------
static std::unique_ptr<Crypto> getClientCrypto()
{
assert(!m_client_key.empty());
assert(!m_client_iv.empty());
auto c = std::unique_ptr<Crypto>(new Crypto(decode64(m_client_key),
decode64(m_client_iv)));
c->m_packet_counter = 1;
return c;
}
// ------------------------------------------------------------------------
static void initClientAES()
{
struct yarrow256_ctx ctx;
yarrow256_init(&ctx, 0, NULL);
std::random_device rd;
std::mt19937 g(rd());
std::array<uint8_t, YARROW256_SEED_FILE_SIZE> seed;
for (unsigned i = 0; i < YARROW256_SEED_FILE_SIZE; i++)
seed[i] = (uint8_t)(g() % 255);
yarrow256_seed(&ctx, YARROW256_SEED_FILE_SIZE, seed.data());
std::array<uint8_t, 28> key_iv;
yarrow256_random(&ctx, key_iv.size(), key_iv.data());
m_client_key = base64({ key_iv.begin(), key_iv.begin() + 16 });
m_client_iv = base64({ key_iv.begin() + 16, key_iv.end() });
}
// ------------------------------------------------------------------------
static void resetClientAES()
{
m_client_key = "";
m_client_iv = "";
}
// ------------------------------------------------------------------------
static const std::string& getClientKey() { return m_client_key; }
// ------------------------------------------------------------------------
static const std::string& getClientIV() { return m_client_iv; }
// ------------------------------------------------------------------------
Crypto(const std::vector<uint8_t>& key,
const std::vector<uint8_t>& iv)
{
assert(key.size() == 16);
assert(iv.size() == 12);
std::copy_n(iv.begin(), 12, m_iv.begin());
m_packet_counter = (uint32_t)-1;
gcm_aes128_set_key(&m_aes_context, key.data());
gcm_aes128_set_iv(&m_aes_context, 12, iv.data());
}
// ------------------------------------------------------------------------
bool encryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
bool decryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
ENetPacket* encryptSend(BareNetworkString& ns, bool reliable);
// ------------------------------------------------------------------------
NetworkString* decryptRecieve(ENetPacket* p);
};
#endif // HEADER_CRYPTO_NETTLE_HPP
#endif

59
src/network/crypto.cpp → src/network/crypto_openssl.cpp
View File

@ -16,11 +16,60 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "network/crypto.hpp"
#ifdef ENABLE_CRYPTO_OPENSSL
#include "network/crypto_openssl.hpp"
#include "network/network_config.hpp"
#include "network/network_string.hpp"
#include <openssl/aes.h>
#include <openssl/buffer.h>
#include <openssl/hmac.h>
// ============================================================================
std::string Crypto::base64(const std::vector<uint8_t>& input)
{
BIO *bmem, *b64;
BUF_MEM* bptr;
std::string result;
b64 = BIO_new(BIO_f_base64());
bmem = BIO_new(BIO_s_mem());
b64 = BIO_push(b64, bmem);
BIO_set_flags(bmem, BIO_FLAGS_BASE64_NO_NL);
BIO_write(b64, input.data(), (int)input.size());
BIO_flush(b64);
BIO_get_mem_ptr(b64, &bptr);
result.resize(bptr->length - 1);
memcpy(&result[0], bptr->data, bptr->length - 1);
BIO_free_all(b64);
return result;
} // base64
// ============================================================================
std::vector<uint8_t> Crypto::decode64(std::string input)
{
BIO *b64, *bmem;
size_t decode_len = calcDecodeLength(input);
std::vector<uint8_t> result(decode_len, 0);
b64 = BIO_new(BIO_f_base64());
bmem = BIO_new_mem_buf(&input[0], (int)input.size());
bmem = BIO_push(b64, bmem);
BIO_set_flags(bmem, BIO_FLAGS_BASE64_NO_NL);
#ifdef DEBUG
size_t read_l = BIO_read(bmem, result.data(), (int)input.size());
assert(read_l == decode_len);
#else
BIO_read(bmem, result.data(), (int)input.size());
#endif
BIO_free_all(bmem);
return result;
} // decode64
// ============================================================================
std::string Crypto::m_client_key;
@ -34,7 +83,7 @@ bool Crypto::encryptConnectionRequest(BareNetworkString& ns)
if (EVP_EncryptInit_ex(m_encrypt, NULL, NULL, NULL, NULL) != 1)
return false;
if (EVP_EncryptUpdate(m_encrypt, cipher.data() + 4, &elen,
ns.m_buffer.data(), ns.m_buffer.size()) != 1)
ns.m_buffer.data(), (int)ns.m_buffer.size()) != 1)
return false;
if (EVP_EncryptFinal_ex(m_encrypt, cipher.data() + 4 + elen, &elen) != 1)
return false;
@ -56,7 +105,7 @@ bool Crypto::decryptConnectionRequest(BareNetworkString& ns)
int dlen;
if (EVP_DecryptUpdate(m_decrypt, pt.data(), &dlen, ns.m_buffer.data() + 4,
ns.m_buffer.size() - 4) != 1)
(int)(ns.m_buffer.size() - 4)) != 1)
return false;
if (!EVP_CIPHER_CTX_ctrl(m_decrypt, EVP_CTRL_GCM_SET_TAG, 4,
ns.m_buffer.data()))
@ -98,7 +147,7 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
int elen;
if (EVP_EncryptUpdate(m_encrypt, packet_start, &elen, ns.m_buffer.data(),
ns.m_buffer.size()) != 1)
(int)ns.m_buffer.size()) != 1)
{
enet_packet_destroy(p);
return NULL;
@ -154,3 +203,5 @@ NetworkString* Crypto::decryptRecieve(ENetPacket* p)
}
throw std::runtime_error("Failed to finalize decryption.");
} // decryptRecieve
#endif

160
src/network/crypto_openssl.hpp Normal file
View File

@ -0,0 +1,160 @@
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2018 SuperTuxKart-Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef ENABLE_CRYPTO_OPENSSL
#ifndef HEADER_CRYPTO_OPENSSL_HPP
#define HEADER_CRYPTO_OPENSSL_HPP
#include "utils/log.hpp"
#include <enet/enet.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <mutex>
#include <random>
#include <string>
#include <vector>
class BareNetworkString;
class NetworkString;
class Crypto
{
private:
static std::string m_client_key;
static std::string m_client_iv;
std::array<uint8_t, 12> m_iv;
uint32_t m_packet_counter;
EVP_CIPHER_CTX* m_encrypt;
EVP_CIPHER_CTX* m_decrypt;
std::mutex m_crypto_mutex;
// ------------------------------------------------------------------------
static size_t calcDecodeLength(const std::string& input)
{
// Calculates the length of a decoded string
size_t padding = 0;
const size_t len = input.size();
if (input[len - 1] == '=' && input[len - 2] == '=')
{
// last two chars are =
padding = 2;
}
else if (input[len - 1] == '=')
{
// last char is =
padding = 1;
}
return (len * 3) / 4 - padding;
} // calcDecodeLength
public:
// ------------------------------------------------------------------------
static std::string base64(const std::vector<uint8_t>& input);
// ------------------------------------------------------------------------
static std::vector<uint8_t> decode64(std::string input);
// ------------------------------------------------------------------------
static std::unique_ptr<Crypto> getClientCrypto()
{
assert(!m_client_key.empty());
assert(!m_client_iv.empty());
auto c = std::unique_ptr<Crypto>(new Crypto(decode64(m_client_key),
decode64(m_client_iv)));
c->m_packet_counter = 1;
return c;
}
// ------------------------------------------------------------------------
static void initClientAES()
{
std::random_device rd;
std::mt19937 g(rd());
// Default key and if RAND_bytes failed
std::vector<uint8_t> key;
for (int i = 0; i < 16; i++)
key.push_back((uint8_t)(g() % 255));
std::vector<uint8_t> iv;
for (int i = 0; i < 12; i++)
iv.push_back((uint8_t)(g() % 255));
if (!RAND_bytes(key.data(), 16))
{
Log::warn("Crypto",
"Failed to generate cryptographically strong key");
}
m_client_key = base64(key);
m_client_iv = base64(iv);
}
// ------------------------------------------------------------------------
static void resetClientAES()
{
m_client_key = "";
m_client_iv = "";
}
// ------------------------------------------------------------------------
static const std::string& getClientKey() { return m_client_key; }
// ------------------------------------------------------------------------
static const std::string& getClientIV() { return m_client_iv; }
// ------------------------------------------------------------------------
Crypto(const std::vector<uint8_t>& key,
const std::vector<uint8_t>& iv)
{
assert(key.size() == 16);
assert(iv.size() == 12);
std::copy_n(iv.begin(), 12, m_iv.begin());
m_packet_counter = (uint32_t)-1;
m_encrypt = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(m_encrypt);
EVP_EncryptInit_ex(m_encrypt, EVP_aes_128_gcm(), NULL, key.data(),
iv.data());
m_decrypt = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(m_decrypt);
EVP_DecryptInit_ex(m_decrypt, EVP_aes_128_gcm(), NULL, key.data(),
iv.data());
}
// ------------------------------------------------------------------------
~Crypto()
{
EVP_CIPHER_CTX_free(m_encrypt);
EVP_CIPHER_CTX_free(m_decrypt);
}
// ------------------------------------------------------------------------
bool encryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
bool decryptConnectionRequest(BareNetworkString& ns);
// ------------------------------------------------------------------------
ENetPacket* encryptSend(BareNetworkString& ns, bool reliable);
// ------------------------------------------------------------------------
NetworkString* decryptRecieve(ENetPacket* p);
};
#endif // HEADER_CRYPTO_OPENSSL_HPP
#endif

36
src/network/game_setup.cpp
View File

@ -48,14 +48,20 @@ void GameSetup::update(bool remove_disconnected_players)
{
return npp.expired();
}), m_players.end());
m_connected_players_count.store((uint32_t)m_players.size());
return;
}
if (!World::getWorld() ||
World::getWorld()->getPhase() < WorldStatus::MUSIC_PHASE)
{
m_connected_players_count.store((uint32_t)m_players.size());
return;
}
lock.unlock();
if (!World::getWorld() ||
World::getWorld()->getPhase() < WorldStatus::MUSIC_PHASE)
return;
int red_count = 0;
int blue_count = 0;
unsigned total = 0;
for (uint8_t i = 0; i < (uint8_t)m_players.size(); i++)
{
bool disconnected = m_players[i].expired();
@ -67,7 +73,10 @@ void GameSetup::update(bool remove_disconnected_players)
blue_count++;
if (!disconnected)
{
total++;
continue;
}
AbstractKart* k = World::getWorld()->getKart(i);
if (!k->isEliminated())
{
@ -82,6 +91,8 @@ void GameSetup::update(bool remove_disconnected_players)
STKHost::get()->sendPacketToAllPeers(&p, true);
}
}
m_connected_players_count.store(total);
if (m_players.size() != 1 && World::getWorld()->hasTeam() &&
(red_count == 0 || blue_count == 0))
World::getWorld()->setUnfairTeam(true);
@ -230,3 +241,22 @@ void GameSetup::sortPlayersForTeamGame()
player->setTeam((KartTeam)(i % 2));
}
} // sortPlayersForTeamGame
// ----------------------------------------------------------------------------
std::pair<int, int> GameSetup::getPlayerTeamInfo() const
{
std::lock_guard<std::mutex> lock(m_players_mutex);
int red_count = 0;
int blue_count = 0;
for (auto& p : m_players)
{
auto player = p.lock();
if (!player)
continue;
if (player->getTeam() == KART_TEAM_RED)
red_count++;
else if (player->getTeam() == KART_TEAM_BLUE)
blue_count++;
}
return std::make_pair(red_count, blue_count);
} // getPlayerTeamInfo

14
src/network/game_setup.hpp
View File

@ -24,10 +24,12 @@
#include "network/remote_kart_info.hpp"
#include <atomic>
#include <cassert>
#include <memory>
#include <mutex>
#include <string>
#include <utility>
#include <vector>
class NetworkPlayerProfile;
@ -58,10 +60,13 @@ private:
float m_battle_time_limit;
std::atomic<uint32_t> m_connected_players_count;
public:
// ------------------------------------------------------------------------
GameSetup()
{
m_connected_players_count.store(0);
m_extra_server_info = -1;
reset();
}
@ -99,11 +104,7 @@ public:
} // getConnectedPlayers
// ------------------------------------------------------------------------
/** Returns the number of connected players. */
unsigned getPlayerCount()
{
std::lock_guard<std::mutex> lock(m_players_mutex);
return (unsigned)m_players.size();
}
unsigned getPlayerCount() { return m_connected_players_count.load(); }
// ------------------------------------------------------------------------
void setRace(const std::string& track, unsigned laps, bool reverse)
{
@ -171,7 +172,8 @@ public:
m_hit_capture_limit = hc;
m_battle_time_limit = time;
}
// ------------------------------------------------------------------------
std::pair<int, int> getPlayerTeamInfo() const;
};
#endif // GAME_SETUP_HPP

45
src/network/network_timer_synchronizer.hpp
View File

@ -20,11 +20,12 @@
#define HEADER_NETWORK_TIMER_SYNCHRONIZER_HPP
#include "config/user_config.hpp"
#include "network/stk_host.hpp"
#include "utils/log.hpp"
#include "utils/time.hpp"
#include "utils/types.hpp"
#include "main_loop.hpp"
#include <atomic>
#include <cstdlib>
#include <deque>
#include <numeric>
@ -35,17 +36,46 @@ class NetworkTimerSynchronizer
private:
std::deque<std::tuple<uint32_t, uint64_t, uint64_t> > m_times;
bool m_synchronised = false;
std::atomic_bool m_synchronised, m_force_set_timer;
public:
NetworkTimerSynchronizer()
{
m_synchronised.store(false);
m_force_set_timer.store(false);
}
// ------------------------------------------------------------------------
bool isSynchronised() const { return m_synchronised; }
bool isSynchronised() const { return m_synchronised.load(); }
// ------------------------------------------------------------------------
void enableForceSetTimer()
{
if (m_synchronised.load() == true)
return;
m_force_set_timer.store(true);
}
// ------------------------------------------------------------------------
void addAndSetTime(uint32_t ping, uint64_t server_time)
{
if (m_synchronised)
if (m_synchronised.load() == true)
return;
if (m_force_set_timer.load() == true)
{
m_force_set_timer.store(false);
m_synchronised.store(true);
STKHost::get()->setNetworkTimer(server_time + (uint64_t)(ping / 2));
return;
}
const uint64_t cur_time = StkTime::getRealTimeMs();
// Discard too close time compared to last ping
// (due to resend when packet loss)
const uint64_t frequency = (uint64_t)((1.0f /
(float)(stk_config->m_network_state_frequeny)) * 1000.0f) / 2;
if (!m_times.empty() &&
cur_time - std::get<2>(m_times.back()) < frequency)
return;
// Take max 20 averaged samples from m_times, the next addAndGetTime
// is used to determine that server_time if it's correct, if not
// clear half in m_times until it's correct
@ -62,10 +92,11 @@ public:
const int64_t server_time_now = server_time + (uint64_t)(ping / 2);
int difference = (int)std::abs(averaged_time - server_time_now);
if (std::abs(averaged_time - server_time_now) <
UserConfigParams::m_timer_sync_tolerance)
UserConfigParams::m_timer_sync_difference_tolerance)
{
main_loop->setNetworkTimer(averaged_time);
m_synchronised = true;
STKHost::get()->setNetworkTimer(averaged_time);
m_force_set_timer.store(false);
m_synchronised.store(true);
Log::info("NetworkTimerSynchronizer", "Network "
"timer synchronized, difference: %dms", difference);
return;

18
src/network/protocol.cpp
View File

@ -111,9 +111,9 @@ void Protocol::requestTerminate()
} // requestTerminate
// ----------------------------------------------------------------------------
/** Sends a message to all peers, encrypt the message if needed.
* The message is composed of a 1-byte message (usually the message type)
* followed by the actual message.
/** Sends a message to all validated peers in game, encrypt the message if
* needed. The message is composed of a 1-byte message (usually the message
* type) followed by the actual message.
* \param message The actual message content.
*/
void Protocol::sendMessageToPeers(NetworkString *message, bool reliable)
@ -121,6 +121,18 @@ void Protocol::sendMessageToPeers(NetworkString *message, bool reliable)
STKHost::get()->sendPacketToAllPeers(message, reliable);
} // sendMessageToPeers
// ----------------------------------------------------------------------------
/** Sends a message to all validated peers in server, encrypt the message if
* needed. The message is composed of a 1-byte message (usually the message
* type) followed by the actual message.
* \param message The actual message content.
*/
void Protocol::sendMessageToPeersInServer(NetworkString* message,
bool reliable)
{
STKHost::get()->sendPacketToAllPeersInServer(message, reliable);
} // sendMessageToPeersInServer
// ----------------------------------------------------------------------------
/** Sends a message from a client to the server.
*/

2
src/network/protocol.hpp
View File

@ -126,6 +126,8 @@ public:
NetworkString* getNetworkString(size_t capacity = 16);
bool checkDataSize(Event* event, unsigned int minimum_size);
void sendMessageToPeers(NetworkString *message, bool reliable = true);
void sendMessageToPeersInServer(NetworkString *message,
bool reliable = true);
void sendToServer(NetworkString *message, bool reliable = true);
void requestStart();
void requestPause();

80
src/network/protocols/client_lobby.cpp
View File

@ -33,6 +33,7 @@
#include "network/game_setup.hpp"
#include "network/network_config.hpp"
#include "network/network_player_profile.hpp"
#include "network/network_timer_synchronizer.hpp"
#include "network/protocols/game_protocol.hpp"
#include "network/protocols/game_events_protocol.hpp"
#include "network/race_event_manager.hpp"
@ -71,6 +72,7 @@ engine.
ClientLobby::ClientLobby(const TransportAddress& a, std::shared_ptr<Server> s)
: LobbyProtocol(NULL)
{
m_waiting_for_game.store(false);
m_state.store(NONE);
m_server_address = a;
m_server = s;
@ -211,6 +213,21 @@ void ClientLobby::addAllPlayers(Event* event)
STKHost::get()->requestShutdown();
return;
}
// Timeout is too slow to synchronize, force it to stop and set current
// time
if (!STKHost::get()->getNetworkTimerSynchronizer()->isSynchronised())
{
if (UserConfigParams::m_voting_timeout >= 10.0f)
{
core::stringw msg = _("Bad network connection is detected.");
MessageQueue::add(MessageQueue::MT_ERROR, msg);
Log::warn("ClientLobby", "Failed to synchronize timer before game "
"start, maybe you enter the game too quick? (at least 5 "
"seconds are required for synchronization.");
}
STKHost::get()->getNetworkTimerSynchronizer()->enableForceSetTimer();
}
NetworkString& data = event->data();
std::string track_name;
data.decodeString(&track_name);
@ -610,6 +627,16 @@ void ClientLobby::updatePlayerList(Event* event)
{
if (!checkDataSize(event, 1)) return;
NetworkString& data = event->data();
bool waiting = data.getUInt8() == 1;
if (m_waiting_for_game.load() && !waiting)
{
// The waiting game finished
NetworkingLobby::getInstance()
->addMoreServerInfo(L"--------------------");
SFXManager::get()->quickSound("wee");
}
m_waiting_for_game.store(waiting);
unsigned player_count = data.getUInt8();
std::vector<std::tuple<uint32_t, uint32_t, uint32_t, core::stringw,
int, KartTeam> > players;
@ -621,9 +648,13 @@ void ClientLobby::updatePlayerList(Event* event)
std::get<1>(pl) = data.getUInt32();
std::get<2>(pl) = data.getUInt8();
data.decodeStringW(&std::get<3>(pl));
bool is_peer_waiting_for_game = data.getUInt8() == 1;
bool is_peer_server_owner = data.getUInt8() == 1;
// icon to be used, see NetworkingLobby::loadedFromFile
std::get<4>(pl) = data.getUInt8() == 1 /*if server owner*/ ? 0 :
std::get<4>(pl) = is_peer_server_owner ? 0 :
std::get<1>(pl) != 0 /*if online account*/ ? 1 : 2;
if (waiting && !is_peer_waiting_for_game)
std::get<4>(pl) = 3;
PerPlayerDifficulty d = (PerPlayerDifficulty)data.getUInt8();
if (d == PLAYER_DIFFICULTY_HANDICAP)
std::get<3>(pl) = _("%s (handicapped)", std::get<3>(pl));
@ -737,37 +768,32 @@ void ClientLobby::connectionRefused(Event* event)
//-----------------------------------------------------------------------------
/*! \brief Called when the server broadcasts to start the race to all clients.
* \param event : Event providing the information (no additional informati
* in this case).
* \param event : Event providing the time the client should start game.
*/
void ClientLobby::startGame(Event* event)
{
m_state.store(RACING);
// Triggers the world finite state machine to go from WAIT_FOR_SERVER_PHASE
// to READY_PHASE.
World::getWorld()->setReadyToRace();
Log::info("ClientLobby", "Starting new game at %lf",
StkTime::getRealTime());
uint64_t start_time = event->data().getUInt64();
joinStartGameThread();
m_start_game_thread = std::thread([start_time, this]()
{
const uint64_t cur_time = STKHost::get()->getNetworkTimer();
if (!(start_time > cur_time))
{
Log::warn("ClientLobby", "Network timer is too slow to catch "
"up, you must have a poor network.");
STKHost::get()->setErrorMessage(
m_disconnected_msg.at(PDI_BAD_CONNECTION));
STKHost::get()->requestShutdown();
return;
}
int sleep_time = (int)(start_time - cur_time);
Log::info("ClientLobby", "Start game after %dms", sleep_time);
std::this_thread::sleep_for(std::chrono::milliseconds(sleep_time));
Log::info("ClientLobby", "Started at %lf", StkTime::getRealTime());
m_state.store(RACING);
});
} // startGame
//-----------------------------------------------------------------------------
/** Called from WorldStatus when reaching the READY phase, i.e. when the race
* was started. It is going to inform the server of the race start. This
* allows the server to wait for all clients to start, so the server will
* be running behind the client with the biggest latency, which should
* make it likely that at local time T on the server all messages from
* all clients at their local time T have arrived.
*/
void ClientLobby::startingRaceNow()
{
NetworkString* ns = getNetworkString(2);
ns->addUInt8(LE_STARTED_RACE);
sendToServer(ns, /*reliable*/true);
delete ns;
Log::verbose("ClientLobby", "StartingRaceNow at %lf",
StkTime::getRealTime());
} // startingRaceNow
//-----------------------------------------------------------------------------
/*! \brief Called when the kart selection starts.
* \param event : Event providing the information (no additional information

6
src/network/protocols/client_lobby.hpp
View File

@ -71,6 +71,8 @@ private:
EXITING
};
std::atomic_bool m_waiting_for_game;
/** The state of the finite state machine. */
std::atomic<ClientState> m_state;
@ -100,13 +102,13 @@ public:
virtual void finishedLoadingWorld() OVERRIDE;
virtual void setup() OVERRIDE;
virtual void update(int ticks) OVERRIDE;
virtual bool waitingForPlayers() const OVERRIDE
{ return m_state.load() == CONNECTED; }
virtual void asynchronousUpdate() OVERRIDE {}
virtual bool allPlayersReady() const OVERRIDE
{ return m_state.load() >= RACING; }
bool waitingForServerRespond() const
{ return m_state.load() == REQUESTING_CONNECTION; }
bool isLobbyReady() const { return m_state.load() == CONNECTED; }
bool isWaitingForGame() const { return m_waiting_for_game.load(); }
virtual bool isRacing() const OVERRIDE { return m_state.load() == RACING; }
};

4
src/network/protocols/connect_to_peer.cpp
View File

@ -55,9 +55,9 @@ void ConnectToPeer::asynchronousUpdate()
break;
}
// Each 2 second for a ping or broadcast
if (StkTime::getRealTime() > m_timer + 2.0)
if (StkTime::getRealTimeMs() > m_timer + 2000)
{
m_timer = StkTime::getRealTime();
m_timer = StkTime::getRealTimeMs();
// Send a broadcast packet with the string aloha_stk inside,
// the client will know our ip address and will connect
// The wan remote should already start its ping message to us now

2
src/network/protocols/connect_to_peer.hpp
View File

@ -33,7 +33,7 @@ protected:
TransportAddress m_peer_address;
/** Timer use for tracking broadcast. */
double m_timer = 0.0;
uint64_t m_timer = 0;
/** If greater than a certain value, terminate this protocol. */
unsigned m_tried_connection = 0;

14
src/network/protocols/connect_to_server.cpp
View File

@ -141,7 +141,7 @@ void ConnectToServer::asynchronousUpdate()
request_connection->requestStart();
m_current_protocol = request_connection;
// Reset timer for next usage
m_timer = 0.0;
m_timer = 0;
break;
}
case REQUESTING_CONNECTION:
@ -169,7 +169,7 @@ void ConnectToServer::asynchronousUpdate()
" aloha, trying to connect anyway.");
m_state = CONNECTING;
// Reset timer for next usage
m_timer = 0.0;
m_timer = 0;
m_tried_connection = 0;
}
else
@ -190,9 +190,9 @@ void ConnectToServer::asynchronousUpdate()
{
// Send a 1-byte datagram, the remote host can simply ignore
// this datagram, to keep the port open (2 second each)
if (StkTime::getRealTime() > m_timer + 2.0)
if (StkTime::getRealTimeMs() > m_timer + 2000)
{
m_timer = StkTime::getRealTime();
m_timer = StkTime::getRealTimeMs();
BareNetworkString data;
data.addUInt8(0);
STKHost::get()->sendRawPacket(data, m_server_address);
@ -204,9 +204,9 @@ void ConnectToServer::asynchronousUpdate()
case CONNECTING: // waiting the server to answer our connection
{
// Every 5 seconds
if (StkTime::getRealTime() > m_timer + 5.0)
if (StkTime::getRealTimeMs() > m_timer + 5000)
{
m_timer = StkTime::getRealTime();
m_timer = StkTime::getRealTimeMs();
STKHost::get()->stopListening();
STKHost::get()->connect(m_server_address);
STKHost::get()->startListening();
@ -420,7 +420,7 @@ void ConnectToServer::waitingAloha(bool is_wan)
m_server_address = sender;
m_state = CONNECTING;
// Reset timer for next usage
m_timer = 0.0;
m_timer = 0;
m_tried_connection = 0;
}
} // waitingAloha

2
src/network/protocols/connect_to_server.hpp
View File

@ -31,7 +31,7 @@ class Server;
class ConnectToServer : public Protocol
{
private:
double m_timer = 0.0;
uint64_t m_timer = 0;
TransportAddress m_server_address;
std::shared_ptr<Server> m_server;
unsigned m_tried_connection = 0;

1
src/network/protocols/lobby_protocol.cpp
View File

@ -45,6 +45,7 @@ LobbyProtocol::~LobbyProtocol()
if (RaceEventManager::getInstance())
RaceEventManager::getInstance()->stop();
delete m_game_setup;
joinStartGameThread();
} // ~LobbyProtocol
//-----------------------------------------------------------------------------

13
src/network/protocols/lobby_protocol.hpp
View File

@ -26,6 +26,7 @@ class NetworkPlayerProfile;
#include <cassert>
#include <memory>
#include <thread>
#include <vector>
/*!
@ -51,7 +52,6 @@ public:
LE_CLIENT_LOADED_WORLD, // Client finished loading world
LE_LOAD_WORLD, // Clients should load world
LE_START_RACE, // Server to client to start race
LE_STARTED_RACE, // Client to server that it has started race
LE_START_SELECTION, // inform client to start selection
LE_RACE_FINISHED, // race has finished, display result
LE_RACE_FINISHED_ACK, // client went back to lobby
@ -76,14 +76,22 @@ public:
};
protected:
std::thread m_start_game_thread;
static std::weak_ptr<LobbyProtocol> m_lobby;
/** Stores data about the online game to play. */
GameSetup* m_game_setup;
// ------------------------------------------------------------------------
void configRemoteKart(
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players) const;
// ------------------------------------------------------------------------
void joinStartGameThread()
{
if (m_start_game_thread.joinable())
m_start_game_thread.join();
}
public:
/** Creates either a client or server lobby protocol as a singleton. */
@ -117,7 +125,6 @@ public:
virtual void update(int ticks) = 0;
virtual void finishedLoadingWorld() = 0;
virtual void loadWorld();
virtual bool waitingForPlayers() const = 0;
virtual bool allPlayersReady() const = 0;
virtual bool isRacing() const = 0;
GameSetup* getGameSetup() const { return m_game_setup; }

4
src/network/protocols/request_connection.cpp
View File

@ -77,8 +77,8 @@ void RequestConnection::asynchronousUpdate()
{
// Allow up to 10 seconds for the separate process to
// fully start-up
double timeout = StkTime::getRealTime() + 10.;
while (StkTime::getRealTime() < timeout)
uint64_t timeout = StkTime::getRealTimeMs() + 10000;
while (StkTime::getRealTimeMs() < timeout)
{
const std::string& sid = NetworkConfig::get()
->getServerIdFile();

563
src/network/protocols/server_lobby.cpp
View File

@ -61,12 +61,12 @@
node [shape=ellipse,style=filled,color=lightgrey];
"Server Constructor" -> "INIT_WAN" [label="If WAN game"]
"Server Constructor" -> "ACCEPTING_CLIENTS" [label="If LAN game"]
"Server Constructor" -> "WAITING_FOR_START_GAME" [label="If LAN game"]
"INIT_WAN" -> "GETTING_PUBLIC_ADDRESS" [label="GetPublicAddress protocol callback"]
"GETTING_PUBLIC_ADDRESS" -> "ACCEPTING_CLIENTS" [label="Register server"]
"ACCEPTING_CLIENTS" -> "connectionRequested" [label="Client connection request"]
"connectionRequested" -> "ACCEPTING_CLIENTS"
"ACCEPTING_CLIENTS" -> "SELECTING" [label="Start race from authorised client"]
"GETTING_PUBLIC_ADDRESS" -> "WAITING_FOR_START_GAME" [label="Register server"]
"WAITING_FOR_START_GAME" -> "connectionRequested" [label="Client connection request"]
"connectionRequested" -> "WAITING_FOR_START_GAME"
"WAITING_FOR_START_GAME" -> "SELECTING" [label="Start race from authorised client"]
"SELECTING" -> "SELECTING" [label="Client selects kart, #laps, ..."]
"SELECTING" -> "playerTrackVote" [label="Client selected track"]
"playerTrackVote" -> "SELECTING" [label="Not all clients have selected"]
@ -90,7 +90,9 @@
*/
ServerLobby::ServerLobby() : LobbyProtocol(NULL)
{
m_waiting_players_counts.store(0);
m_server_owner_id.store(-1);
m_registered_for_once_only = false;
m_has_created_server_id_file = false;
setHandleDisconnections(true);
m_state = SET_PUBLIC_ADDRESS;
@ -212,9 +214,7 @@ void ServerLobby::setup()
// the server are ready:
resetPeersReady();
m_peers_votes.clear();
m_server_delay = std::numeric_limits<double>::max();
m_server_max_ping = std::numeric_limits<double>::max();
m_timeout.store(std::numeric_limits<float>::max());
m_timeout.store(std::numeric_limits<int64_t>::max());
m_waiting_for_reset = false;
Log::info("ServerLobby", "Reset server to initial state.");
@ -255,7 +255,19 @@ void ServerLobby::handleChat(Event* event)
NetworkString* chat = getNetworkString();
chat->setSynchronous(true);
chat->addUInt8(LE_CHAT).encodeString16(message);
sendMessageToPeers(chat, /*reliable*/true);
// After game is started, only send to waiting player
const bool game_started = m_state.load() != WAITING_FOR_START_GAME;
STKHost::get()->sendPacketToAllPeersWith([game_started]
(STKPeer* p)
{
if (!p->isValidated())
return false;
if (!game_started)
return true;
if (!p->isWaitingForGame() && game_started)
return false;
return true;
}, chat);
delete chat;
}
} // handleChat
@ -307,7 +319,6 @@ bool ServerLobby::notifyEventAsynchronous(Event* event)
case LE_CONNECTION_REQUESTED: connectionRequested(event); break;
case LE_KART_SELECTION: kartSelectionRequested(event); break;
case LE_CLIENT_LOADED_WORLD: finishedLoadingWorldClient(event); break;
case LE_STARTED_RACE: startedRaceOnClient(event); break;
case LE_VOTE: playerVote(event); break;
case LE_KICK_HOST: kickHost(event); break;
case LE_CHANGE_TEAM: changeTeam(event); break;
@ -344,6 +355,17 @@ void ServerLobby::asynchronousUpdate()
// Check if server owner has left
updateServerOwner();
if (allowJoinedPlayersWaiting() || (m_game_setup->isGrandPrix() &&
m_state.load() == WAITING_FOR_START_GAME))
{
updateWaitingPlayers();
clearDisconnectedRankedPlayer();
// Only poll the STK server if this is a WAN server.
if (NetworkConfig::get()->isWAN())
checkIncomingConnectionRequests();
handlePendingConnection();
}
switch (m_state.load())
{
case SET_PUBLIC_ADDRESS:
@ -352,7 +374,7 @@ void ServerLobby::asynchronousUpdate()
// STK server, so we can directly go to the accepting clients state.
if (NetworkConfig::get()->isLAN())
{
m_state = ACCEPTING_CLIENTS;
m_state = WAITING_FOR_START_GAME;
STKHost::get()->startListening();
createServerIdFile();
return;
@ -372,9 +394,9 @@ void ServerLobby::asynchronousUpdate()
}
case REGISTER_SELF_ADDRESS:
{
if (m_game_setup->isGrandPrixStarted())
if (m_game_setup->isGrandPrixStarted() || m_registered_for_once_only)
{
m_state = ACCEPTING_CLIENTS;
m_state = WAITING_FOR_START_GAME;
break;
}
// Register this server with the STK server. This will block
@ -382,7 +404,9 @@ void ServerLobby::asynchronousUpdate()
// to react to any requests before the server is registered.
if (registerServer())
{
m_state = ACCEPTING_CLIENTS;
if (allowJoinedPlayersWaiting())
m_registered_for_once_only = true;
m_state = WAITING_FOR_START_GAME;
createServerIdFile();
}
else
@ -391,38 +415,34 @@ void ServerLobby::asynchronousUpdate()
}
break;
}
case ACCEPTING_CLIENTS:
case WAITING_FOR_START_GAME:
{
if (NetworkConfig::get()->isOwnerLess())
{
auto players = m_game_setup->getPlayers();
if (((float)players.size() >=
float player_size = (float)m_game_setup->getPlayerCount();
if ((player_size >=
(float)NetworkConfig::get()->getMaxPlayers() *
UserConfigParams::m_start_game_threshold ||
m_game_setup->isGrandPrixStarted()) &&
m_timeout.load() == std::numeric_limits<float>::max())
m_timeout.load() == std::numeric_limits<int64_t>::max())
{
m_timeout.store((float)StkTime::getRealTime() +
UserConfigParams::m_start_game_counter);
m_timeout.store((int64_t)StkTime::getRealTimeMs() +
(int64_t)
(UserConfigParams::m_start_game_counter * 1000.0f));
}
else if ((float)players.size() <
else if (player_size <
(float)NetworkConfig::get()->getMaxPlayers() *
UserConfigParams::m_start_game_threshold &&
!m_game_setup->isGrandPrixStarted())
{
m_timeout.store(std::numeric_limits<float>::max());
m_timeout.store(std::numeric_limits<int64_t>::max());
}
if (m_timeout.load() < (float)StkTime::getRealTime())
if (m_timeout.load() < (int64_t)StkTime::getRealTimeMs())
{
startSelection();
return;
}
}
clearDisconnectedRankedPlayer();
// Only poll the STK server if this is a WAN server.
if (NetworkConfig::get()->isWAN())
checkIncomingConnectionRequests();
handlePendingConnection();
break;
}
case ERROR_LEAVE:
@ -439,54 +459,19 @@ void ServerLobby::asynchronousUpdate()
return;
if (!checkPeersReady())
return;
m_state = WAIT_FOR_RACE_STARTED;
// Reset for next state usage
resetPeersReady();
signalRaceStartToClients();
m_server_max_ping = StkTime::getRealTime() +
((double)UserConfigParams::m_max_ping / 1000.0);
configPeersStartTime();
break;
}
case WAIT_FOR_RACE_STARTED:
{
const bool ping_timed_out =
m_server_max_ping < StkTime::getRealTime();
if (checkPeersReady() || ping_timed_out)
{
for (auto p : m_peers_ready)
{
auto cur_peer = p.first.lock();
if (!cur_peer)
continue;
if (ping_timed_out && p.second.second > m_server_max_ping)
sendBadConnectionMessageToPeer(cur_peer);
}
m_state = DELAY_SERVER;
const double jt =
(double)UserConfigParams::m_jitter_tolerance / 1000.0;
m_server_delay = StkTime::getRealTime() + jt;
Log::verbose("ServerLobby",
"Started delay at %lf to %lf with jitter tolerance %lf.",
StkTime::getRealTime(), m_server_delay, jt);
}
break;
}
case DELAY_SERVER:
if (m_server_delay < StkTime::getRealTime())
{
Log::verbose("ServerLobby", "End delay at %lf",
StkTime::getRealTime());
m_state = RACING;
World::getWorld()->setReadyToRace();
}
break;
case SELECTING:
{
auto result = handleVote();
if (m_timeout.load() < (float)StkTime::getRealTime() ||
if (m_timeout.load() < (int64_t)StkTime::getRealTimeMs() ||
(std::get<3>(result) &&
m_timeout.load() - (UserConfigParams::m_voting_timeout / 2.0f) <
(float)StkTime::getRealTime()))
m_timeout.load() -
(int64_t)(UserConfigParams::m_voting_timeout / 2.0f * 1000.0f) <
(int64_t)StkTime::getRealTimeMs()))
{
m_game_setup->setRace(std::get<0>(result), std::get<1>(result),
std::get<2>(result));
@ -548,9 +533,8 @@ void ServerLobby::asynchronousUpdate()
void ServerLobby::sendBadConnectionMessageToPeer(std::shared_ptr<STKPeer> p)
{
const unsigned max_ping = UserConfigParams::m_max_ping;
Log::warn("ServerLobby", "Peer %s cannot catch up with max ping %d, it"
" started at %lf.", p->getAddress().toString().c_str(), max_ping,
StkTime::getRealTime());
Log::warn("ServerLobby", "Peer %s cannot catch up with max ping %d.",
p->getAddress().toString().c_str(), max_ping);
NetworkString* msg = getNetworkString();
msg->setSynchronous(true);
msg->addUInt8(LE_BAD_CONNECTION);
@ -576,14 +560,12 @@ void ServerLobby::update(int ticks)
RaceResultGUI::getInstance()->backToLobby();
std::lock_guard<std::mutex> lock(m_connection_mutex);
m_game_setup->stopGrandPrix();
m_state = NetworkConfig::get()->isLAN() ?
ACCEPTING_CLIENTS : REGISTER_SELF_ADDRESS;
setup();
resetServer();
}
if ((m_state.load() > ACCEPTING_CLIENTS ||
if ((m_state.load() > WAITING_FOR_START_GAME ||
m_game_setup->isGrandPrixStarted()) &&
STKHost::get()->getPeerCount() == 0 &&
m_game_setup->getPlayerCount() == 0 &&
NetworkConfig::get()->getServerIdFile().empty())
{
if (RaceEventManager::getInstance() &&
@ -609,32 +591,22 @@ void ServerLobby::update(int ticks)
delete exit_result_screen;
std::lock_guard<std::mutex> lock(m_connection_mutex);
m_game_setup->stopGrandPrix();
m_state = NetworkConfig::get()->isLAN() ?
ACCEPTING_CLIENTS : REGISTER_SELF_ADDRESS;
updatePlayerList(true/*force_update*/);
NetworkString* server_info = getNetworkString();
server_info->setSynchronous(true);
server_info->addUInt8(LE_SERVER_INFO);
m_game_setup->addServerInfo(server_info);
sendMessageToPeers(server_info);
delete server_info;
setup();
resetServer();
}
if (m_game_setup)
{
// Remove disconnected players if in these two states
m_game_setup->update(m_state.load() == ACCEPTING_CLIENTS ||
m_game_setup->update(m_state.load() == WAITING_FOR_START_GAME ||
m_state.load() == SELECTING);
}
switch (m_state.load())
{
case SET_PUBLIC_ADDRESS:
case REGISTER_SELF_ADDRESS:
case ACCEPTING_CLIENTS:
case WAITING_FOR_START_GAME:
case WAIT_FOR_WORLD_LOADED:
case WAIT_FOR_RACE_STARTED:
case DELAY_SERVER:
{
// Waiting for asynchronousUpdate
break;
@ -667,14 +639,14 @@ void ServerLobby::update(int ticks)
resetPeersReady();
// Set the delay before the server forces all clients to exit the race
// result screen and go back to the lobby
m_timeout.store((float)StkTime::getRealTime() + 15.0f);
m_timeout.store((int64_t)StkTime::getRealTimeMs() + 15000);
m_state = RESULT_DISPLAY;
sendMessageToPeers(m_result_ns, /*reliable*/ true);
Log::info("ServerLobby", "End of game message sent");
break;
case RESULT_DISPLAY:
if (checkPeersReady() ||
StkTime::getRealTime() > m_timeout.load())
(int64_t)StkTime::getRealTimeMs() > m_timeout.load())
{
// Send a notification to all clients to exit
// the race result screen
@ -684,16 +656,7 @@ void ServerLobby::update(int ticks)
sendMessageToPeers(exit_result_screen, /*reliable*/true);
delete exit_result_screen;
std::lock_guard<std::mutex> lock(m_connection_mutex);
m_state = NetworkConfig::get()->isLAN() ?
ACCEPTING_CLIENTS : REGISTER_SELF_ADDRESS;
updatePlayerList(true/*force_update*/);
NetworkString* server_info = getNetworkString();
server_info->setSynchronous(true);
server_info->addUInt8(LE_SERVER_INFO);
m_game_setup->addServerInfo(server_info);
sendMessageToPeers(server_info);
delete server_info;
setup();
resetServer();
}
break;
case ERROR_LEAVE:
@ -779,21 +742,6 @@ void ServerLobby::unregisterServer(bool now)
} // unregisterServer
//-----------------------------------------------------------------------------
/** This function is called when all clients have loaded the world and
* are therefore ready to start the race. It signals to all clients
* to start the race and then switches state to DELAY_SERVER.
*/
void ServerLobby::signalRaceStartToClients()
{
Log::verbose("Server", "Signaling race start to clients at %lf",
StkTime::getRealTime());
NetworkString *ns = getNetworkString(1);
ns->addUInt8(LE_START_RACE);
sendMessageToPeers(ns, /*reliable*/true);
delete ns;
} // startGame
//-----------------------------------------------------------------------------
/** Instructs all clients to start the kart selection. If event is NULL,
* the command comes from the owner less server.
@ -802,7 +750,7 @@ void ServerLobby::startSelection(const Event *event)
{
if (event != NULL)
{
if (m_state != ACCEPTING_CLIENTS)
if (m_state != WAITING_FOR_START_GAME)
{
Log::warn("ServerLobby",
"Received startSelection while being in state %d",
@ -818,22 +766,11 @@ void ServerLobby::startSelection(const Event *event)
}
}
auto players = m_game_setup->getConnectedPlayers();
const unsigned player_count = players.size();
if (NetworkConfig::get()->hasTeamChoosing() && race_manager->teamEnabled())
{
int red_count = 0;
int blue_count = 0;
for (auto& player : players)
{
if (player->getTeam() == KART_TEAM_RED)
red_count++;
else if (player->getTeam() == KART_TEAM_BLUE)
blue_count++;
if (red_count != 0 && blue_count != 0)
break;
}
if ((red_count == 0 || blue_count == 0) && player_count != 1)
auto red_blue = m_game_setup->getPlayerTeamInfo();
if ((red_blue.first == 0 || red_blue.second == 0) &&
red_blue.first + red_blue.second != 1)
{
Log::warn("ServerLobby", "Bad team choosing.");
NetworkString* bt = getNetworkString();
@ -845,10 +782,13 @@ void ServerLobby::startSelection(const Event *event)
}
}
ProtocolManager::lock()->findAndTerminate(PROTOCOL_CONNECTION);
if (NetworkConfig::get()->isWAN())
if (!allowJoinedPlayersWaiting())
{
unregisterServer(false/*now*/);
ProtocolManager::lock()->findAndTerminate(PROTOCOL_CONNECTION);
if (NetworkConfig::get()->isWAN() )
{
unregisterServer(false/*now*/);
}
}
NetworkString *ns = getNetworkString(1);
@ -863,7 +803,7 @@ void ServerLobby::startSelection(const Event *event)
auto peers = STKHost::get()->getPeers();
for (auto peer : peers)
{
if (!peer->isValidated())
if (!peer->isValidated() || peer->isWaitingForGame())
continue;
peer->eraseServerKarts(m_available_kts.first, karts_erase);
peer->eraseServerTracks(m_available_kts.second, tracks_erase);
@ -884,7 +824,7 @@ void ServerLobby::startSelection(const Event *event)
while (it != m_available_kts.second.end())
{
Track* t = track_manager->getTrack(*it);
if (t->getMaxArenaPlayers() < player_count)
if (t->getMaxArenaPlayers() < m_game_setup->getPlayerCount())
{
it = m_available_kts.second.erase(it);
}
@ -909,19 +849,22 @@ void ServerLobby::startSelection(const Event *event)
delete ns;
m_state = SELECTING;
// Drop all pending players and keys
for (auto& p : m_pending_connection)
if (!allowJoinedPlayersWaiting())
{
if (auto peer = p.first.lock())
peer->disconnect();
// Drop all pending players and keys if doesn't allow joinning-waiting
for (auto& p : m_pending_connection)
{
if (auto peer = p.first.lock())
peer->disconnect();
}
m_pending_connection.clear();
std::unique_lock<std::mutex> ul(m_keys_mutex);
m_keys.clear();
ul.unlock();
}
m_pending_connection.clear();
std::unique_lock<std::mutex> ul(m_keys_mutex);
m_keys.clear();
ul.unlock();
// Will be changed after the first vote received
m_timeout.store(std::numeric_limits<float>::max());
m_timeout.store(std::numeric_limits<int64_t>::max());
} // startSelection
//-----------------------------------------------------------------------------
@ -931,9 +874,9 @@ void ServerLobby::startSelection(const Event *event)
void ServerLobby::checkIncomingConnectionRequests()
{
// First poll every 5 seconds. Return if no polling needs to be done.
const float POLL_INTERVAL = 5.0f;
static double last_poll_time = 0;
if (StkTime::getRealTime() < last_poll_time + POLL_INTERVAL)
const uint64_t POLL_INTERVAL = 5000;
static uint64_t last_poll_time = 0;
if (StkTime::getRealTimeMs() < last_poll_time + POLL_INTERVAL)
return;
// Keep the port open, it can be sent to anywhere as we will send to the
@ -946,7 +889,7 @@ void ServerLobby::checkIncomingConnectionRequests()
}
// Now poll the stk server
last_poll_time = StkTime::getRealTime();
last_poll_time = StkTime::getRealTimeMs();
// ========================================================================
class PollServerRequest : public Online::XMLRequest
@ -970,7 +913,8 @@ void ServerLobby::checkIncomingConnectionRequests()
const XMLNode * users_xml = result->getNode("users");
std::map<uint32_t, KeyData> keys;
auto sl = m_server_lobby.lock();
if (!sl || sl->m_state.load() != ACCEPTING_CLIENTS)
if (!sl || (sl->m_state.load() != WAITING_FOR_START_GAME &&
!sl->allowJoinedPlayersWaiting()))
return;
for (unsigned int i = 0; i < users_xml->getNumNodes(); i++)
@ -1010,7 +954,10 @@ void ServerLobby::checkIncomingConnectionRequests()
const TransportAddress &addr = STKHost::get()->getPublicAddress();
request->addParameter("address", addr.getIP() );
request->addParameter("port", addr.getPort());
request->addParameter("current_players", m_game_setup->getPlayerCount());
request->addParameter("current-players",
m_game_setup->getPlayerCount() + m_waiting_players_counts.load());
request->addParameter("game-started",
m_state.load() == WAITING_FOR_START_GAME ? 0 : 1);
request->queue();
} // checkIncomingConnectionRequests
@ -1290,6 +1237,8 @@ void ServerLobby::clientDisconnected(Event* event)
return;
NetworkString* msg = getNetworkString(2);
const bool waiting_peer_disconnected =
event->getPeer()->isWaitingForGame();
msg->setSynchronous(true);
msg->addUInt8(LE_PLAYER_DISCONNECTED);
msg->addUInt8((uint8_t)players_on_peer.size());
@ -1299,7 +1248,17 @@ void ServerLobby::clientDisconnected(Event* event)
msg->encodeString(name);
Log::info("ServerLobby", "%s disconnected", name.c_str());
}
sendMessageToPeers(msg, /*reliable*/true);
// Don't show waiting peer disconnect message to in game player
STKHost::get()->sendPacketToAllPeersWith([waiting_peer_disconnected]
(STKPeer* p)
{
if (!p->isValidated())
return false;
if (!p->isWaitingForGame() && waiting_peer_disconnected)
return false;
return true;
}, msg);
updatePlayerList();
delete msg;
} // clientDisconnected
@ -1335,8 +1294,9 @@ void ServerLobby::connectionRequested(Event* event)
peer->cleanPlayerProfiles();
// can we add the player ?
if (m_state != ACCEPTING_CLIENTS ||
m_game_setup->isGrandPrixStarted())
if (!allowJoinedPlayersWaiting() &&
(m_state.load() != WAITING_FOR_START_GAME ||
m_game_setup->isGrandPrixStarted()))
{
NetworkString *message = getNetworkString(2);
message->setSynchronous(true);
@ -1448,7 +1408,8 @@ void ServerLobby::connectionRequested(Event* event)
return;
}
if (m_game_setup->getPlayerCount() + player_count >
if (m_game_setup->getPlayerCount() + player_count +
m_waiting_players_counts.load() >
NetworkConfig::get()->getMaxPlayers())
{
NetworkString *message = getNetworkString(2);
@ -1469,7 +1430,8 @@ void ServerLobby::connectionRequested(Event* event)
peer->getAddress().isLAN()) &&
NetworkConfig::get()->isWAN() &&
NetworkConfig::get()->onlyValidatedPlayers()) ||
((player_count != 1 || m_scores.find(online_id) != m_scores.end()) &&
((player_count != 1 || online_id == 0 ||
m_scores.find(online_id) != m_scores.end()) &&
NetworkConfig::get()->isRankedServer()))
{
NetworkString* message = getNetworkString(2);
@ -1534,6 +1496,7 @@ void ServerLobby::handleUnencryptedConnection(std::shared_ptr<STKPeer> peer,
}
unsigned player_count = data.getUInt8();
auto red_blue = m_game_setup->getPlayerTeamInfo();
for (unsigned i = 0; i < player_count; i++)
{
core::stringw name;
@ -1547,7 +1510,20 @@ void ServerLobby::handleUnencryptedConnection(std::shared_ptr<STKPeer> peer,
per_player_difficulty, (uint8_t)i, KART_TEAM_NONE);
if (NetworkConfig::get()->hasTeamChoosing() &&
race_manager->teamEnabled())
player->setTeam((KartTeam)(peer->getHostId() % 2));
{
KartTeam cur_team = KART_TEAM_NONE;
if (red_blue.first > red_blue.second)
{
cur_team = KART_TEAM_BLUE;
red_blue.second++;
}
else
{
cur_team = KART_TEAM_RED;
red_blue.first++;
}
player->setTeam(cur_team);
}
peer->addPlayer(player);
}
@ -1561,47 +1537,84 @@ void ServerLobby::handleUnencryptedConnection(std::shared_ptr<STKPeer> peer,
peer->sendPacket(server_info);
delete server_info;
const bool game_started = m_state.load() != WAITING_FOR_START_GAME;
NetworkString* message_ack = getNetworkString(4);
message_ack->setSynchronous(true);
// connection success -- return the host id of peer
float auto_start_timer = m_timeout.load();
message_ack->addUInt8(LE_CONNECTION_ACCEPTED).addUInt32(peer->getHostId())
.addUInt32(NetworkConfig::m_server_version)
.addFloat(auto_start_timer == std::numeric_limits<float>::max() ?
auto_start_timer : auto_start_timer - (float)StkTime::getRealTime());
peer->sendPacket(message_ack);
delete message_ack;
m_peers_ready[peer] = std::make_pair(false, 0.0);
for (std::shared_ptr<NetworkPlayerProfile> npp : peer->getPlayerProfiles())
float auto_start_timer = 0.0f;
if (m_timeout.load() == std::numeric_limits<int64_t>::max())
auto_start_timer = std::numeric_limits<float>::max();
else
{
m_game_setup->addPlayer(npp);
Log::info("ServerLobby", "New player %s with online id %u from %s.",
StringUtils::wideToUtf8(npp->getName()).c_str(),
npp->getOnlineId(), peer->getAddress().toString().c_str());
auto_start_timer =
(m_timeout.load() - (int64_t)StkTime::getRealTimeMs()) / 1000.0f;
}
updatePlayerList();
message_ack->addUInt8(LE_CONNECTION_ACCEPTED).addUInt32(peer->getHostId())
.addUInt32(NetworkConfig::m_server_version).addFloat(auto_start_timer);
if (NetworkConfig::get()->isRankedServer())
if (game_started)
{
getRankingForPlayer(peer->getPlayerProfiles()[0]);
peer->setWaitingForGame(true);
for (auto& p : peer->getPlayerProfiles())
m_waiting_players.push_back(p);
updatePlayerList();
peer->sendPacket(message_ack);
delete message_ack;
}
else
{
peer->setWaitingForGame(false);
m_peers_ready[peer] = false;
for (std::shared_ptr<NetworkPlayerProfile>& npp :
peer->getPlayerProfiles())
{
m_game_setup->addPlayer(npp);
Log::info("ServerLobby",
"New player %s with online id %u from %s.",
StringUtils::wideToUtf8(npp->getName()).c_str(),
npp->getOnlineId(), peer->getAddress().toString().c_str());
}
updatePlayerList();
peer->sendPacket(message_ack);
delete message_ack;
if (NetworkConfig::get()->isRankedServer())
{
getRankingForPlayer(peer->getPlayerProfiles()[0]);
}
}
} // handleUnencryptedConnection
//-----------------------------------------------------------------------------
void ServerLobby::updatePlayerList(bool force_update)
/** Called when any players change their setting (team for example), or
* connection / disconnection, it will use the game_started parameter to
* determine if this should be send to all peers in server or just in game.
* \param update_when_reset_server If true, this message will be sent to
* all peers.
*/
void ServerLobby::updatePlayerList(bool update_when_reset_server)
{
if (m_state.load() > ACCEPTING_CLIENTS && !force_update)
const bool game_started = m_state.load() != WAITING_FOR_START_GAME &&
!update_when_reset_server;
// No need to update player list (for started grand prix currently)
if (!allowJoinedPlayersWaiting() &&
m_state.load() > WAITING_FOR_START_GAME && !update_when_reset_server)
return;
auto all_profiles = STKHost::get()->getAllPlayerProfiles();
NetworkString* pl = getNetworkString();
pl->setSynchronous(true);
pl->addUInt8(LE_UPDATE_PLAYER_LIST).addUInt8((uint8_t)all_profiles.size());
pl->addUInt8(LE_UPDATE_PLAYER_LIST)
.addUInt8((uint8_t)(game_started ? 1 : 0))
.addUInt8((uint8_t)all_profiles.size());
for (auto profile : all_profiles)
{
pl->addUInt32(profile->getHostId()).addUInt32(profile->getOnlineId())
.addUInt8(profile->getLocalPlayerId())
.encodeString(profile->getName());
pl->addUInt8((uint8_t)
(profile->getPeer()->isWaitingForGame() ? 1 : 0));
uint8_t server_owner = 0;
if (m_server_owner_id.load() == profile->getPeer()->getHostId())
server_owner = 1;
@ -1613,14 +1626,24 @@ void ServerLobby::updatePlayerList(bool force_update)
else
pl->addUInt8(KART_TEAM_NONE);
}
sendMessageToPeers(pl);
// Don't send this message to in-game players
STKHost::get()->sendPacketToAllPeersWith([game_started]
(STKPeer* p)
{
if (!p->isValidated())
return false;
if (!p->isWaitingForGame() && game_started)
return false;
return true;
}, pl);
delete pl;
} // updatePlayerList
//-----------------------------------------------------------------------------
void ServerLobby::updateServerOwner()
{
if (m_state.load() < ACCEPTING_CLIENTS ||
if (m_state.load() < WAITING_FOR_START_GAME ||
m_state.load() > RESULT_DISPLAY ||
NetworkConfig::get()->isOwnerLess())
return;
@ -1709,17 +1732,19 @@ void ServerLobby::playerVote(Event* event)
}
if (!checkDataSize(event, 4) ||
event->getPeer()->getPlayerProfiles().empty())
event->getPeer()->getPlayerProfiles().empty() ||
event->getPeer()->isWaitingForGame())
return;
// Check if first vote, if so start counter
if (m_timeout.load() == std::numeric_limits<float>::max())
if (m_timeout.load() == std::numeric_limits<int64_t>::max())
{
m_timeout.store((float)StkTime::getRealTime() +
UserConfigParams::m_voting_timeout);
m_timeout.store((int64_t)StkTime::getRealTimeMs() +
(int64_t)(UserConfigParams::m_voting_timeout * 1000.0f));
}
float remaining_time = m_timeout.load() - (float)StkTime::getRealTime();
if (remaining_time < 0.0f)
int64_t remaining_time =
m_timeout.load() - (int64_t)StkTime::getRealTimeMs();
if (remaining_time < 0)
{
return;
}
@ -1762,7 +1787,7 @@ std::tuple<std::string, uint8_t, bool, bool> ServerLobby::handleVote()
auto peers = STKHost::get()->getPeers();
for (auto peer : peers)
{
if (peer->hasPlayerProfiles())
if (peer->hasPlayerProfiles() && !peer->isWaitingForGame())
cur_players += 1.0f;
}
if (cur_players == 0.0f)
@ -1902,33 +1927,11 @@ void ServerLobby::finishedLoadingWorld()
void ServerLobby::finishedLoadingWorldClient(Event *event)
{
std::shared_ptr<STKPeer> peer = event->getPeerSP();
m_peers_ready.at(peer) = std::make_pair(true, StkTime::getRealTime());
m_peers_ready.at(peer) = true;
Log::info("ServerLobby", "Peer %d has finished loading world at %lf",
peer->getHostId(), StkTime::getRealTime());
} // finishedLoadingWorldClient
//-----------------------------------------------------------------------------
/** Called when a notification from a client is received that the client has
* started the race. Once all clients have informed the server that they
* have started the race, the server can start. This makes sure that the
* server's local time is behind all clients by at most max ping,
* which in turn means that when the server simulates local time T all
* messages from clients at their local time T should have arrived at
* the server, which creates smoother play experience.
*/
void ServerLobby::startedRaceOnClient(Event *event)
{
if (m_state.load() != WAIT_FOR_RACE_STARTED)
{
sendBadConnectionMessageToPeer(event->getPeerSP());
return;
}
std::shared_ptr<STKPeer> peer = event->getPeerSP();
m_peers_ready.at(peer) = std::make_pair(true, StkTime::getRealTime());
Log::info("ServerLobby", "Peer %s has started race at %lf",
peer->getAddress().toString().c_str(), StkTime::getRealTime());
} // startedRaceOnClient
//-----------------------------------------------------------------------------
/** Called when a client clicks on 'ok' on the race result screen.
* If all players have clicked on 'ok', go back to the lobby.
@ -1938,7 +1941,7 @@ void ServerLobby::playerFinishedResult(Event *event)
if (m_state.load() != RESULT_DISPLAY)
return;
std::shared_ptr<STKPeer> peer = event->getPeerSP();
m_peers_ready.at(peer) = std::make_pair(true, StkTime::getRealTime());
m_peers_ready.at(peer) = true;
} // playerFinishedResult
//-----------------------------------------------------------------------------
@ -1957,8 +1960,9 @@ void ServerLobby::updateBanList()
//-----------------------------------------------------------------------------
bool ServerLobby::waitingForPlayers() const
{
return m_state.load() == ACCEPTING_CLIENTS &&
!m_game_setup->isGrandPrixStarted();
if (m_game_setup->isGrandPrix() && m_game_setup->isGrandPrixStarted())
return false;
return m_state.load() >= WAITING_FOR_START_GAME;
} // waitingForPlayers
//-----------------------------------------------------------------------------
@ -2011,7 +2015,7 @@ bool ServerLobby::decryptConnectionRequest(std::shared_ptr<STKPeer> peer,
uint32_t online_id, const core::stringw& online_name)
{
auto crypto = std::unique_ptr<Crypto>(new Crypto(
StringUtils::decode64(key), StringUtils::decode64(iv)));
Crypto::decode64(key), Crypto::decode64(iv)));
if (crypto->decryptConnectionRequest(data))
{
peer->setCrypto(std::move(crypto));
@ -2114,3 +2118,136 @@ void ServerLobby::submitRankingsToAddons()
request->queue();
}
} // submitRankingsToAddons
//-----------------------------------------------------------------------------
/** This function is called when all clients have loaded the world and
* are therefore ready to start the race. It determine the start time in
* network timer for client and server based on pings and then switches state
* to WAIT_FOR_RACE_STARTED.
*/
void ServerLobby::configPeersStartTime()
{
uint32_t max_ping = 0;
const unsigned max_ping_from_peers = UserConfigParams::m_max_ping;
for (auto p : m_peers_ready)
{
auto peer = p.first.lock();
if (!peer)
continue;
if (peer->getAveragePing() > max_ping_from_peers)
{
sendBadConnectionMessageToPeer(peer);
continue;
}
max_ping = std::max(peer->getAveragePing(), max_ping);
}
// Start up time will be after 2000ms, so even if this packet is sent late
// (due to packet loss), the start time will still ahead of current time
uint64_t start_time = STKHost::get()->getNetworkTimer() + (uint64_t)2000;
NetworkString* ns = getNetworkString(10);
ns->addUInt8(LE_START_RACE).addUInt64(start_time);
sendMessageToPeers(ns, /*reliable*/true);
const unsigned jitter_tolerance = UserConfigParams::m_jitter_tolerance;
Log::info("ServerLobby", "Max ping from peers: %d, jitter tolerance: %d",
max_ping, jitter_tolerance);
// Delay server for max ping / 2 from peers and jitter tolerance.
start_time += (uint64_t)(max_ping / 2) + (uint64_t)jitter_tolerance;
delete ns;
m_state = WAIT_FOR_RACE_STARTED;
joinStartGameThread();
m_start_game_thread = std::thread([start_time, this]()
{
const uint64_t cur_time = STKHost::get()->getNetworkTimer();
assert(start_time > cur_time);
int sleep_time = (int)(start_time - cur_time);
Log::info("ServerLobby", "Start game after %dms", sleep_time);
std::this_thread::sleep_for(std::chrono::milliseconds(sleep_time));
Log::info("ServerLobby", "Started at %lf", StkTime::getRealTime());
m_state.store(RACING);
});
} // configPeersStartTime
//-----------------------------------------------------------------------------
bool ServerLobby::allowJoinedPlayersWaiting() const
{
return !m_game_setup->isGrandPrix();
} // allowJoinedPlayersWaiting
//-----------------------------------------------------------------------------
void ServerLobby::updateWaitingPlayers()
{
// addWaitingPlayersToGame below will be called by main thread in case
// resetServer
std::lock_guard<std::mutex> lock(m_connection_mutex);
m_waiting_players.erase(std::remove_if(
m_waiting_players.begin(), m_waiting_players.end(), []
(const std::weak_ptr<NetworkPlayerProfile>& npp)->bool
{
return npp.expired();
}), m_waiting_players.end());
m_waiting_players_counts.store((uint32_t)m_waiting_players.size());
} // updateWaitingPlayers
//-----------------------------------------------------------------------------
void ServerLobby::addWaitingPlayersToGame()
{
if (m_waiting_players.empty())
return;
for (auto& p : m_waiting_players)
{
auto npp = p.lock();
if (!npp)
continue;
auto peer = npp->getPeer();
assert(peer);
uint32_t online_id = npp->getOnlineId();
if (NetworkConfig::get()->isRankedServer())
{
if (m_scores.find(online_id) != m_scores.end())
{
NetworkString* message = getNetworkString(2);
message->setSynchronous(true);
message->addUInt8(LE_CONNECTION_REFUSED)
.addUInt8(RR_INVALID_PLAYER);
peer->sendPacket(message, true/*reliable*/, false/*encrypted*/);
peer->reset();
delete message;
Log::verbose("ServerLobby", "Player refused: invalid player");
continue;
}
}
peer->setWaitingForGame(false);
m_peers_ready[peer] = false;
m_game_setup->addPlayer(npp);
Log::info("ServerLobby", "New player %s with online id %u from %s.",
StringUtils::wideToUtf8(npp->getName()).c_str(),
npp->getOnlineId(), peer->getAddress().toString().c_str());
if (NetworkConfig::get()->isRankedServer())
{
getRankingForPlayer(peer->getPlayerProfiles()[0]);
}
}
m_waiting_players.clear();
m_waiting_players_counts.store(0);
} // addWaitingPlayersToGame
//-----------------------------------------------------------------------------
void ServerLobby::resetServer()
{
addWaitingPlayersToGame();
m_state = NetworkConfig::get()->isLAN() ?
WAITING_FOR_START_GAME : REGISTER_SELF_ADDRESS;
updatePlayerList(true/*update_when_reset_server*/);
NetworkString* server_info = getNetworkString();
server_info->setSynchronous(true);
server_info->addUInt8(LE_SERVER_INFO);
m_game_setup->addServerInfo(server_info);
sendMessageToPeersInServer(server_info);
delete server_info;
setup();
} // resetServer

37
src/network/protocols/server_lobby.hpp
View File

@ -46,12 +46,11 @@ public:
{
SET_PUBLIC_ADDRESS, // Waiting to receive its public ip address
REGISTER_SELF_ADDRESS, // Register with STK online server
ACCEPTING_CLIENTS, // In lobby, accepting clients
WAITING_FOR_START_GAME, // In lobby, waiting for (auto) start game
SELECTING, // kart, track, ... selection started
LOAD_WORLD, // Server starts loading world
WAIT_FOR_WORLD_LOADED, // Wait for clients and server to load world
WAIT_FOR_RACE_STARTED, // Wait for all clients to have started the race
DELAY_SERVER, // Additional server delay
RACING, // racing
WAIT_FOR_RACE_STOPPED, // Wait server for stopping all race protocols
RESULT_DISPLAY, // Show result screen
@ -83,26 +82,20 @@ private:
std::atomic_bool m_server_has_loaded_world;
/** Counts how many peers have finished loading the world. */
std::map<std::weak_ptr<STKPeer>, std::pair<bool, double>,
std::map<std::weak_ptr<STKPeer>, bool,
std::owner_less<std::weak_ptr<STKPeer> > > m_peers_ready;
/** Vote from each peer. */
std::map<std::weak_ptr<STKPeer>, std::tuple<std::string, uint8_t, bool>,
std::owner_less<std::weak_ptr<STKPeer> > > m_peers_votes;
/** Keeps track of an artificial server delay, which is used to compensate
* for network jitter. */
double m_server_delay;
double m_server_max_ping;
bool m_has_created_server_id_file;
/** It indicates if this server is unregistered with the stk server. */
std::weak_ptr<bool> m_server_unregistered;
/** Timeout counter for various state. */
std::atomic<float> m_timeout;
std::atomic<int64_t> m_timeout;
/** Lock this mutex whenever a client is connect / disconnect or
* starting race. */
@ -143,6 +136,12 @@ private:
NetworkString* m_result_ns;
std::vector<std::weak_ptr<NetworkPlayerProfile> > m_waiting_players;
std::atomic<uint32_t> m_waiting_players_counts;
bool m_registered_for_once_only;
// connection management
void clientDisconnected(Event* event);
void connectionRequested(Event* event);
@ -153,13 +152,12 @@ private:
void playerFinishedResult(Event *event);
bool registerServer();
void finishedLoadingWorldClient(Event *event);
void startedRaceOnClient(Event *event);
void kickHost(Event* event);
void changeTeam(Event* event);
void handleChat(Event* event);
void unregisterServer(bool now);
void createServerIdFile();
void updatePlayerList(bool force_update = false);
void updatePlayerList(bool update_when_reset_server = false);
void updateServerOwner();
bool checkPeersReady() const
{
@ -168,7 +166,7 @@ private:
{
if (p.first.expired())
continue;
all_ready = all_ready && p.second.first;
all_ready = all_ready && p.second;
if (!all_ready)
return false;
}
@ -184,8 +182,7 @@ private:
}
else
{
it->second.first = false;
it->second.second = 0.0;
it->second = false;
it++;
}
}
@ -220,6 +217,10 @@ private:
void checkRaceFinished();
void sendBadConnectionMessageToPeer(std::shared_ptr<STKPeer> p);
std::pair<int, float> getHitCaptureLimit(float num_karts);
void configPeersStartTime();
void updateWaitingPlayers();
void resetServer();
void addWaitingPlayersToGame();
public:
ServerLobby();
virtual ~ServerLobby();
@ -230,16 +231,18 @@ public:
virtual void update(int ticks) OVERRIDE;
virtual void asynchronousUpdate() OVERRIDE;
void signalRaceStartToClients();
void startSelection(const Event *event=NULL);
void checkIncomingConnectionRequests();
void finishedLoadingWorld() OVERRIDE;
ServerState getCurrentState() const { return m_state.load(); }
void updateBanList();
virtual bool waitingForPlayers() const OVERRIDE;
bool waitingForPlayers() const;
uint32_t getWaitingPlayersCount() const
{ return m_waiting_players_counts.load(); }
virtual bool allPlayersReady() const OVERRIDE
{ return m_state.load() >= WAIT_FOR_RACE_STARTED; }
virtual bool isRacing() const OVERRIDE { return m_state.load() == RACING; }
bool allowJoinedPlayersWaiting() const;
}; // class ServerLobby

6
src/network/server.cpp
View File

@ -60,6 +60,7 @@ Server::Server(const XMLNode& xml) : m_supports_encrytion(true)
m_address.setPort(port);
xml.get("private_port", &m_private_port);
xml.get("password", &m_password_protected);
xml.get("game_started", &m_game_started);
xml.get("distance", &m_distance);
m_server_owner_name = L"-";
m_server_owner_lower_case_name = "-";
@ -118,10 +119,12 @@ Server::Server(const XMLNode& xml) : m_supports_encrytion(true)
* \param server_mode The game modes of server (including minor and major).
* \param address IP and port of the server.
* \param password_protected True if can only be joined with a password.
* \param game_started True if there is already game begun in server.
*/
Server::Server(unsigned server_id, const core::stringw &name, int max_players,
int current_players, unsigned difficulty, unsigned server_mode,
const TransportAddress &address, bool password_protected)
const TransportAddress &address, bool password_protected,
bool game_started)
: m_supports_encrytion(false)
{
m_name = name;
@ -138,6 +141,7 @@ Server::Server(unsigned server_id, const core::stringw &name, int max_players,
m_password_protected = password_protected;
m_distance = 0.0f;
m_official = false;
m_game_started = game_started;
} // server(server_id, ...)
// ----------------------------------------------------------------------------

7
src/network/server.hpp
View File

@ -84,6 +84,8 @@ protected:
bool m_official;
bool m_supports_encrytion;
bool m_game_started;
public:
/** Initialises the object from an XML node. */
@ -91,7 +93,7 @@ public:
Server(unsigned server_id, const irr::core::stringw &name,
int max_players, int current_players, unsigned difficulty,
unsigned server_mode, const TransportAddress &address,
bool password_protected);
bool password_protected, bool game_started);
bool filterByWords(const irr::core::stringw words) const;
// ------------------------------------------------------------------------
/** Returns ip address and port of this server. */
@ -134,6 +136,7 @@ public:
bool supportsEncryption() const { return m_supports_encrytion; }
// ------------------------------------------------------------------------
bool isOfficial() const { return m_official; }
// ------------------------------------------------------------------------
bool isGameStarted() const { return m_game_started; }
}; // Server
#endif // HEADER_SERVER_HPP

17
src/network/servers_manager.cpp
View File

@ -41,7 +41,7 @@
# include <ifaddrs.h>
#endif
#define SERVER_REFRESH_INTERVAL 5.0f
const uint64_t SERVER_REFRESH_INTERVAL = 5000;
static ServersManager* g_manager_singleton(NULL);
@ -64,7 +64,7 @@ void ServersManager::deallocate()
// ----------------------------------------------------------------------------
ServersManager::ServersManager()
{
m_last_load_time.store(0.0f);
m_last_load_time.store(0);
m_list_updated = false;
} // ServersManager
@ -158,8 +158,8 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
char buffer[LEN];
// Wait for up to 0.5 seconds to receive an answer from
// any local servers.
double start_time = StkTime::getRealTime();
const double DURATION = 1.0;
uint64_t start_time = StkTime::getRealTimeMs();
const uint64_t DURATION = 1000;
const auto& servers = ServersManager::get()->getServers();
int cur_server_id = (int)servers.size();
assert(cur_server_id == 0);
@ -169,7 +169,7 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
// because e.g. a local client would answer as 127.0.0.1 and
// 192.168.**.
std::map<irr::core::stringw, std::shared_ptr<Server> > servers_now;
while (StkTime::getRealTime() - start_time < DURATION)
while (StkTime::getRealTimeMs() - start_time < DURATION)
{
TransportAddress sender;
int len = broadcast->receiveRawPacket(buffer, LEN, &sender, 1);
@ -193,10 +193,11 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
uint8_t mode = s.getUInt8();
sender.setPort(port);
uint8_t password = s.getUInt8();
uint8_t game_started = s.getUInt8();
servers_now.insert(std::make_pair(name,
std::make_shared<Server>(cur_server_id++, name,
max_players, players, difficulty, mode, sender,
password == 1)));
password == 1, game_started == 1)));
//all_servers.[name] = servers_now.back();
} // if received_data
} // while still waiting
@ -236,7 +237,7 @@ void ServersManager::setLanServers(const std::map<irr::core::stringw,
*/
bool ServersManager::refresh(bool full_refresh)
{
if (StkTime::getRealTime() - m_last_load_time.load()
if (StkTime::getRealTimeMs() - m_last_load_time.load()
< SERVER_REFRESH_INTERVAL)
{
// Avoid too frequent refreshing
@ -292,7 +293,7 @@ void ServersManager::setWanServers(bool success, const XMLNode* input)
m_servers.emplace_back(
std::make_shared<Server>(*servers_xml->getNode(i)));
}
m_last_load_time.store((float)StkTime::getRealTime());
m_last_load_time.store(StkTime::getRealTimeMs());
m_list_updated = true;
} // refresh

2
src/network/servers_manager.hpp
View File

@ -45,7 +45,7 @@ private:
/** List of broadcast addresses to use. */
std::vector<TransportAddress> m_broadcast_address;
std::atomic<float> m_last_load_time;
std::atomic<uint64_t> m_last_load_time;
std::atomic_bool m_list_updated;
// ------------------------------------------------------------------------

9
src/network/smooth_network_body.hpp
View File

@ -16,6 +16,15 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/*! \file smooth_network_body.hpp
* \brief This class help to smooth the graphicial transformation of network
* controlled object. In case there is any difference between server and
* client predicted values, instead of showing the server one immediately,
* it will interpolate between them with an extrapolated value from the old
* predicted values stored in m_adjust_control_point estimated by current
* speed of object.
*/
#ifndef HEADER_SMOOTH_NETWORK_BODY_HPP
#define HEADER_SMOOTH_NETWORK_BODY_HPP

134
src/network/stk_host.cpp
View File

@ -35,7 +35,6 @@
#include "utils/separate_process.hpp"
#include "utils/time.hpp"
#include "utils/vs.hpp"
#include "main_loop.hpp"
#include <string.h>
#if defined(WIN32)
@ -304,12 +303,12 @@ STKHost::STKHost(bool server)
*/
void STKHost::init()
{
m_network_timer.store(StkTime::getRealTimeMs());
m_shutdown = false;
m_authorised = false;
m_network = NULL;
m_exit_timeout.store(std::numeric_limits<double>::max());
m_exit_timeout.store(std::numeric_limits<uint64_t>::max());
m_client_ping.store(0);
main_loop->resetStartNetworkGameTimer();
// Start with initialising ENet
// ============================
@ -337,7 +336,6 @@ void STKHost::init()
*/
STKHost::~STKHost()
{
main_loop->resetStartNetworkGameTimer();
requestShutdown();
if (m_network_console.joinable())
m_network_console.join();
@ -442,7 +440,7 @@ void STKHost::setPublicAddress()
}
m_network->sendRawPacket(s, m_stun_address);
double ping = StkTime::getRealTime();
uint64_t ping = StkTime::getRealTimeMs();
freeaddrinfo(res);
// Recieve now
@ -450,7 +448,7 @@ void STKHost::setPublicAddress()
const int LEN = 2048;
char buffer[LEN];
int len = m_network->receiveRawPacket(buffer, LEN, &sender, 2000);
ping = StkTime::getRealTime() - ping;
ping = StkTime::getRealTimeMs() - ping;
if (sender.getIP() != m_stun_address.getIP())
{
@ -589,8 +587,7 @@ void STKHost::setPublicAddress()
m_public_address = non_xor_addr;
}
// Succeed, save ping
UserConfigParams::m_stun_list[server_name] =
(uint32_t)(ping * 1000.0);
UserConfigParams::m_stun_list[server_name] = (uint32_t)(ping);
untried_server.clear();
}
}
@ -622,7 +619,7 @@ void STKHost::disconnectAllPeers(bool timeout_waiting)
for (auto peer : m_peers)
peer.second->disconnect();
// Wait for at most 2 seconds for disconnect event to be generated
m_exit_timeout.store(StkTime::getRealTime() + 2.0);
m_exit_timeout.store(StkTime::getRealTimeMs() + 2000);
}
m_peers.clear();
} // disconnectAllPeers
@ -669,7 +666,7 @@ bool STKHost::connect(const TransportAddress& address)
*/
void STKHost::startListening()
{
m_exit_timeout.store(std::numeric_limits<double>::max());
m_exit_timeout.store(std::numeric_limits<uint64_t>::max());
m_listening_thread = std::thread(std::bind(&STKHost::mainLoop, this));
} // startListening
@ -679,8 +676,8 @@ void STKHost::startListening()
*/
void STKHost::stopListening()
{
if (m_exit_timeout.load() == std::numeric_limits<double>::max())
m_exit_timeout.store(0.0);
if (m_exit_timeout.load() == std::numeric_limits<uint64_t>::max())
m_exit_timeout.store(0);
if (m_listening_thread.joinable())
m_listening_thread.join();
} // stopListening
@ -718,9 +715,9 @@ void STKHost::mainLoop()
}
}
double last_ping_time = StkTime::getRealTime();
double last_ping_time_update_for_client = StkTime::getRealTime();
while (m_exit_timeout.load() > StkTime::getRealTime())
uint64_t last_ping_time = StkTime::getRealTimeMs();
uint64_t last_ping_time_update_for_client = StkTime::getRealTimeMs();
while (m_exit_timeout.load() > StkTime::getRealTimeMs())
{
auto sl = LobbyProtocol::get<ServerLobby>();
if (direct_socket && sl && sl->waitingForPlayers())
@ -741,16 +738,18 @@ void STKHost::mainLoop()
std::unique_lock<std::mutex> peer_lock(m_peers_mutex);
const float timeout = UserConfigParams::m_validation_timeout;
bool need_ping = false;
if (sl && !sl->isRacing() &&
last_ping_time < StkTime::getRealTime())
if (sl && (!sl->isRacing() || sl->allowJoinedPlayersWaiting()) &&
last_ping_time < StkTime::getRealTimeMs())
{
// If not racing, send an reliable packet at the same rate with
// state exchange to keep enet ping accurate
last_ping_time = StkTime::getRealTime() +
1.0 / double(stk_config->m_network_state_frequeny);
last_ping_time = StkTime::getRealTimeMs() +
(uint64_t)((1.0f /
(float)(stk_config->m_network_state_frequeny)) * 1000.0f);
need_ping = true;
}
ENetPacket* packet = NULL;
if (need_ping)
{
m_peer_pings.getData().clear();
@ -761,7 +760,8 @@ void STKHost::mainLoop()
const unsigned ap = p.second->getAveragePing();
const unsigned max_ping = UserConfigParams::m_max_ping;
if (UserConfigParams::m_kick_high_ping_players &&
p.second->isValidated() && ap > max_ping)
p.second->isValidated() &&
p.second->getConnectedTime() > 5.0f && ap > max_ping)
{
Log::info("STKHost", "%s with ping %d is higher than"
" %d ms, kick.",
@ -773,30 +773,32 @@ void STKHost::mainLoop()
ECT_DISCONNECT);
}
}
BareNetworkString ping_packet;
uint64_t network_timer = getNetworkTimer();
ping_packet.addUInt64(network_timer);
ping_packet.addUInt8((uint8_t)m_peer_pings.getData().size());
for (auto& p : m_peer_pings.getData())
ping_packet.addUInt32(p.first).addUInt32(p.second);
ping_packet.getBuffer().insert(
ping_packet.getBuffer().begin(), g_ping_packet.begin(),
g_ping_packet.end());
packet = enet_packet_create(ping_packet.getData(),
ping_packet.getTotalSize(), ENET_PACKET_FLAG_RELIABLE);
}
for (auto it = m_peers.begin(); it != m_peers.end();)
{
if (need_ping)
if (need_ping &&
(!sl->allowJoinedPlayersWaiting() ||
!sl->isRacing() || it->second->isWaitingForGame()))
{
BareNetworkString ping_packet;
uint64_t network_timer = main_loop->getNetworkTimer();
ping_packet.addUInt64(network_timer);
ping_packet.addUInt8((uint8_t)m_peer_pings.getData().size());
for (auto& p : m_peer_pings.getData())
ping_packet.addUInt32(p.first).addUInt32(p.second);
ping_packet.getBuffer().insert(
ping_packet.getBuffer().begin(), g_ping_packet.begin(),
g_ping_packet.end());
ENetPacket* packet = enet_packet_create(ping_packet.getData(),
ping_packet.getTotalSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(it->first, EVENT_CHANNEL_UNENCRYPTED, packet);
}
// Remove peer which has not been validated after a specific time
// It is validated when the first connection request has finished
if (!it->second->isValidated() &&
(float)StkTime::getRealTime() >
it->second->getConnectedTime() + timeout)
it->second->getConnectedTime() > timeout)
{
Log::info("STKHost", "%s has not been validated for more"
" than %f seconds, disconnect it by force.",
@ -845,10 +847,10 @@ void STKHost::mainLoop()
while (enet_host_service(host, &event, 10) != 0)
{
if (!is_server &&
last_ping_time_update_for_client < StkTime::getRealTime())
last_ping_time_update_for_client < StkTime::getRealTimeMs())
{
last_ping_time_update_for_client =
StkTime::getRealTime() + 2.0;
StkTime::getRealTimeMs() + 2000;
auto lp = LobbyProtocol::get<LobbyProtocol>();
if (lp && lp->isRacing())
{
@ -888,9 +890,9 @@ void STKHost::mainLoop()
// If used a timeout waiting disconnect, exit now
if (m_exit_timeout.load() !=
std::numeric_limits<double>::max())
std::numeric_limits<uint64_t>::max())
{
m_exit_timeout.store(0.0);
m_exit_timeout.store(0);
break;
}
// Use the previous stk peer so protocol can see the network
@ -914,9 +916,9 @@ void STKHost::mainLoop()
if (!is_server)
{
BareNetworkString ping_packet((char*)event.packet->data,
event.packet->dataLength);
(int)event.packet->dataLength);
std::map<uint32_t, uint32_t> peer_pings;
ping_packet.skip(g_ping_packet.size());
ping_packet.skip((int)g_ping_packet.size());
uint64_t server_time = ping_packet.getUInt64();
unsigned peer_size = ping_packet.getUInt8();
for (unsigned i = 0; i < peer_size; i++)
@ -983,7 +985,7 @@ void STKHost::mainLoop()
else
delete stk_event;
} // while enet_host_service
} // while m_exit_timeout.load() > StkTime::getRealTime()
} // while m_exit_timeout.load() > StkTime::getRealTimeMs()
delete direct_socket;
Log::info("STKHost", "Listening has been stopped.");
} // mainLoop
@ -1028,11 +1030,15 @@ void STKHost::handleDirectSocketRequest(Network* direct_socket,
s.addUInt32(NetworkConfig::m_server_version);
s.encodeString(name);
s.addUInt8(NetworkConfig::get()->getMaxPlayers());
s.addUInt8((uint8_t)sl->getGameSetup()->getPlayerCount());
s.addUInt8((uint8_t)(sl->getGameSetup()->getPlayerCount() +
sl->getWaitingPlayersCount()));
s.addUInt16(m_private_port);
s.addUInt8((uint8_t)race_manager->getDifficulty());
s.addUInt8((uint8_t)NetworkConfig::get()->getServerMode());
s.addUInt8(!NetworkConfig::get()->getPassword().empty());
s.addUInt8((uint8_t)
(sl->getCurrentState() == ServerLobby::WAITING_FOR_START_GAME ?
0 : 1));
direct_socket->sendRawPacket(s, sender);
} // if message is server-requested
else if (command == connection_cmd)
@ -1124,7 +1130,22 @@ bool STKHost::isConnectedTo(const TransportAddress& peer)
} // isConnectedTo
//-----------------------------------------------------------------------------
/** Sends data to all peers
/** Sends data to all validated peers currently in server
* \param data Data to sent.
* \param reliable If the data should be sent reliable or now.
*/
void STKHost::sendPacketToAllPeersInServer(NetworkString *data, bool reliable)
{
std::lock_guard<std::mutex> lock(m_peers_mutex);
for (auto p : m_peers)
{
if (p.second->isValidated())
p.second->sendPacket(data, reliable);
}
} // sendPacketToAllPeersInServer
//-----------------------------------------------------------------------------
/** Sends data to all validated peers currently in game
* \param data Data to sent.
* \param reliable If the data should be sent reliable or now.
*/
@ -1133,13 +1154,13 @@ void STKHost::sendPacketToAllPeers(NetworkString *data, bool reliable)
std::lock_guard<std::mutex> lock(m_peers_mutex);
for (auto p : m_peers)
{
if (p.second->isValidated())
if (p.second->isValidated() && !p.second->isWaitingForGame())
p.second->sendPacket(data, reliable);
}
} // sendPacketExcept
} // sendPacketToAllPeers
//-----------------------------------------------------------------------------
/** Sends data to all peers except the specified one.
/** Sends data to all validated peers except the specified currently in game
* \param peer Peer which will not receive the message.
* \param data Data to sent.
* \param reliable If the data should be sent reliable or now.
@ -1151,13 +1172,32 @@ void STKHost::sendPacketExcept(STKPeer* peer, NetworkString *data,
for (auto p : m_peers)
{
STKPeer* stk_peer = p.second.get();
if (!stk_peer->isSamePeer(peer) && p.second->isValidated())
if (!stk_peer->isSamePeer(peer) && p.second->isValidated() &&
!p.second->isWaitingForGame())
{
stk_peer->sendPacket(data, reliable);
}
}
} // sendPacketExcept
//-----------------------------------------------------------------------------
/** Sends data to peers with custom rule
* \param predicate boolean function for peer to predicate whether to send
* \param data Data to sent.
* \param reliable If the data should be sent reliable or now.
*/
void STKHost::sendPacketToAllPeersWith(std::function<bool(STKPeer*)> predicate,
NetworkString* data, bool reliable)
{
std::lock_guard<std::mutex> lock(m_peers_mutex);
for (auto p : m_peers)
{
STKPeer* stk_peer = p.second.get();
if (predicate(stk_peer))
stk_peer->sendPacket(data, reliable);
}
} // sendPacketToAllPeersWith
//-----------------------------------------------------------------------------
/** Sends a message from a client to the server. */
void STKHost::sendToServer(NetworkString *data, bool reliable)

19
src/network/stk_host.hpp
View File

@ -26,6 +26,7 @@
#include "network/network_string.hpp"
#include "network/transport_address.hpp"
#include "utils/synchronised.hpp"
#include "utils/time.hpp"
#include "irrString.h"
@ -37,6 +38,7 @@
#include <atomic>
#include <list>
#include <functional>
#include <map>
#include <memory>
#include <mutex>
@ -119,7 +121,7 @@ private:
std::atomic_bool m_authorised;
/** Use as a timeout to waiting a disconnect event when exiting. */
std::atomic<double> m_exit_timeout;
std::atomic<uint64_t> m_exit_timeout;
/** An error message, which is set by a protocol to be displayed
* in the GUI. */
@ -138,6 +140,8 @@ private:
std::atomic<uint32_t> m_client_ping;
std::atomic<uint64_t> m_network_timer;
std::unique_ptr<NetworkTimerSynchronizer> m_nts;
// ------------------------------------------------------------------------
@ -207,8 +211,14 @@ public:
//-------------------------------------------------------------------------
void shutdown();
//-------------------------------------------------------------------------
void sendPacketToAllPeersInServer(NetworkString *data,
bool reliable = true);
// ------------------------------------------------------------------------
void sendPacketToAllPeers(NetworkString *data, bool reliable = true);
// ------------------------------------------------------------------------
void sendPacketToAllPeersWith(std::function<bool(STKPeer*)> predicate,
NetworkString* data, bool reliable = true);
// ------------------------------------------------------------------------
/** Returns true if this client instance is allowed to control the server.
* It will auto transfer ownership if previous server owner disconnected.
*/
@ -318,7 +328,12 @@ public:
// ------------------------------------------------------------------------
NetworkTimerSynchronizer* getNetworkTimerSynchronizer() const
{ return m_nts.get(); }
// ------------------------------------------------------------------------
uint64_t getNetworkTimer() const
{ return StkTime::getRealTimeMs() - m_network_timer.load(); }
// ------------------------------------------------------------------------
void setNetworkTimer(uint64_t ticks)
{ m_network_timer.store(StkTime::getRealTimeMs() - ticks); }
}; // class STKHost
#endif // STK_HOST_HPP

16
src/network/stk_peer.cpp
View File

@ -37,9 +37,10 @@ STKPeer::STKPeer(ENetPeer *enet_peer, STKHost* host, uint32_t host_id)
{
m_enet_peer = enet_peer;
m_host_id = host_id;
m_connected_time = (float)StkTime::getRealTime();
m_connected_time = StkTime::getRealTimeMs();
m_validated.store(false);
m_average_ping = 0;
m_average_ping.store(0);
m_waiting_for_game.store(true);
} // STKPeer
//-----------------------------------------------------------------------------
@ -114,7 +115,7 @@ void STKPeer::sendPacket(NetworkString *data, bool reliable, bool encrypted)
{
if (Network::m_connection_debug)
{
Log::verbose("STKPeer", "sending packet of size %d to %s at %f",
Log::verbose("STKPeer", "sending packet of size %d to %s at %lf",
packet->dataLength, a.toString().c_str(),
StkTime::getRealTime());
}
@ -155,8 +156,11 @@ bool STKPeer::isSamePeer(const ENetPeer* peer) const
*/
uint32_t STKPeer::getPing()
{
if ((float)StkTime::getRealTime() - m_connected_time < 3.0f)
if (getConnectedTime() < 3.0f)
{
m_average_ping.store(m_enet_peer->roundTripTime);
return 0;
}
if (NetworkConfig::get()->isServer())
{
// Average ping in 5 seconds
@ -165,9 +169,9 @@ uint32_t STKPeer::getPing()
while (m_previous_pings.size() > ap)
{
m_previous_pings.pop_front();
m_average_ping =
m_average_ping.store(
(uint32_t)(std::accumulate(m_previous_pings.begin(),
m_previous_pings.end(), 0) / m_previous_pings.size());
m_previous_pings.end(), 0) / m_previous_pings.size()));
}
}
return m_enet_peer->roundTripTime;

18
src/network/stk_peer.hpp
View File

@ -25,6 +25,7 @@
#include "network/transport_address.hpp"
#include "utils/no_copy.hpp"
#include "utils/time.hpp"
#include "utils/types.hpp"
#include <enet/enet.h>
@ -63,6 +64,9 @@ protected:
/** True if this peer is validated by server. */
std::atomic_bool m_validated;
/** True if this peer is waiting for game. */
std::atomic_bool m_waiting_for_game;
/** Host id of this peer. */
uint32_t m_host_id;
@ -72,7 +76,7 @@ protected:
std::vector<std::shared_ptr<NetworkPlayerProfile> > m_players;
float m_connected_time;
uint64_t m_connected_time;
/** Available karts and tracks from this peer */
std::pair<std::set<std::string>, std::set<std::string> > m_available_kts;
@ -81,7 +85,7 @@ protected:
std::deque<uint32_t> m_previous_pings;
uint32_t m_average_ping;
std::atomic<uint32_t> m_average_ping;
public:
STKPeer(ENetPeer *enet_peer, STKHost* host, uint32_t host_id);
@ -120,7 +124,8 @@ public:
/** Returns the host id of this peer. */
uint32_t getHostId() const { return m_host_id; }
// ------------------------------------------------------------------------
float getConnectedTime() const { return m_connected_time; }
float getConnectedTime() const
{ return float(StkTime::getRealTimeMs() - m_connected_time) / 1000.0f; }
// ------------------------------------------------------------------------
void setAvailableKartsTracks(std::set<std::string>& k,
std::set<std::string>& t)
@ -165,9 +170,14 @@ public:
// ------------------------------------------------------------------------
void setCrypto(std::unique_ptr<Crypto>&& c);
// ------------------------------------------------------------------------
uint32_t getAveragePing() const { return m_average_ping; }
uint32_t getAveragePing() const { return m_average_ping.load(); }
// ------------------------------------------------------------------------
ENetPeer* getENetPeer() const { return m_enet_peer; }
// ------------------------------------------------------------------------
void setWaitingForGame(bool val) { m_waiting_for_game.store(val); }
// ------------------------------------------------------------------------
bool isWaitingForGame() const { return m_waiting_for_game.load(); }
}; // STKPeer
#endif // STK_PEER_HPP

2
src/race/highscores.cpp
View File

@ -184,7 +184,7 @@ int Highscores::addData(const std::string& kart_name,
if(position>=0)
{
m_track = race_manager->getTrackName();
m_number_of_karts = race_manager->getNumberOfKarts();
m_number_of_karts = race_manager->getNumNonGhostKarts();
m_difficulty = race_manager->getDifficulty();
m_number_of_laps = race_manager->getNumLaps();
m_reverse = race_manager->getReverseTrack();

2
src/race/highscores.hpp
View File

@ -40,7 +40,7 @@ public:
typedef std::string HighscoreType;
private:
enum {HIGHSCORE_LEN = 3}; // It's a top 3 list
enum {HIGHSCORE_LEN = 5}; // It's a top 5 list
std::string m_track;
HighscoreType m_highscore_type;
int m_number_of_karts;

17
src/race/race_manager.cpp
View File

@ -69,6 +69,7 @@ RaceManager::RaceManager()
// Several code depends on this, e.g. kart_properties
assert(DIFFICULTY_FIRST == 0);
m_num_karts = UserConfigParams::m_default_num_karts;
m_num_ghost_karts = 0;
m_difficulty = DIFFICULTY_HARD;
m_major_mode = MAJOR_MODE_SINGLE;
m_minor_mode = MINOR_MODE_NORMAL_RACE;
@ -321,9 +322,9 @@ void RaceManager::computeRandomKartList()
*/
void RaceManager::startNew(bool from_overworld)
{
unsigned int gk = 0;
m_num_ghost_karts = 0;
if (m_has_ghost_karts)
gk = ReplayPlay::get()->getNumGhostKart();
m_num_ghost_karts = ReplayPlay::get()->getNumGhostKart();
m_started_from_overworld = from_overworld;
m_saved_gp = NULL; // There will be checks for this being NULL done later
@ -376,21 +377,21 @@ void RaceManager::startNew(bool from_overworld)
// Create the kart status data structure to keep track of scores, times, ...
// ==========================================================================
m_kart_status.clear();
if (gk > 0)
m_num_karts += gk;
if (m_num_ghost_karts > 0)
m_num_karts += m_num_ghost_karts;
Log::verbose("RaceManager", "Nb of karts=%u, ghost karts:%u ai:%lu players:%lu\n",
(unsigned int) m_num_karts, gk, m_ai_kart_list.size(), m_player_karts.size());
(unsigned int) m_num_karts, m_num_ghost_karts, m_ai_kart_list.size(), m_player_karts.size());
assert((unsigned int)m_num_karts == gk+m_ai_kart_list.size()+m_player_karts.size());
assert((unsigned int)m_num_karts == m_num_ghost_karts+m_ai_kart_list.size()+m_player_karts.size());
// First add the ghost karts (if any)
// ----------------------------------------
// GP ranks start with -1 for the leader.
int init_gp_rank = getMinorMode()==MINOR_MODE_FOLLOW_LEADER ? -1 : 0;
if (gk > 0)
if (m_num_ghost_karts > 0)
{
for(unsigned int i = 0; i < gk; i++)
for(unsigned int i = 0; i < m_num_ghost_karts; i++)
{
m_kart_status.push_back(KartStatus(ReplayPlay::get()->getGhostKartName(i),
i, -1, -1, init_gp_rank, KT_GHOST, PLAYER_DIFFICULTY_NORMAL));

3
src/race/race_manager.hpp
View File

@ -334,6 +334,7 @@ private:
GrandPrixData m_grand_prix;
SavedGrandPrix* m_saved_gp;
int m_num_karts;
unsigned int m_num_ghost_karts;
unsigned int m_num_spare_tire_karts;
unsigned int m_num_finished_karts;
unsigned int m_num_finished_players;
@ -511,6 +512,8 @@ public:
* AI karts. */
unsigned int getNumberOfKarts() const {return m_num_karts; }
// ------------------------------------------------------------------------
unsigned int getNumNonGhostKarts() const { return m_num_karts - m_num_ghost_karts; }
// ------------------------------------------------------------------------
MajorRaceModeType getMajorMode() const { return m_major_mode; }
// ------------------------------------------------------------------------
MinorRaceModeType getMinorMode() const { return m_minor_mode; }

2
src/states_screens/create_server_screen.cpp
View File

@ -267,7 +267,7 @@ void CreateServerScreen::createServer()
auto server = std::make_shared<Server>(0/*server_id*/, name,
max_players, /*current_player*/0, (RaceManager::Difficulty)
difficulty_widget->getSelection(PLAYER_ID_GAME_MASTER),
0, server_address, !password.empty());
0, server_address, !password.empty(), false);
#undef USE_GRAPHICS_SERVER
#ifdef USE_GRAPHICS_SERVER

6
src/states_screens/dialogs/player_rankings_dialog.cpp
View File

@ -165,12 +165,12 @@ GUIEngine::EventPropagation
}
else if (selection == m_refresh_widget->m_properties[PROP_ID])
{
static double timer = StkTime::getRealTime();
static uint64_t timer = StkTime::getRealTimeMs();
// 1 minute per refresh
if (StkTime::getRealTime() < timer + 60.0)
if (StkTime::getRealTimeMs() < timer + 60000)
return GUIEngine::EVENT_BLOCK;
timer = StkTime::getRealTime();
timer = StkTime::getRealTimeMs();
*m_fetched_ranking = false;
updatePlayerRanking(m_name, m_online_id, m_ranking_info,
m_fetched_ranking);

1
src/states_screens/ghost_replay_selection.cpp
View File

@ -50,6 +50,7 @@ GhostReplaySelection::~GhostReplaySelection()
// ----------------------------------------------------------------------------
void GhostReplaySelection::tearDown()
{
m_replay_list_widget->setIcons(NULL);
delete m_icon_bank;
m_icon_bank = NULL;
}

63
src/states_screens/networking_lobby.cpp
View File

@ -37,7 +37,7 @@
#include "io/file_manager.hpp"
#include "network/network_config.hpp"
#include "network/protocols/connect_to_server.hpp"
#include "network/protocols/lobby_protocol.hpp"
#include "network/protocols/client_lobby.hpp"
#include "network/server.hpp"
#include "network/stk_host.hpp"
#include "states_screens/state_manager.hpp"
@ -115,9 +115,12 @@ void NetworkingLobby::loadedFromFile()
(file_manager->getAsset(FileManager::GUI, "difficulty_medium.png"));
video::ITexture* icon_3 = irr_driver->getTexture
(file_manager->getAsset(FileManager::GUI, "main_help.png"));
video::ITexture* icon_4 = irr_driver->getTexture
(file_manager->getAsset(FileManager::GUI, "hourglass.png"));
m_icon_bank->addTextureAsSprite(icon_1);
m_icon_bank->addTextureAsSprite(icon_2);
m_icon_bank->addTextureAsSprite(icon_3);
m_icon_bank->addTextureAsSprite(icon_4);
const int screen_width = irr_driver->getFrameSize().Width;
m_icon_bank->setScale(screen_width > 1280 ? 0.4f : 0.25f);
} // loadedFromFile
@ -136,7 +139,9 @@ void NetworkingLobby::init()
{
Screen::init();
m_player_names.clear();
m_allow_change_team = false;
m_has_auto_start_in_server = false;
m_ping_update_timer = 0.0f;
m_cur_starting_timer = m_start_threshold = m_start_timeout =
m_server_max_player = std::numeric_limits<float>::max();
@ -210,8 +215,43 @@ void NetworkingLobby::onUpdate(float delta)
{
if (NetworkConfig::get()->isServer())
return;
if (m_timeout_message->isVisible() && m_player_list)
m_ping_update_timer += delta;
if (m_player_list && m_ping_update_timer > 2.0f)
{
m_ping_update_timer = 0.0f;
updatePlayerPings();
}
//I18N: In the networking lobby, display ping when connected
const uint32_t ping = STKHost::get()->getClientPingToServer();
if (ping != 0)
m_header->setText(_("Lobby (ping: %dms)", ping), false);
auto cl = LobbyProtocol::get<ClientLobby>();
if (cl && cl->isWaitingForGame())
{
m_start_button->setVisible(false);
m_exit_widget->setVisible(true);
m_timeout_message->setVisible(true);
//I18N: In the networking lobby, show when player is required to wait
//before the current game finish
core::stringw msg = _("Please wait for current game to end.");
m_timeout_message->setText(msg, true);
core::stringw total_msg;
for (auto& string : m_server_info)
{
total_msg += string;
total_msg += L"\n";
}
m_text_bubble->setText(total_msg, true);
m_cur_starting_timer = std::numeric_limits<float>::max();
return;
}
if (m_has_auto_start_in_server && m_player_list)
{
m_timeout_message->setVisible(true);
float cur_player = (float)(m_player_list->getItemCount());
if (cur_player >= m_server_max_player * m_start_threshold &&
m_cur_starting_timer == std::numeric_limits<float>::max())
@ -242,6 +282,10 @@ void NetworkingLobby::onUpdate(float delta)
m_timeout_message->setText(msg, true);
}
}
else
{
m_timeout_message->setVisible(false);
}
if (m_state == LS_ADD_PLAYERS)
{
@ -259,8 +303,7 @@ void NetworkingLobby::onUpdate(float delta)
m_start_button->setVisible(false);
m_exit_widget->setVisible(true);
auto lp = LobbyProtocol::get<LobbyProtocol>();
if (!lp || !lp->waitingForPlayers())
if (!cl || !cl->isLobbyReady())
{
core::stringw connect_msg;
if (m_joined_server)
@ -287,20 +330,10 @@ void NetworkingLobby::onUpdate(float delta)
m_text_bubble->setText(total_msg, true);
}
m_ping_update_timer += delta;
if (m_player_list && m_ping_update_timer > 2.0f)
{
m_ping_update_timer = 0.0f;
updatePlayerPings();
}
if (STKHost::get()->isAuthorisedToControl())
{
m_start_button->setVisible(true);
}
//I18N: In the networking lobby, display ping when connected
const uint32_t ping = STKHost::get()->getClientPingToServer();
if (ping != 0)
m_header->setText(_("Lobby (ping: %dms)", ping), false);
} // onUpdate
@ -508,7 +541,7 @@ void NetworkingLobby::initAutoStartTimer(bool grand_prix_started,
if (start_threshold == 0.0f || start_timeout == 0.0f)
return;
m_timeout_message->setVisible(true);
m_has_auto_start_in_server = true;
m_start_threshold = grand_prix_started ? 0.0f : start_threshold;
m_start_timeout = start_timeout;
m_server_max_player = (float)server_max_player;

2
src/states_screens/networking_lobby.hpp
View File

@ -74,7 +74,7 @@ private:
float m_cur_starting_timer, m_start_threshold, m_start_timeout,
m_server_max_player;
bool m_allow_change_team;
bool m_allow_change_team, m_has_auto_start_in_server;
GUIEngine::IconButtonWidget* m_back_widget;
GUIEngine::LabelWidget* m_header;

2
src/states_screens/online_screen.cpp
View File

@ -261,7 +261,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name,
NetworkConfig::get()->setIsServer(false);
NetworkConfig::get()->setPassword("");
auto server = std::make_shared<Server>(0, L"", 0, 0, 0, 0,
server_addr, false);
server_addr, false, false);
STKHost::create();
auto cts = std::make_shared<ConnectToServer>(server);
cts->setup();

17
src/states_screens/options_screen_video.cpp
View File

@ -250,6 +250,7 @@ void OptionsScreenVideo::init()
// old standard resolutions
// those are always useful for windowed mode
bool found_1024_768 = false;
bool found_1280_720 = false;
for (int n=0; n<amount; n++)
{
@ -267,6 +268,10 @@ void OptionsScreenVideo::init()
{
found_1024_768 = true;
}
if (r.width == 1280 && r.height == 720)
{
found_1280_720 = true;
}
}
#ifndef ANDROID
@ -280,6 +285,10 @@ void OptionsScreenVideo::init()
{
found_1024_768 = true;
}
if (r.width == 1280 && r.height == 720)
{
found_1280_720 = true;
}
} // next found resolution
// Add default resolutions that were not found by irrlicht
@ -289,6 +298,13 @@ void OptionsScreenVideo::init()
r.height = 768;
resolutions.push_back(r);
}
if (!found_1280_720)
{
r.width = 1280;
r.height = 720;
resolutions.push_back(r);
}
#endif
// Sort resolutions by size
@ -601,4 +617,3 @@ void OptionsScreenVideo::unloaded()
} // unloaded
// ----------------------------------------------------------------------------

10
src/states_screens/race_gui.cpp
View File

@ -230,13 +230,13 @@ void RaceGUI::renderGlobal(float dt)
World *world = World::getWorld();
assert(world != NULL);
if(world->getPhase() >= WorldStatus::READY_PHASE &&
if(world->getPhase() >= WorldStatus::WAIT_FOR_SERVER_PHASE &&
world->getPhase() <= WorldStatus::GO_PHASE )
{
drawGlobalReadySetGo();
}
if(world->getPhase() == World::GOAL_PHASE)
drawGlobalGoal();
drawGlobalGoal();
// MiniMap is drawn when the players wait for the start countdown to end
drawGlobalMiniMap();
@ -245,13 +245,11 @@ void RaceGUI::renderGlobal(float dt)
if(!world->isRacePhase()) return;
if (!m_enabled) return;
//drawGlobalTimer checks if it should display in the current phase/mode
drawGlobalTimer();
if (!m_is_tutorial)
{
//stop displaying timer as soon as race is over
if (world->getPhase()<WorldStatus::DELAY_FINISH_PHASE)
drawGlobalTimer();
if (race_manager->isLinearRaceMode() &&
race_manager->hasGhostKarts() &&
race_manager->getNumberOfKarts() >= 2 )

15
src/states_screens/race_gui_base.cpp
View File

@ -70,6 +70,9 @@ RaceGUIBase::RaceGUIBase()
m_string_go = _("Go!");
//I18N: Shown when a goal is scored
m_string_goal = _("GOAL!");
// I18N: Shown waiting for other players in network to finish loading or
// waiting
m_string_waiting_for_others = _("Waiting for others");
m_music_icon = irr_driver->getTexture("notes.png");
if (!m_music_icon)
@ -626,6 +629,18 @@ void RaceGUIBase::drawGlobalReadySetGo()
{
switch (World::getWorld()->getPhase())
{
case WorldStatus::WAIT_FOR_SERVER_PHASE:
{
static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1,
irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1);
gui::IGUIFont* font = GUIEngine::getTitleFont();
font->draw(StringUtils::loadingDots(
m_string_waiting_for_others.c_str()), pos, color, true, true);
}
break;
case WorldStatus::READY_PHASE:
{
static video::SColor color = video::SColor(255, 255, 255, 255);

3
src/states_screens/race_gui_base.hpp
View File

@ -133,7 +133,8 @@ private:
video::ITexture* m_plunger_face;
/** Translated strings 'ready', 'set', 'go'. */
core::stringw m_string_ready, m_string_set, m_string_go, m_string_goal;
core::stringw m_string_ready, m_string_set, m_string_go, m_string_goal,
m_string_waiting_for_others;
/** The position of the referee for all karts. */
std::vector<Vec3> m_referee_pos;

2
src/states_screens/race_result_gui.cpp
View File

@ -1582,7 +1582,7 @@ void RaceResultGUI::displayCTFResults()
}
int current_x = x;
current_y = y + (int)((i + 1) * m_distance_between_rows * 1.5f);
current_y = y + (int)((i + 1) * m_distance_between_rows);
const KartProperties* prop = kart_properties_manager->getKart(kart_name);
if (prop != NULL)

45
src/states_screens/server_selection.cpp
View File

@ -18,10 +18,13 @@
#include "states_screens/server_selection.hpp"
#include "audio/sfx_manager.hpp"
#include "graphics/irr_driver.hpp"
#include "guiengine/CGUISpriteBank.hpp"
#include "guiengine/widgets/check_box_widget.hpp"
#include "guiengine/widgets/icon_button_widget.hpp"
#include "guiengine/widgets/label_widget.hpp"
#include "guiengine/modaldialog.hpp"
#include "io/file_manager.hpp"
#include "network/network_config.hpp"
#include "network/server.hpp"
#include "network/servers_manager.hpp"
@ -92,6 +95,16 @@ void ServerSelection::loadedFromFile()
m_private_server = getWidget<GUIEngine::CheckBoxWidget>("private_server");
assert(m_private_server != NULL);
m_private_server->setState(false);
m_game_started = getWidget<GUIEngine::CheckBoxWidget>("game_started");
assert(m_game_started != NULL);
m_game_started->setState(false);
m_icon_bank = new irr::gui::STKModifiedSpriteBank(GUIEngine::getGUIEnv());
video::ITexture* icon1 = irr_driver->getTexture(
file_manager->getAsset(FileManager::GUI, "green_check.png"));
video::ITexture* icon2 = irr_driver->getTexture(
file_manager->getAsset(FileManager::GUI, "hourglass.png"));
m_icon_bank->addTextureAsSprite(icon1);
m_icon_bank->addTextureAsSprite(icon2);
} // loadedFromFile
// ----------------------------------------------------------------------------
@ -120,6 +133,8 @@ void ServerSelection::beforeAddingWidget()
void ServerSelection::init()
{
Screen::init();
m_icon_bank->setScale((float)getHeight() / 15.0f / 128.0f);
m_server_list_widget->setIcons(m_icon_bank, (float)getHeight() / 12.0f);
m_sort_desc = false;
/** Triggers the loading of the server list in the servers manager. */
refresh(true);
@ -164,19 +179,23 @@ void ServerSelection::loadList(unsigned sort_case)
assert(false);
return false;
});
for (auto server : m_servers)
for (auto& server : m_servers)
{
const int icon = server->isGameStarted() ? 1 : 0;
core::stringw num_players;
num_players.append(StringUtils::toWString(server->getCurrentPlayers()));
num_players.append("/");
num_players.append(StringUtils::toWString(server->getMaxPlayers()));
std::vector<GUIEngine::ListWidget::ListCell> row;
row.push_back(GUIEngine::ListWidget::ListCell(server->getName(), -1, 3));
row.push_back(GUIEngine::ListWidget::ListCell(num_players, -1, 1, true));
row.push_back(GUIEngine::ListWidget::ListCell(server->getName(), icon,
3));
row.push_back(GUIEngine::ListWidget::ListCell(num_players, -1, 1,
true));
core::stringw difficulty =
race_manager->getDifficultyName(server->getDifficulty());
row.push_back(GUIEngine::ListWidget::ListCell(difficulty, -1, 1, true));
row.push_back(GUIEngine::ListWidget::ListCell(difficulty, -1, 1,
true));
core::stringw mode =
NetworkConfig::get()->getModeName(server->getServerMode());
@ -228,7 +247,7 @@ void ServerSelection::eventCallback(GUIEngine::Widget* widget,
{
refresh(true);
}
else if (name == "private_server")
else if (name == "private_server" || name == "game_started")
{
copyFromServersManager();
}
@ -313,9 +332,23 @@ void ServerSelection::copyFromServersManager()
if (m_servers.empty())
return;
m_servers.erase(std::remove_if(m_servers.begin(), m_servers.end(),
[this](const std::shared_ptr<Server> a)->bool
[this](const std::shared_ptr<Server>& a)->bool
{
return a->isPasswordProtected() != m_private_server->getState();
}), m_servers.end());
m_servers.erase(std::remove_if(m_servers.begin(), m_servers.end(),
[this](const std::shared_ptr<Server>& a)->bool
{
if (m_game_started->getState() && a->isGameStarted())
return true;
return false;
}), m_servers.end());
loadList(/* distance */ 5);
} // copyFromServersManager
// ----------------------------------------------------------------------------
void ServerSelection::unloaded()
{
delete m_icon_bank;
m_icon_bank = NULL;
} // unloaded

13
src/states_screens/server_selection.hpp
View File

@ -32,6 +32,15 @@ namespace GUIEngine
class LabelWidget;
class ListWidget;
}
namespace irr
{
namespace gui
{
class STKModifiedSpriteBank;
}
}
class Server;
/**
@ -51,9 +60,11 @@ private:
std::vector<std::shared_ptr<Server> > m_servers;
GUIEngine::CheckBoxWidget* m_private_server;
GUIEngine::CheckBoxWidget* m_game_started;
GUIEngine::IconButtonWidget* m_reload_widget;
GUIEngine::LabelWidget* m_update_status;
GUIEngine::ListWidget* m_server_list_widget;
irr::gui::STKModifiedSpriteBank* m_icon_bank;
/** \brief To check (and set) if sort order is descending **/
bool m_sort_desc;
@ -86,6 +97,8 @@ public:
virtual void tearDown() OVERRIDE;
virtual void unloaded() OVERRIDE;
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void onUpdate(float dt) OVERRIDE;

24
src/states_screens/track_info_screen.cpp
View File

@ -72,13 +72,11 @@ void TrackInfoScreen::loadedFromFile()
m_highscore_label = getWidget<LabelWidget>("highscores");
m_kart_icons[0] = getWidget<IconButtonWidget>("iconscore1");
m_kart_icons[1] = getWidget<IconButtonWidget>("iconscore2");
m_kart_icons[2] = getWidget<IconButtonWidget>("iconscore3");
m_highscore_entries[0] = getWidget<LabelWidget>("highscore1");
m_highscore_entries[1] = getWidget<LabelWidget>("highscore2");
m_highscore_entries[2] = getWidget<LabelWidget>("highscore3");
for (unsigned int i=0;i<HIGHSCORE_COUNT;i++)
{
m_kart_icons[i] = getWidget<IconButtonWidget>(("iconscore"+StringUtils::toString(i+1)).c_str());
m_highscore_entries[i] = getWidget<LabelWidget>(("highscore"+StringUtils::toString(i+1)).c_str());
}
GUIEngine::IconButtonWidget* screenshot = getWidget<IconButtonWidget>("screenshot");
screenshot->setFocusable(false);
@ -259,13 +257,11 @@ void TrackInfoScreen::init()
// ---- High Scores
m_highscore_label->setVisible(has_highscores);
m_kart_icons[0]->setVisible(has_highscores);
m_kart_icons[1]->setVisible(has_highscores);
m_kart_icons[2]->setVisible(has_highscores);
m_highscore_entries[0]->setVisible(has_highscores);
m_highscore_entries[1]->setVisible(has_highscores);
m_highscore_entries[2]->setVisible(has_highscores);
for (unsigned int i=0;i<HIGHSCORE_COUNT;i++)
{
m_kart_icons[i]->setVisible(has_highscores);
m_highscore_entries[i]->setVisible(has_highscores);
}
RibbonWidget* bt_start = getWidget<GUIEngine::RibbonWidget>("buttons");
bt_start->setFocusForPlayer(PLAYER_ID_GAME_MASTER);

2
src/states_screens/track_info_screen.hpp
View File

@ -39,7 +39,7 @@ class Track;
class TrackInfoScreen : public GUIEngine::Screen,
public GUIEngine::ScreenSingleton<TrackInfoScreen>
{
static const int HIGHSCORE_COUNT = 3;
static const int HIGHSCORE_COUNT = 5;
/** A pointer to the track of which the info is shown. */
Track *m_track;

Some files were not shown because too many files have changed in this diff Show More