diff --git a/data/skins/cartoon-mars/achievement.png b/data/skins/cartoon-mars/achievement.png new file mode 100644 index 00000000000..e52eec52db9 Binary files /dev/null and b/data/skins/cartoon-mars/achievement.png differ diff --git a/data/skins/cartoon-mars/background.jpg b/data/skins/cartoon-mars/background.jpg new file mode 100644 index 00000000000..ca67dc29942 Binary files /dev/null and b/data/skins/cartoon-mars/background.jpg differ diff --git a/data/skins/cartoon-mars/bottom_bar.png b/data/skins/cartoon-mars/bottom_bar.png new file mode 100644 index 00000000000..04d489b25bd Binary files /dev/null and b/data/skins/cartoon-mars/bottom_bar.png differ diff --git a/data/skins/cartoon-mars/bubble.png b/data/skins/cartoon-mars/bubble.png new file mode 100644 index 00000000000..02e37a7df50 Binary files /dev/null and b/data/skins/cartoon-mars/bubble.png differ diff --git a/data/skins/cartoon-mars/button.png b/data/skins/cartoon-mars/button.png new file mode 100644 index 00000000000..8f54a137b7f Binary files /dev/null and b/data/skins/cartoon-mars/button.png differ diff --git a/data/skins/cartoon-mars/button_focused.png b/data/skins/cartoon-mars/button_focused.png new file mode 100644 index 00000000000..0c6fe57c2be Binary files /dev/null and b/data/skins/cartoon-mars/button_focused.png differ diff --git a/data/skins/cartoon-mars/checkbox.png b/data/skins/cartoon-mars/checkbox.png new file mode 100644 index 00000000000..67e21696a93 Binary files /dev/null and b/data/skins/cartoon-mars/checkbox.png differ diff --git a/data/skins/cartoon-mars/checkbox_checked.png b/data/skins/cartoon-mars/checkbox_checked.png new file mode 100644 index 00000000000..a4a4d36c74f Binary files /dev/null and b/data/skins/cartoon-mars/checkbox_checked.png differ diff --git a/data/skins/cartoon-mars/checkbox_checked_focus.png b/data/skins/cartoon-mars/checkbox_checked_focus.png new file mode 100644 index 00000000000..c4038ad0c63 Binary files /dev/null and b/data/skins/cartoon-mars/checkbox_checked_focus.png differ diff --git a/data/skins/cartoon-mars/checkbox_focus.png b/data/skins/cartoon-mars/checkbox_focus.png new file mode 100644 index 00000000000..868f8a9c6f8 Binary files /dev/null and b/data/skins/cartoon-mars/checkbox_focus.png differ diff --git a/data/skins/cartoon-mars/down_arrow.png b/data/skins/cartoon-mars/down_arrow.png new file mode 100644 index 00000000000..2e4ab56f82e Binary files /dev/null and b/data/skins/cartoon-mars/down_arrow.png differ diff --git a/data/skins/cartoon-mars/friend.png b/data/skins/cartoon-mars/friend.png new file mode 100644 index 00000000000..d4465a35333 Binary files /dev/null and b/data/skins/cartoon-mars/friend.png differ diff --git a/data/skins/cartoon-mars/gauge_fill.png b/data/skins/cartoon-mars/gauge_fill.png new file mode 100644 index 00000000000..4df219160a5 Binary files /dev/null and b/data/skins/cartoon-mars/gauge_fill.png differ diff --git a/data/skins/cartoon-mars/generic.png b/data/skins/cartoon-mars/generic.png new file mode 100644 index 00000000000..2c9a34e9c9a Binary files /dev/null and b/data/skins/cartoon-mars/generic.png differ diff --git a/data/skins/cartoon-mars/glass_iconhighlight_focus.png b/data/skins/cartoon-mars/glass_iconhighlight_focus.png new file mode 100644 index 00000000000..c93f7dde5c7 Binary files /dev/null and b/data/skins/cartoon-mars/glass_iconhighlight_focus.png differ diff --git a/data/skins/cartoon-mars/left_arrow.png b/data/skins/cartoon-mars/left_arrow.png new file mode 100644 index 00000000000..b1e722a6e8e Binary files /dev/null and b/data/skins/cartoon-mars/left_arrow.png differ diff --git a/data/skins/cartoon-mars/left_arrow_focus.png b/data/skins/cartoon-mars/left_arrow_focus.png new file mode 100644 index 00000000000..ccb43643978 Binary files /dev/null and b/data/skins/cartoon-mars/left_arrow_focus.png differ diff --git a/data/skins/cartoon-mars/licenses.txt b/data/skins/cartoon-mars/licenses.txt new file mode 100644 index 00000000000..d0cbfe1df7d --- /dev/null +++ b/data/skins/cartoon-mars/licenses.txt @@ -0,0 +1,30 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SuperTuxKart +Upstream-Contact: + Marianne Gagnon + Jean-Manuel Clémençon +Source: https://supertuxkart.net + +Files: + glass_iconhighlight_focus.png + bubble.png +Copyright: 2010 Dakal and/or Marianne Gagnon (Auria) +License: CC-BY-SA 3.0 +Comment: From peach skin, first found in commit 5cddb8ffb61001407ce97ee5a8c63faa18a08c2c. It is unclear which author made these particular files. + +Files: + src/Inter-UI-Black.ttf +Copyright: Copyright 2018 The Inter UI project authors +License: OFL 1.1 (SIL Open Font License, Version 1.1) +Comment: Specifically using version 2.5 of the font, later versions have a different look + +Files: + src/NotoSans* +Copyright: Copyright 2015-2016 Google Inc. All Rights Reserved. +License: This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the SIL Open Font License for the specific language, permissions and limitations governing your use of this Font Software. +Comment: Bold/Black versions of the language-specific fonts used in the other skins + +Files: * +Copyright: Copyright 2018-2020 LCP and QwertyChouskie +License: CC-BY-SA 4.0 +Comment: Original style, most icons, and some elements by LCP, skin finished by QwertyChouskie diff --git a/data/skins/cartoon-mars/readme.txt b/data/skins/cartoon-mars/readme.txt new file mode 100644 index 00000000000..f39612d027d --- /dev/null +++ b/data/skins/cartoon-mars/readme.txt @@ -0,0 +1,10 @@ +# This color variation was made using the following commands: + +for i in *.png ; do convert "$i" -colorspace gray -fill "#00ff00" -tint 100 "$i" ; done +for i in *focus.png ; do convert "$i" -colorspace gray -fill "#00dd00" -tint 100 "$i" ; done +for i in *focused.png ; do convert "$i" -colorspace gray -fill "#00dd00" -tint 100 "$i" ; done +convert bottom_bar.png -colorspace gray -fill "#006900" -tint 100 bottom_bar.png + +# table_header_down manually re-colored +# gauge_fill and spinner_fill were manually colored to #77ff77 +# achievement and friend were manually re-created from the source SVG with the background color changed. \ No newline at end of file diff --git a/data/skins/cartoon-mars/right_arrow.png b/data/skins/cartoon-mars/right_arrow.png new file mode 100644 index 00000000000..ff0b6fcab60 Binary files /dev/null and b/data/skins/cartoon-mars/right_arrow.png differ diff --git a/data/skins/cartoon-mars/right_arrow_focus.png b/data/skins/cartoon-mars/right_arrow_focus.png new file mode 100644 index 00000000000..808354577a9 Binary files /dev/null and b/data/skins/cartoon-mars/right_arrow_focus.png differ diff --git a/data/skins/cartoon-mars/scrollbar_button.png b/data/skins/cartoon-mars/scrollbar_button.png new file mode 100644 index 00000000000..c8b54f44ed8 Binary files /dev/null and b/data/skins/cartoon-mars/scrollbar_button.png differ diff --git a/data/skins/cartoon-mars/scrollbar_thumb.png b/data/skins/cartoon-mars/scrollbar_thumb.png new file mode 100644 index 00000000000..3e0f0e5dfc7 Binary files /dev/null and b/data/skins/cartoon-mars/scrollbar_thumb.png differ diff --git a/data/skins/cartoon-mars/select.png b/data/skins/cartoon-mars/select.png new file mode 100644 index 00000000000..e665445f50b Binary files /dev/null and b/data/skins/cartoon-mars/select.png differ diff --git a/data/skins/cartoon-mars/spinner.png b/data/skins/cartoon-mars/spinner.png new file mode 100644 index 00000000000..bc106278ae9 Binary files /dev/null and b/data/skins/cartoon-mars/spinner.png differ diff --git a/data/skins/cartoon-mars/spinner_down.png b/data/skins/cartoon-mars/spinner_down.png new file mode 100644 index 00000000000..bc106278ae9 Binary files /dev/null and b/data/skins/cartoon-mars/spinner_down.png differ diff --git a/data/skins/cartoon-mars/spinner_fill.png b/data/skins/cartoon-mars/spinner_fill.png new file mode 100644 index 00000000000..3ae42a7ac69 Binary files /dev/null and b/data/skins/cartoon-mars/spinner_fill.png differ diff --git a/data/skins/cartoon-mars/spinner_focus.png b/data/skins/cartoon-mars/spinner_focus.png new file mode 100644 index 00000000000..9b9de987703 Binary files /dev/null and b/data/skins/cartoon-mars/spinner_focus.png differ diff --git a/data/skins/cartoon-mars/stkskin.xml b/data/skins/cartoon-mars/stkskin.xml new file mode 100644 index 00000000000..b5eaaab8c02 --- /dev/null +++ b/data/skins/cartoon-mars/stkskin.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/skins/cartoon-mars/tab.png b/data/skins/cartoon-mars/tab.png new file mode 100644 index 00000000000..37dcf23bd39 Binary files /dev/null and b/data/skins/cartoon-mars/tab.png differ diff --git a/data/skins/cartoon-mars/tab_focus.png b/data/skins/cartoon-mars/tab_focus.png new file mode 100644 index 00000000000..7348714b246 Binary files /dev/null and b/data/skins/cartoon-mars/tab_focus.png differ diff --git a/data/skins/cartoon-mars/tab_vert.png b/data/skins/cartoon-mars/tab_vert.png new file mode 100644 index 00000000000..329d1963928 Binary files /dev/null and b/data/skins/cartoon-mars/tab_vert.png differ diff --git a/data/skins/cartoon-mars/tab_vert_focus.png b/data/skins/cartoon-mars/tab_vert_focus.png new file mode 100644 index 00000000000..dda1d2246b1 Binary files /dev/null and b/data/skins/cartoon-mars/tab_vert_focus.png differ diff --git a/data/skins/cartoon-mars/table_header_down.png b/data/skins/cartoon-mars/table_header_down.png new file mode 100644 index 00000000000..9037fe3fcda Binary files /dev/null and b/data/skins/cartoon-mars/table_header_down.png differ diff --git a/data/skins/cartoon-mars/up_arrow.png b/data/skins/cartoon-mars/up_arrow.png new file mode 100644 index 00000000000..fe7adb63abb Binary files /dev/null and b/data/skins/cartoon-mars/up_arrow.png differ diff --git a/data/skins/cartoon-tropical/achievement.png b/data/skins/cartoon-tropical/achievement.png new file mode 100644 index 00000000000..fa9cd750e28 Binary files /dev/null and b/data/skins/cartoon-tropical/achievement.png differ diff --git a/data/skins/cartoon-tropical/background.jpg b/data/skins/cartoon-tropical/background.jpg new file mode 100644 index 00000000000..12c3edcd8d6 Binary files /dev/null and b/data/skins/cartoon-tropical/background.jpg differ diff --git a/data/skins/cartoon-tropical/bottom_bar.png b/data/skins/cartoon-tropical/bottom_bar.png new file mode 100644 index 00000000000..898ac9379ae Binary files /dev/null and b/data/skins/cartoon-tropical/bottom_bar.png differ diff --git a/data/skins/cartoon-tropical/bubble.png b/data/skins/cartoon-tropical/bubble.png new file mode 100644 index 00000000000..0ba09f2e3f0 Binary files /dev/null and b/data/skins/cartoon-tropical/bubble.png differ diff --git a/data/skins/cartoon-tropical/button.png b/data/skins/cartoon-tropical/button.png new file mode 100644 index 00000000000..60f3f884618 Binary files /dev/null and b/data/skins/cartoon-tropical/button.png differ diff --git a/data/skins/cartoon-tropical/button_focused.png b/data/skins/cartoon-tropical/button_focused.png new file mode 100644 index 00000000000..91da7f4a02b Binary files /dev/null and b/data/skins/cartoon-tropical/button_focused.png differ diff --git a/data/skins/cartoon-tropical/checkbox.png b/data/skins/cartoon-tropical/checkbox.png new file mode 100644 index 00000000000..92db7addec9 Binary files /dev/null and b/data/skins/cartoon-tropical/checkbox.png differ diff --git a/data/skins/cartoon-tropical/checkbox_checked.png b/data/skins/cartoon-tropical/checkbox_checked.png new file mode 100644 index 00000000000..08c0838d4b4 Binary files /dev/null and b/data/skins/cartoon-tropical/checkbox_checked.png differ diff --git a/data/skins/cartoon-tropical/checkbox_checked_focus.png b/data/skins/cartoon-tropical/checkbox_checked_focus.png new file mode 100644 index 00000000000..dcd4292ede0 Binary files /dev/null and b/data/skins/cartoon-tropical/checkbox_checked_focus.png differ diff --git a/data/skins/cartoon-tropical/checkbox_focus.png b/data/skins/cartoon-tropical/checkbox_focus.png new file mode 100644 index 00000000000..6fbc73ec6f7 Binary files /dev/null and b/data/skins/cartoon-tropical/checkbox_focus.png differ diff --git a/data/skins/cartoon-tropical/down_arrow.png b/data/skins/cartoon-tropical/down_arrow.png new file mode 100644 index 00000000000..966fc356afb Binary files /dev/null and b/data/skins/cartoon-tropical/down_arrow.png differ diff --git a/data/skins/cartoon-tropical/friend.png b/data/skins/cartoon-tropical/friend.png new file mode 100644 index 00000000000..53384215530 Binary files /dev/null and b/data/skins/cartoon-tropical/friend.png differ diff --git a/data/skins/cartoon-tropical/gauge_fill.png b/data/skins/cartoon-tropical/gauge_fill.png new file mode 100644 index 00000000000..5edc6e55dc3 Binary files /dev/null and b/data/skins/cartoon-tropical/gauge_fill.png differ diff --git a/data/skins/cartoon-tropical/generic.png b/data/skins/cartoon-tropical/generic.png new file mode 100644 index 00000000000..1f91f5c4d5b Binary files /dev/null and b/data/skins/cartoon-tropical/generic.png differ diff --git a/data/skins/cartoon-tropical/glass_iconhighlight_focus.png b/data/skins/cartoon-tropical/glass_iconhighlight_focus.png new file mode 100644 index 00000000000..68743993bb1 Binary files /dev/null and b/data/skins/cartoon-tropical/glass_iconhighlight_focus.png differ diff --git a/data/skins/cartoon-tropical/left_arrow.png b/data/skins/cartoon-tropical/left_arrow.png new file mode 100644 index 00000000000..ebd2145c768 Binary files /dev/null and b/data/skins/cartoon-tropical/left_arrow.png differ diff --git a/data/skins/cartoon-tropical/left_arrow_focus.png b/data/skins/cartoon-tropical/left_arrow_focus.png new file mode 100644 index 00000000000..c0474776cbc Binary files /dev/null and b/data/skins/cartoon-tropical/left_arrow_focus.png differ diff --git a/data/skins/cartoon-tropical/licenses.txt b/data/skins/cartoon-tropical/licenses.txt new file mode 100644 index 00000000000..d0cbfe1df7d --- /dev/null +++ b/data/skins/cartoon-tropical/licenses.txt @@ -0,0 +1,30 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SuperTuxKart +Upstream-Contact: + Marianne Gagnon + Jean-Manuel Clémençon +Source: https://supertuxkart.net + +Files: + glass_iconhighlight_focus.png + bubble.png +Copyright: 2010 Dakal and/or Marianne Gagnon (Auria) +License: CC-BY-SA 3.0 +Comment: From peach skin, first found in commit 5cddb8ffb61001407ce97ee5a8c63faa18a08c2c. It is unclear which author made these particular files. + +Files: + src/Inter-UI-Black.ttf +Copyright: Copyright 2018 The Inter UI project authors +License: OFL 1.1 (SIL Open Font License, Version 1.1) +Comment: Specifically using version 2.5 of the font, later versions have a different look + +Files: + src/NotoSans* +Copyright: Copyright 2015-2016 Google Inc. All Rights Reserved. +License: This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the SIL Open Font License for the specific language, permissions and limitations governing your use of this Font Software. +Comment: Bold/Black versions of the language-specific fonts used in the other skins + +Files: * +Copyright: Copyright 2018-2020 LCP and QwertyChouskie +License: CC-BY-SA 4.0 +Comment: Original style, most icons, and some elements by LCP, skin finished by QwertyChouskie diff --git a/data/skins/cartoon-tropical/readme.txt b/data/skins/cartoon-tropical/readme.txt new file mode 100644 index 00000000000..f39612d027d --- /dev/null +++ b/data/skins/cartoon-tropical/readme.txt @@ -0,0 +1,10 @@ +# This color variation was made using the following commands: + +for i in *.png ; do convert "$i" -colorspace gray -fill "#00ff00" -tint 100 "$i" ; done +for i in *focus.png ; do convert "$i" -colorspace gray -fill "#00dd00" -tint 100 "$i" ; done +for i in *focused.png ; do convert "$i" -colorspace gray -fill "#00dd00" -tint 100 "$i" ; done +convert bottom_bar.png -colorspace gray -fill "#006900" -tint 100 bottom_bar.png + +# table_header_down manually re-colored +# gauge_fill and spinner_fill were manually colored to #77ff77 +# achievement and friend were manually re-created from the source SVG with the background color changed. \ No newline at end of file diff --git a/data/skins/cartoon-tropical/right_arrow.png b/data/skins/cartoon-tropical/right_arrow.png new file mode 100644 index 00000000000..183ae063ebb Binary files /dev/null and b/data/skins/cartoon-tropical/right_arrow.png differ diff --git a/data/skins/cartoon-tropical/right_arrow_focus.png b/data/skins/cartoon-tropical/right_arrow_focus.png new file mode 100644 index 00000000000..e85f4023093 Binary files /dev/null and b/data/skins/cartoon-tropical/right_arrow_focus.png differ diff --git a/data/skins/cartoon-tropical/scrollbar_button.png b/data/skins/cartoon-tropical/scrollbar_button.png new file mode 100644 index 00000000000..9d263bf841a Binary files /dev/null and b/data/skins/cartoon-tropical/scrollbar_button.png differ diff --git a/data/skins/cartoon-tropical/scrollbar_thumb.png b/data/skins/cartoon-tropical/scrollbar_thumb.png new file mode 100644 index 00000000000..095b4aa1344 Binary files /dev/null and b/data/skins/cartoon-tropical/scrollbar_thumb.png differ diff --git a/data/skins/cartoon-tropical/select.png b/data/skins/cartoon-tropical/select.png new file mode 100644 index 00000000000..c8dc270e291 Binary files /dev/null and b/data/skins/cartoon-tropical/select.png differ diff --git a/data/skins/cartoon-tropical/spinner.png b/data/skins/cartoon-tropical/spinner.png new file mode 100644 index 00000000000..165b2901b25 Binary files /dev/null and b/data/skins/cartoon-tropical/spinner.png differ diff --git a/data/skins/cartoon-tropical/spinner_down.png b/data/skins/cartoon-tropical/spinner_down.png new file mode 100644 index 00000000000..165b2901b25 Binary files /dev/null and b/data/skins/cartoon-tropical/spinner_down.png differ diff --git a/data/skins/cartoon-tropical/spinner_fill.png b/data/skins/cartoon-tropical/spinner_fill.png new file mode 100644 index 00000000000..ae5984daa89 Binary files /dev/null and b/data/skins/cartoon-tropical/spinner_fill.png differ diff --git a/data/skins/cartoon-tropical/spinner_focus.png b/data/skins/cartoon-tropical/spinner_focus.png new file mode 100644 index 00000000000..f10df838365 Binary files /dev/null and b/data/skins/cartoon-tropical/spinner_focus.png differ diff --git a/data/skins/cartoon-tropical/stkskin.xml b/data/skins/cartoon-tropical/stkskin.xml new file mode 100644 index 00000000000..8ae817d89bd --- /dev/null +++ b/data/skins/cartoon-tropical/stkskin.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/skins/cartoon-tropical/tab.png b/data/skins/cartoon-tropical/tab.png new file mode 100644 index 00000000000..deec44d1fb3 Binary files /dev/null and b/data/skins/cartoon-tropical/tab.png differ diff --git a/data/skins/cartoon-tropical/tab_focus.png b/data/skins/cartoon-tropical/tab_focus.png new file mode 100644 index 00000000000..238b74dc8dc Binary files /dev/null and b/data/skins/cartoon-tropical/tab_focus.png differ diff --git a/data/skins/cartoon-tropical/tab_vert.png b/data/skins/cartoon-tropical/tab_vert.png new file mode 100644 index 00000000000..982e0d7f9ca Binary files /dev/null and b/data/skins/cartoon-tropical/tab_vert.png differ diff --git a/data/skins/cartoon-tropical/tab_vert_focus.png b/data/skins/cartoon-tropical/tab_vert_focus.png new file mode 100644 index 00000000000..414da0e0850 Binary files /dev/null and b/data/skins/cartoon-tropical/tab_vert_focus.png differ diff --git a/data/skins/cartoon-tropical/table_header_down.png b/data/skins/cartoon-tropical/table_header_down.png new file mode 100644 index 00000000000..31b7cff2281 Binary files /dev/null and b/data/skins/cartoon-tropical/table_header_down.png differ diff --git a/data/skins/cartoon-tropical/up_arrow.png b/data/skins/cartoon-tropical/up_arrow.png new file mode 100644 index 00000000000..953e62ccf95 Binary files /dev/null and b/data/skins/cartoon-tropical/up_arrow.png differ diff --git a/data/skins/classic-mars/achievement.png b/data/skins/classic-mars/achievement.png new file mode 100644 index 00000000000..26625764544 Binary files /dev/null and b/data/skins/classic-mars/achievement.png differ diff --git a/data/skins/classic-mars/bubble.png b/data/skins/classic-mars/bubble.png new file mode 100644 index 00000000000..b3723bc9ee9 Binary files /dev/null and b/data/skins/classic-mars/bubble.png differ diff --git a/data/skins/classic-mars/error.png b/data/skins/classic-mars/error.png new file mode 100644 index 00000000000..4141f4f8c8f Binary files /dev/null and b/data/skins/classic-mars/error.png differ diff --git a/data/skins/classic-mars/friend.png b/data/skins/classic-mars/friend.png new file mode 100644 index 00000000000..37b0de3e0f1 Binary files /dev/null and b/data/skins/classic-mars/friend.png differ diff --git a/data/skins/classic-mars/generic.png b/data/skins/classic-mars/generic.png new file mode 100644 index 00000000000..77839e7a1d1 Binary files /dev/null and b/data/skins/classic-mars/generic.png differ diff --git a/data/skins/classic-mars/glass_iconhighlight_focus.png b/data/skins/classic-mars/glass_iconhighlight_focus.png new file mode 100644 index 00000000000..f7e38030fa9 Binary files /dev/null and b/data/skins/classic-mars/glass_iconhighlight_focus.png differ diff --git a/data/skins/classic-mars/glassbutton.png b/data/skins/classic-mars/glassbutton.png new file mode 100644 index 00000000000..6da434694c5 Binary files /dev/null and b/data/skins/classic-mars/glassbutton.png differ diff --git a/data/skins/classic-mars/glassbutton_focused.png b/data/skins/classic-mars/glassbutton_focused.png new file mode 100644 index 00000000000..e64dd0ffa63 Binary files /dev/null and b/data/skins/classic-mars/glassbutton_focused.png differ diff --git a/data/skins/classic-mars/glasscheckbox.png b/data/skins/classic-mars/glasscheckbox.png new file mode 100644 index 00000000000..910ff121ac2 Binary files /dev/null and b/data/skins/classic-mars/glasscheckbox.png differ diff --git a/data/skins/classic-mars/glasscheckbox_checked.png b/data/skins/classic-mars/glasscheckbox_checked.png new file mode 100644 index 00000000000..b6c138db3e0 Binary files /dev/null and b/data/skins/classic-mars/glasscheckbox_checked.png differ diff --git a/data/skins/classic-mars/glasscheckbox_checked_focus.png b/data/skins/classic-mars/glasscheckbox_checked_focus.png new file mode 100644 index 00000000000..e1f8e3265e7 Binary files /dev/null and b/data/skins/classic-mars/glasscheckbox_checked_focus.png differ diff --git a/data/skins/classic-mars/glasscheckbox_focus.png b/data/skins/classic-mars/glasscheckbox_focus.png new file mode 100644 index 00000000000..3bd70f097ad Binary files /dev/null and b/data/skins/classic-mars/glasscheckbox_focus.png differ diff --git a/data/skins/classic-mars/glasssgauge_fill.png b/data/skins/classic-mars/glasssgauge_fill.png new file mode 100644 index 00000000000..3f1cee18d2d Binary files /dev/null and b/data/skins/classic-mars/glasssgauge_fill.png differ diff --git a/data/skins/classic-mars/glassspinner_down.png b/data/skins/classic-mars/glassspinner_down.png new file mode 100644 index 00000000000..94e754d1899 Binary files /dev/null and b/data/skins/classic-mars/glassspinner_down.png differ diff --git a/data/skins/classic-mars/glassspinner_halo.png b/data/skins/classic-mars/glassspinner_halo.png new file mode 100644 index 00000000000..2601177a1d5 Binary files /dev/null and b/data/skins/classic-mars/glassspinner_halo.png differ diff --git a/data/skins/classic-mars/glasstab.png b/data/skins/classic-mars/glasstab.png new file mode 100644 index 00000000000..77e3c9a3b37 Binary files /dev/null and b/data/skins/classic-mars/glasstab.png differ diff --git a/data/skins/classic-mars/glasstab_down.png b/data/skins/classic-mars/glasstab_down.png new file mode 100644 index 00000000000..cff0875f473 Binary files /dev/null and b/data/skins/classic-mars/glasstab_down.png differ diff --git a/data/skins/classic-mars/glasstab_focus.png b/data/skins/classic-mars/glasstab_focus.png new file mode 100644 index 00000000000..dd7176f53df Binary files /dev/null and b/data/skins/classic-mars/glasstab_focus.png differ diff --git a/data/skins/classic-mars/glasstab_vert.png b/data/skins/classic-mars/glasstab_vert.png new file mode 100644 index 00000000000..7bf00afaef2 Binary files /dev/null and b/data/skins/classic-mars/glasstab_vert.png differ diff --git a/data/skins/classic-mars/glasstab_vert_down.png b/data/skins/classic-mars/glasstab_vert_down.png new file mode 100644 index 00000000000..6e7a57cdecf Binary files /dev/null and b/data/skins/classic-mars/glasstab_vert_down.png differ diff --git a/data/skins/classic-mars/glasstab_vert_focus.png b/data/skins/classic-mars/glasstab_vert_focus.png new file mode 100644 index 00000000000..f0477268fa6 Binary files /dev/null and b/data/skins/classic-mars/glasstab_vert_focus.png differ diff --git a/data/skins/classic-mars/left_arrow_focus.png b/data/skins/classic-mars/left_arrow_focus.png new file mode 100644 index 00000000000..bbd13ee7095 Binary files /dev/null and b/data/skins/classic-mars/left_arrow_focus.png differ diff --git a/data/skins/classic-mars/right_arrow_focus.png b/data/skins/classic-mars/right_arrow_focus.png new file mode 100644 index 00000000000..7cfc12e5d3a Binary files /dev/null and b/data/skins/classic-mars/right_arrow_focus.png differ diff --git a/data/skins/classic-mars/scrollbar_btn_down.png b/data/skins/classic-mars/scrollbar_btn_down.png new file mode 100644 index 00000000000..1adb87bf890 Binary files /dev/null and b/data/skins/classic-mars/scrollbar_btn_down.png differ diff --git a/data/skins/classic-mars/scrollbar_thumb.png b/data/skins/classic-mars/scrollbar_thumb.png new file mode 100644 index 00000000000..a98a587945d Binary files /dev/null and b/data/skins/classic-mars/scrollbar_thumb.png differ diff --git a/data/skins/classic-mars/select.png b/data/skins/classic-mars/select.png new file mode 100644 index 00000000000..1ed3f83f95d Binary files /dev/null and b/data/skins/classic-mars/select.png differ diff --git a/data/skins/classic-mars/table_header_down.png b/data/skins/classic-mars/table_header_down.png new file mode 100644 index 00000000000..1ed3f83f95d Binary files /dev/null and b/data/skins/classic-mars/table_header_down.png differ diff --git a/data/skins/classic-mars/textbubble.png b/data/skins/classic-mars/textbubble.png new file mode 100644 index 00000000000..c08dc174d57 Binary files /dev/null and b/data/skins/classic-mars/textbubble.png differ diff --git a/data/skins/classic-mars/textbubble2.png b/data/skins/classic-mars/textbubble2.png new file mode 100644 index 00000000000..3bd70f097ad Binary files /dev/null and b/data/skins/classic-mars/textbubble2.png differ diff --git a/data/skins/classic-tropical/achievement.png b/data/skins/classic-tropical/achievement.png new file mode 100644 index 00000000000..765187b49e5 Binary files /dev/null and b/data/skins/classic-tropical/achievement.png differ diff --git a/data/skins/classic-tropical/bubble.png b/data/skins/classic-tropical/bubble.png new file mode 100644 index 00000000000..169debc8105 Binary files /dev/null and b/data/skins/classic-tropical/bubble.png differ diff --git a/data/skins/classic-tropical/friend.png b/data/skins/classic-tropical/friend.png new file mode 100644 index 00000000000..4f7d9076c28 Binary files /dev/null and b/data/skins/classic-tropical/friend.png differ diff --git a/data/skins/classic-tropical/generic.png b/data/skins/classic-tropical/generic.png new file mode 100644 index 00000000000..7cc9b975413 Binary files /dev/null and b/data/skins/classic-tropical/generic.png differ diff --git a/data/skins/classic-tropical/glass_iconhighlight_focus.png b/data/skins/classic-tropical/glass_iconhighlight_focus.png new file mode 100644 index 00000000000..ce5216a08aa Binary files /dev/null and b/data/skins/classic-tropical/glass_iconhighlight_focus.png differ diff --git a/data/skins/classic-tropical/glassbutton.png b/data/skins/classic-tropical/glassbutton.png new file mode 100644 index 00000000000..3485f8deed9 Binary files /dev/null and b/data/skins/classic-tropical/glassbutton.png differ diff --git a/data/skins/classic-tropical/glassbutton_focused.png b/data/skins/classic-tropical/glassbutton_focused.png new file mode 100644 index 00000000000..ffb572f6e7c Binary files /dev/null and b/data/skins/classic-tropical/glassbutton_focused.png differ diff --git a/data/skins/classic-tropical/glasscheckbox.png b/data/skins/classic-tropical/glasscheckbox.png new file mode 100644 index 00000000000..47542883001 Binary files /dev/null and b/data/skins/classic-tropical/glasscheckbox.png differ diff --git a/data/skins/classic-tropical/glasscheckbox_checked.png b/data/skins/classic-tropical/glasscheckbox_checked.png new file mode 100644 index 00000000000..47621a47f4d Binary files /dev/null and b/data/skins/classic-tropical/glasscheckbox_checked.png differ diff --git a/data/skins/classic-tropical/glasscheckbox_checked_focus.png b/data/skins/classic-tropical/glasscheckbox_checked_focus.png new file mode 100644 index 00000000000..372eead3a83 Binary files /dev/null and b/data/skins/classic-tropical/glasscheckbox_checked_focus.png differ diff --git a/data/skins/classic-tropical/glasscheckbox_focus.png b/data/skins/classic-tropical/glasscheckbox_focus.png new file mode 100644 index 00000000000..f27f1d24081 Binary files /dev/null and b/data/skins/classic-tropical/glasscheckbox_focus.png differ diff --git a/data/skins/classic-tropical/glasssgauge_fill.png b/data/skins/classic-tropical/glasssgauge_fill.png new file mode 100644 index 00000000000..9b770bd5d65 Binary files /dev/null and b/data/skins/classic-tropical/glasssgauge_fill.png differ diff --git a/data/skins/classic-tropical/glassspinner_down.png b/data/skins/classic-tropical/glassspinner_down.png new file mode 100644 index 00000000000..ba197e49580 Binary files /dev/null and b/data/skins/classic-tropical/glassspinner_down.png differ diff --git a/data/skins/classic-tropical/glassspinner_focus.png b/data/skins/classic-tropical/glassspinner_focus.png new file mode 100644 index 00000000000..3651b063f59 Binary files /dev/null and b/data/skins/classic-tropical/glassspinner_focus.png differ diff --git a/data/skins/classic-tropical/glassspinner_halo.png b/data/skins/classic-tropical/glassspinner_halo.png new file mode 100644 index 00000000000..3651b063f59 Binary files /dev/null and b/data/skins/classic-tropical/glassspinner_halo.png differ diff --git a/data/skins/classic-tropical/glasstab.png b/data/skins/classic-tropical/glasstab.png new file mode 100644 index 00000000000..77ef791ad04 Binary files /dev/null and b/data/skins/classic-tropical/glasstab.png differ diff --git a/data/skins/classic-tropical/glasstab_down.png b/data/skins/classic-tropical/glasstab_down.png new file mode 100644 index 00000000000..04b54b4050d Binary files /dev/null and b/data/skins/classic-tropical/glasstab_down.png differ diff --git a/data/skins/classic-tropical/glasstab_focus.png b/data/skins/classic-tropical/glasstab_focus.png new file mode 100644 index 00000000000..e9042edfcf5 Binary files /dev/null and b/data/skins/classic-tropical/glasstab_focus.png differ diff --git a/data/skins/classic-tropical/glasstab_vert.png b/data/skins/classic-tropical/glasstab_vert.png new file mode 100644 index 00000000000..bf546242866 Binary files /dev/null and b/data/skins/classic-tropical/glasstab_vert.png differ diff --git a/data/skins/classic-tropical/glasstab_vert_down.png b/data/skins/classic-tropical/glasstab_vert_down.png new file mode 100644 index 00000000000..46575dcbd21 Binary files /dev/null and b/data/skins/classic-tropical/glasstab_vert_down.png differ diff --git a/data/skins/classic-tropical/glasstab_vert_focus.png b/data/skins/classic-tropical/glasstab_vert_focus.png new file mode 100644 index 00000000000..35cb557e68c Binary files /dev/null and b/data/skins/classic-tropical/glasstab_vert_focus.png differ diff --git a/data/skins/classic-tropical/left_arrow_focus.png b/data/skins/classic-tropical/left_arrow_focus.png new file mode 100644 index 00000000000..6ba428871dd Binary files /dev/null and b/data/skins/classic-tropical/left_arrow_focus.png differ diff --git a/data/skins/classic-tropical/right_arrow_focus.png b/data/skins/classic-tropical/right_arrow_focus.png new file mode 100644 index 00000000000..b118173523e Binary files /dev/null and b/data/skins/classic-tropical/right_arrow_focus.png differ diff --git a/data/skins/classic-tropical/scrollbar_btn_down.png b/data/skins/classic-tropical/scrollbar_btn_down.png new file mode 100644 index 00000000000..c01bd2e8eb2 Binary files /dev/null and b/data/skins/classic-tropical/scrollbar_btn_down.png differ diff --git a/data/skins/classic-tropical/scrollbar_thumb.png b/data/skins/classic-tropical/scrollbar_thumb.png new file mode 100644 index 00000000000..cc8eb5a8839 Binary files /dev/null and b/data/skins/classic-tropical/scrollbar_thumb.png differ diff --git a/data/skins/classic-tropical/select.png b/data/skins/classic-tropical/select.png new file mode 100644 index 00000000000..a8cd577ebc4 Binary files /dev/null and b/data/skins/classic-tropical/select.png differ diff --git a/data/skins/classic-tropical/table_header_down.png b/data/skins/classic-tropical/table_header_down.png new file mode 100644 index 00000000000..a8cd577ebc4 Binary files /dev/null and b/data/skins/classic-tropical/table_header_down.png differ diff --git a/data/skins/classic-tropical/textbubble.png b/data/skins/classic-tropical/textbubble.png new file mode 100644 index 00000000000..9f657d30242 Binary files /dev/null and b/data/skins/classic-tropical/textbubble.png differ diff --git a/data/skins/classic-tropical/textbubble2.png b/data/skins/classic-tropical/textbubble2.png new file mode 100644 index 00000000000..f27f1d24081 Binary files /dev/null and b/data/skins/classic-tropical/textbubble2.png differ diff --git a/src/network/stk_host.cpp b/src/network/stk_host.cpp index 9cfec4adc3e..547b7a4b5a3 100644 --- a/src/network/stk_host.cpp +++ b/src/network/stk_host.cpp @@ -71,7 +71,7 @@ #include #include -STKHost *STKHost::m_stk_host[PT_COUNT]; +STKHost* STKHost::m_stk_host[PT_COUNT]; bool STKHost::m_enable_console = false; std::shared_ptr STKHost::create(ChildLoop* cl) @@ -108,12 +108,12 @@ std::shared_ptr STKHost::create(ChildLoop* cl) // ============================================================================ /** \class STKHost - * \brief Represents the local host. It is the main managing point for + * \brief Represents the local host. It is the main managing point for * networking. It is responsible for sending and receiving messages, * and keeping track of connected peers. It also provides some low * level socket functions (i.e. to avoid that enet adds its headers * to messages, useful for broadcast in LAN and for stun). It can be - * either instantiated as server, or as client. + * either instantiated as server, or as client. * Additionally this object stores information from the various protocols, * which can be queried by the GUI. The online game works * closely together with the stk server: a (game) server first connects @@ -121,7 +121,7 @@ std::shared_ptr STKHost::create(ChildLoop* cl) * from the stk server. They insert a connections request into the stk * server, which is regularly polled by the client. On detecting a new * connection request the server will try to send a message to the client. - * This allows connections between server and client even if they are + * This allows connections between server and client even if they are * sitting behind a NAT firewall. The following tables on * the stk server are used: * client_sessions: It stores the list of all online users (so loging in @@ -226,7 +226,7 @@ std::shared_ptr STKHost::create(ChildLoop* cl) * In LR::loadWorld all ActivePlayers for all non-local players are created. * (on a server all karts are non-local). On a client, the ActivePlayer * objects for each local players have been created (to store the device - * used by each player when joining), so they are used to create the + * used by each player when joining), so they are used to create the * LocalPlayerController for each kart. Each remote player gets a * NULL ActivePlayer (the ActivePlayer is only used for assigning the input * device to each kart, achievements and highscores, so it's not needed for @@ -242,8 +242,8 @@ std::shared_ptr STKHost::create(ChildLoop* cl) * progress in percent * 4. If game is currently started, the track internal identity */ -// ============================================================================ -constexpr std::array g_ping_packet {{ 255, 'p', 'i', 'n', 'g' }}; + // ============================================================================ +constexpr std::array g_ping_packet{ { 255, 'p', 'i', 'n', 'g' } }; // ============================================================================ constexpr bool isPingPacket(unsigned char* data, size_t length) @@ -300,7 +300,7 @@ STKHost::STKHost(bool server) if (!m_network) { Log::fatal("STKHost", "An error occurred while trying to create an " - "ENet server host."); + "ENet server host."); } if (server) Log::info("STKHost", "Server port is %d", getPrivatePort()); @@ -316,9 +316,9 @@ void STKHost::init() m_players_waiting.store(0); m_total_players.store(0); m_network_timer.store((int64_t)StkTime::getMonoTimeMs()); - m_shutdown = false; - m_authorised = false; - m_network = NULL; + m_shutdown = false; + m_authorised = false; + m_network = NULL; m_exit_timeout.store(std::numeric_limits::max()); m_client_ping.store(0); @@ -423,7 +423,7 @@ BareNetworkString STKHost::getStunRequest(uint8_t* stun_tansaction_id) //----------------------------------------------------------------------------- void STKHost::getIPFromStun(int socket, const std::string& stun_address, - short family, SocketAddress* result) + short family, SocketAddress* result) { // The IPv4 stun address has no AAAA record, so give it an AF_INET6 will // return one using NAT64 and DNS64 @@ -660,8 +660,8 @@ void STKHost::setPublicAddress(short family) // Randomly use stun servers of the low ping from top-half of the list std::sort(untried_server.begin(), untried_server.end(), - [] (const std::pair& a, - const std::pair& b)->bool + [](const std::pair& a, + const std::pair& b)->bool { return a.second > b.second; }); @@ -751,7 +751,7 @@ void STKHost::disconnectAllPeers(bool timeout_waiting) //----------------------------------------------------------------------------- /** Sets an error message for the gui. */ -void STKHost::setErrorMessage(const irr::core::stringw &message) +void STKHost::setErrorMessage(const irr::core::stringw& message) { if (!message.empty()) { @@ -895,7 +895,7 @@ void STKHost::mainLoop(ProcessType pt) if (!p.second->getPlayerProfiles().empty()) { player_name = StringUtils::wideToUtf8 - (p.second->getPlayerProfiles()[0]->getName()); + (p.second->getPlayerProfiles()[0]->getName()); } const bool peer_not_in_game = sl->getCurrentState() <= ServerLobby::SELECTING @@ -955,7 +955,7 @@ void STKHost::mainLoop(ProcessType pt) { if (!ping_packet.getBuffer().empty() && (!sl->allowJoinedPlayersWaiting() || - !sl->isRacing() || it->second->isWaitingForGame())) + !sl->isRacing() || it->second->isWaitingForGame())) { ENetPacket* packet = enet_packet_create(ping_packet.getData(), ping_packet.getTotalSize(), ENET_PACKET_FLAG_RELIABLE); @@ -1010,7 +1010,7 @@ void STKHost::mainLoop(ProcessType pt) if (peer->state != ENET_PEER_STATE_CONNECTED || #if defined(ENABLE_IPV6) || defined(__SWITCH__) (enet_ip_not_equal(ea_peer_now.host, ea.host) && - ea_peer_now.port != ea.port)) + ea_peer_now.port != ea.port)) #else (ea_peer_now.host != ea.host && ea_peer_now.port != ea.port)) #endif @@ -1202,12 +1202,12 @@ void STKHost::mainLoop(ProcessType pt) Network::logPacket(stk_event->data(), true); #ifdef DEBUG_MESSAGE_CONTENT Log::verbose("NetworkManager", - "Message, Sender : %s time %f message:", - stk_event->getPeer()->getAddress() - .toString(/*show port*/false).c_str(), - StkTime::getRealTime()); + "Message, Sender : %s time %f message:", + stk_event->getPeer()->getAddress() + .toString(/*show port*/false).c_str(), + StkTime::getRealTime()); Log::verbose("NetworkManager", "%s", - stk_event->data().getLogMessage().c_str()); + stk_event->data().getLogMessage().c_str()); #endif } // if message event @@ -1224,7 +1224,7 @@ void STKHost::mainLoop(ProcessType pt) } // mainLoop // ---------------------------------------------------------------------------- -/** Handles a direct request given to a socket. This is typically a LAN +/** Handles a direct request given to a socket. This is typically a LAN * request, but can also be used if the server is public (i.e. not behind * a fire wall) to allow direct connection to the server (without using the * STK server). It checks for any messages (i.e. a LAN broadcast requesting @@ -1233,15 +1233,15 @@ void STKHost::mainLoop(ProcessType pt) * (and sender IP address and port). */ void STKHost::handleDirectSocketRequest(Network* direct_socket, - std::shared_ptr sl, - std::map& ctp) + std::shared_ptr sl, + std::map& ctp) { - const int LEN=2048; + const int LEN = 2048; char buffer[LEN]; SocketAddress sender; int len = direct_socket->receiveRawPacket(buffer, LEN, &sender, 1); - if(len<=0) return; + if (len <= 0) return; BareNetworkString message(buffer, len); std::string command; message.decodeString(&command); @@ -1255,7 +1255,7 @@ void STKHost::handleDirectSocketRequest(Network* direct_socket, // Send the answer, consisting of server name, max players, // current players const std::string& pw = ServerConfig::m_private_server_password; - BareNetworkString s((int)name.size()+1+11); + BareNetworkString s((int)name.size() + 1 + 11); s.addUInt32(ServerConfig::m_server_version); s.encodeString(name); s.addUInt8((uint8_t)ServerConfig::m_server_max_players); @@ -1266,7 +1266,7 @@ void STKHost::handleDirectSocketRequest(Network* direct_socket, s.addUInt8(!pw.empty()); s.addUInt8((uint8_t) (sl->getCurrentState() == ServerLobby::WAITING_FOR_START_GAME ? - 0 : 1)); + 0 : 1)); s.encodeString(sl->getPlayingTrackIdent()); direct_socket->sendRawPacket(s, sender); } // if message is server-requested @@ -1297,7 +1297,7 @@ void STKHost::handleDirectSocketRequest(Network* direct_socket, } else Log::info("STKHost", "Received unknown command '%s'", - std::string(buffer, len).c_str()); + std::string(buffer, len).c_str()); } // handleDirectSocketRequest @@ -1313,8 +1313,8 @@ bool STKHost::peerExists(const SocketAddress& peer) auto stk_peer = p.second; if (stk_peer->getAddress() == peer || ((stk_peer->getAddress().isPublicAddressLocalhost() && - peer.isPublicAddressLocalhost()) && - stk_peer->getAddress().getPort() == peer.getPort())) + peer.isPublicAddressLocalhost()) && + stk_peer->getAddress().getPort() == peer.getPort())) return true; } return false; @@ -1337,7 +1337,7 @@ std::shared_ptr STKHost::getServerPeerForClient() const * \param data Data to sent. * \param reliable If the data should be sent reliable or now. */ -void STKHost::sendPacketToAllPeersInServer(NetworkString *data, bool reliable) +void STKHost::sendPacketToAllPeersInServer(NetworkString* data, bool reliable) { std::lock_guard lock(m_peers_mutex); for (auto p : m_peers) @@ -1352,7 +1352,7 @@ void STKHost::sendPacketToAllPeersInServer(NetworkString *data, bool reliable) * \param data Data to sent. * \param reliable If the data should be sent reliable or now. */ -void STKHost::sendPacketToAllPeers(NetworkString *data, bool reliable) +void STKHost::sendPacketToAllPeers(NetworkString* data, bool reliable) { std::lock_guard lock(m_peers_mutex); for (auto p : m_peers) @@ -1368,8 +1368,8 @@ void STKHost::sendPacketToAllPeers(NetworkString *data, bool reliable) * \param data Data to sent. * \param reliable If the data should be sent reliable or now. */ -void STKHost::sendPacketExcept(STKPeer* peer, NetworkString *data, - bool reliable) +void STKHost::sendPacketExcept(STKPeer* peer, NetworkString* data, + bool reliable) { std::lock_guard lock(m_peers_mutex); for (auto p : m_peers) @@ -1390,7 +1390,7 @@ void STKHost::sendPacketExcept(STKPeer* peer, NetworkString *data, * \param reliable If the data should be sent reliable or now. */ void STKHost::sendPacketToAllPeersWith(std::function predicate, - NetworkString* data, bool reliable) + NetworkString* data, bool reliable) { std::lock_guard lock(m_peers_mutex); for (auto p : m_peers) @@ -1405,7 +1405,7 @@ void STKHost::sendPacketToAllPeersWith(std::function predicate, //----------------------------------------------------------------------------- /** Sends a message from a client to the server. */ -void STKHost::sendToServer(NetworkString *data, bool reliable) +void STKHost::sendToServer(NetworkString* data, bool reliable) { std::lock_guard lock(m_peers_mutex); if (m_peers.empty()) @@ -1416,7 +1416,7 @@ void STKHost::sendToServer(NetworkString *data, bool reliable) //----------------------------------------------------------------------------- std::vector > - STKHost::getAllPlayerProfiles() const +STKHost::getAllPlayerProfiles() const { std::vector > p; std::unique_lock lock(m_peers_mutex); @@ -1466,7 +1466,7 @@ std::shared_ptr STKHost::findPeerByHostId(uint32_t id) const //----------------------------------------------------------------------------- std::shared_ptr - STKHost::findPeerByName(const core::stringw& name) const +STKHost::findPeerByName(const core::stringw& name) const { std::lock_guard lock(m_peers_mutex); auto ret = std::find_if(m_peers.begin(), m_peers.end(), @@ -1527,7 +1527,7 @@ std::pair STKHost::getAllPlayersTeamInfo() const /** Get the players for starting a new game. * \return A vector containing pointers on the players profiles. */ std::vector > - STKHost::getPlayersForNewGame(bool* has_always_on_spectators) const +STKHost::getPlayersForNewGame(bool* has_always_on_spectators) const { std::vector > players; std::lock_guard lock(m_peers_mutex); @@ -1559,7 +1559,7 @@ std::vector > * \param total store the total players count now */ void STKHost::updatePlayers(unsigned* ingame, unsigned* waiting, - unsigned* total) + unsigned* total) { uint32_t ingame_players = 0; uint32_t waiting_players = 0; @@ -1613,16 +1613,16 @@ std::string STKHost::getValidPublicAddress() const } // getValidPublicAddress // ---------------------------------------------------------------------------- -int STKHost::receiveRawPacket(char *buffer, int buffer_len, - SocketAddress* sender, int max_tries) +int STKHost::receiveRawPacket(char* buffer, int buffer_len, + SocketAddress* sender, int max_tries) { return m_network->receiveRawPacket(buffer, buffer_len, sender, - max_tries); + max_tries); } // receiveRawPacket // ---------------------------------------------------------------------------- -void STKHost::sendRawPacket(const BareNetworkString &buffer, - const SocketAddress& dst) +void STKHost::sendRawPacket(const BareNetworkString& buffer, + const SocketAddress& dst) { m_network->sendRawPacket(buffer, dst); } // sendRawPacket @@ -1631,4 +1631,4 @@ void STKHost::sendRawPacket(const BareNetworkString &buffer, uint16_t STKHost::getPrivatePort() const { return m_network->getPort(); -} // getPrivatePort +} // getPrivatePort \ No newline at end of file