Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package granatier for openSUSE:Factory checked in at 2021-12-13 20:42:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/granatier (Old) and /work/SRC/openSUSE:Factory/.granatier.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "granatier" Mon Dec 13 20:42:34 2021 rev:116 rq:937881 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/granatier/granatier.changes 2021-11-06 18:18:49.824909379 +0100 +++ /work/SRC/openSUSE:Factory/.granatier.new.2520/granatier.changes 2021-12-13 20:47:18.416516334 +0100 @@ -1,0 +2,25 @@ +Fri Dec 3 19:21:31 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- No code change since 21.11.90 + +------------------------------------------------------------------- +Sat Nov 27 10:10:24 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:54:25 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * kde-ci: use @same so that stable builds use stable libkdegames + * CI: Fix repo path for libkdegames + +------------------------------------------------------------------- Old: ---- granatier-21.08.3.tar.xz granatier-21.08.3.tar.xz.sig New: ---- granatier-21.12.0.tar.xz granatier-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ granatier.spec ++++++ --- /var/tmp/diff_new_pack.AWVpcz/_old 2021-12-13 20:47:18.996516705 +0100 +++ /var/tmp/diff_new_pack.AWVpcz/_new 2021-12-13 20:47:19.004516711 +0100 @@ -16,12 +16,11 @@ # -%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: granatier -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: Bomberman-like game License: GPL-2.0-or-later ++++++ granatier-21.08.3.tar.xz -> granatier-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/.gitlab-ci.yml new/granatier-21.12.0/.gitlab-ci.yml --- old/granatier-21.08.3/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/granatier-21.12.0/.gitlab-ci.yml 2021-12-02 22:27:31.000000000 +0100 @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +include: + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/.kde-ci.yml new/granatier-21.12.0/.kde-ci.yml --- old/granatier-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/granatier-21.12.0/.kde-ci.yml 2021-12-02 22:27:31.000000000 +0100 @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@stable' + 'games/libkdegames': '@same' + 'frameworks/kcoreaddons': '@stable' + 'frameworks/kconfig': '@stable' + 'frameworks/kcrash': '@stable' + 'frameworks/kdbusaddons': '@stable' + 'frameworks/kwidgetsaddons': '@stable' + 'frameworks/kconfig': '@stable' + 'frameworks/ki18n': '@stable' + 'frameworks/kconfigwidgets': '@stable' + 'frameworks/kxmlgui': '@stable' + 'frameworks/kdoctools': '@stable' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/CMakeLists.txt new/granatier-21.12.0/CMakeLists.txt --- old/granatier-21.08.3/CMakeLists.txt 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/CMakeLists.txt 2021-12-02 22:27:31.000000000 +0100 @@ -2,8 +2,8 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MINOR "12") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump GRANATIER_BASE_VERSION once new features are added @@ -14,11 +14,21 @@ project(granatier VERSION ${GRANATIER_VERSION}) set (QT_MIN_VERSION "5.15.0") -set (KF5_MIN_VERSION "5.83.0") +set (KF5_MIN_VERSION "5.85.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + +include(FeatureSummary) +include(ECMInstallIcons) +include(ECMAddAppIcon) +include(ECMQtDeclareLoggingCategory) +include(ECMSetupVersion) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons @@ -35,26 +45,11 @@ find_package(KF5KDEGames 7.3.0 REQUIRED) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings NO_POLICY_SCOPE) - -include(FeatureSummary) -include(ECMInstallIcons) -include(ECMAddAppIcon) -include(ECMQtDeclareLoggingCategory) -include(ECMSetupVersion) - add_definitions( - -DQT_NO_FOREACH - -DQT_NO_KEYWORDS - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING - -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_USE_QSTRINGBUILDER - -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT - -DQT_STRICT_ITERATORS + -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 + -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 + -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600 + -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ) add_subdirectory(themes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/CMakePresets.json new/granatier-21.12.0/CMakePresets.json --- old/granatier-21.08.3/CMakePresets.json 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/CMakePresets.json 2021-12-02 22:27:31.000000000 +0100 @@ -12,6 +12,17 @@ } }, { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" + } + }, + { "name": "asan", "displayName": "Build with Asan support.", "generator": "Ninja", @@ -72,6 +83,18 @@ "configurePreset": "dev" }, { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { "name": "clazy", "configurePreset": "clazy", "environment": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/ca/docs/granatier/index.docbook new/granatier-21.12.0/po/ca/docs/granatier/index.docbook --- old/granatier-21.08.3/po/ca/docs/granatier/index.docbook 2021-11-02 01:10:55.000000000 +0100 +++ new/granatier-21.12.0/po/ca/docs/granatier/index.docbook 2021-12-03 01:11:30.000000000 +0100 @@ -119,7 +119,7 @@ >Configurar el jugador</link > per a trobar les dreceres de teclat per als altres jugadors, aix?? com per a > configurar-les. </para> <para ->El prop??sit de col??locar bombes, a m??s d'atacar als altres adversaris, ??s destruir els molts blocs escampats pel camp de batalla per a aclarir un cam?? o descobrir les bonificacions ocultes. Entre les moltes bonificacions que es poden descobrir, es troben les que fan moure m??s r??pid o que fan augmentar l'abast de l'explosi?? de les bombes. Com m??s bonificacions d'aquest tipus recolliu, m??s f??cil ser?? eliminar als adversaris i guanyar la ronda. Per??, cal tenir en compte que hi ha tants desavantatges que poden desviar-vos, inclosos els que alenteixen o que inverteixen les tecles de moviment. </para> +>El prop??sit de col??locar bombes, a m??s d'atacar als altres adversaris, ??s destruir els molts blocs escampats pel camp de batalla per a aclarir un cam?? o descobrir les bonificacions ocultes. Entre les moltes bonificacions que es poden descobrir, es troben les que fan moure m??s de pressa o que fan augmentar l'abast de l'explosi?? de les bombes. Com m??s bonificacions d'aquest tipus recolliu, m??s f??cil ser?? eliminar als adversaris i guanyar la ronda. Per??, cal tenir en compte que hi ha tants desavantatges que poden desviar-vos, inclosos els que alenteixen o que inverteixen les tecles de moviment. </para> <para >Per cada ronda guanyada, el jugador rebr?? un punt. El primer jugador a >guanyar un nombre predefinit de punts (el valor predeterminat ??s 3), >guanyar?? la partida! </para> </chapter> @@ -195,9 +195,9 @@ >Fletxa dreta en el camp de batalla</phrase > </textobject> </inlinemediaobject -> Les fletxes – mour?? les bombes que es col??loquen en la direcci?? en la que apuntin. </para> +> Les fletxes – mouran les bombes que es col??loquen en la direcci?? a la que apuntin. </para> <para ->Si no hi ha cap dels elements anteriors, hi haur?? un forat a terra i entrar-hi resultar?? en caure a les profunditats i morir. El mateix tamb?? s'aplicar?? si no hi ha un mur en el limit del camp de batalla i el jugador es mou fora d'aquest. </para> +>Si no hi ha cap dels elements anteriors, hi haur?? un forat a terra i entrar-hi resultar?? en caure a les profunditats i morir. El mateix tamb?? s'aplicar?? si no hi ha un mur en el l??mit del camp de batalla i el jugador es mou fora d'aquest. </para> </sect2> <sect2> <title @@ -289,7 +289,7 @@ >Desavantatge d'hiperactivitat</phrase > </textobject> </inlinemediaobject -> Hiperactivitat – fa que us moveu una mica MASSA r??pid. </para> +> Hiperactivitat – fa que us moveu una mica MASSA de pressa. </para> <para> <inlinemediaobject> <imageobject @@ -664,7 +664,7 @@ > una fletxa cap amunt <quote >r</quote -> una fletxa cap la dreta +> una fletxa cap a la dreta <quote >d</quote > una fletxa cap avall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/ca@valencia/granatier.po new/granatier-21.12.0/po/ca@valencia/granatier.po --- old/granatier-21.08.3/po/ca@valencia/granatier.po 2021-11-02 01:10:54.000000000 +0100 +++ new/granatier-21.12.0/po/ca@valencia/granatier.po 2021-12-03 01:11:30.000000000 +0100 @@ -400,3 +400,6 @@ msgctxt "To quit Granatier" msgid "Quit" msgstr "Ix" + +#~ msgid "Get New Players..." +#~ msgstr "Obt??n jugadors nous..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/de/docs/granatier/index.docbook new/granatier-21.12.0/po/de/docs/granatier/index.docbook --- old/granatier-21.08.3/po/de/docs/granatier/index.docbook 2021-11-02 01:10:55.000000000 +0100 +++ new/granatier-21.12.0/po/de/docs/granatier/index.docbook 2021-12-03 01:11:30.000000000 +0100 @@ -41,13 +41,13 @@ <legalnotice >&FDLNotice;</legalnotice> <date ->2016-05-09</date> +>2021-06-23</date> <releaseinfo ->1.3.1 (Applications 16.04)</releaseinfo> +>1.4.2 (KDE Gear 21.04)</releaseinfo> <abstract> <para ->This documentation describes the game of &granatier; version 1.3.1</para> +>Diese Dokumentation beschreibt die Version 1.4.2 des Spiels &granatier;</para> </abstract> <keywordset> @@ -94,13 +94,15 @@ >Mehrere</para ></note> <para ->&granatier; is a clone of the classic <trademark +>&granatier; ist eine erweiterte Kopie des klassischen Spiels <trademark ><application >Bomberman</application ></trademark -> game, inspired by the work of the <application +> und ist von der Arbeit an dessen <emphasis +><application >Clanbomber</application -> clone. </para> +></emphasis +>-Kopie inspiriert. </para> <para >Die Spieler m??ssen sich auf dem Spielfeld bewegen und Bomben zum Entfernen >der Hindernisse und T??ten der Gegner legen. Einige <emphasis >Boni</emphasis @@ -135,9 +137,11 @@ >Das Spielziel besteht im T??ten aller Gegner.</para ></note> <para ->Each player is provided with five keys that they use to move their character and lay bombs. For example, the default keys for Player 1 are the Up, Down, Left and Right arrow keys to move respectively in those directions, and the &Enter; key to lay a bomb. Please refer to the <link linkend="config_player" ->Player Configuration</link -> Section to find shortcut keys for other players, as well as how to configure them. </para> +>Jeder Spieler ben??tigt f??nf Tasten f??r die Steuerung der Spielfigur und das Legen der Bomben. Die Standardtasten f??r <emphasis +>Spieler 1</emphasis +> sind beispielsweise zur Steuerung die Pfeiltasten &Up;, &Down;, &Left; und &Right; sowie die &Enter;taste zum Legen der Bomben. Im Abschnitt <link linkend="config_player" +>Spieler</link +> sind weitere Informationen zu den Tastenk??rzeln der anderen Spieler sowie deren ??nderung enthalten. </para> <para >Mit dem Legen der Bomben werden - abgesehen vom Angreifen der Gegner - die >vielen Hindernisse auf dem Spielfeld entfernt und dadurch der Weg freigemacht >bzw. <emphasis >Boni</emphasis @@ -448,18 +452,106 @@ </sect1> </chapter> + <chapter id="interface" +><title +>Die Benutzeroberfl??che</title +> <!-- do not change this! --> + + <sect1 id="menu"> + <title +>Men??eintr??ge</title> + + <variablelist> + <varlistentry> + <term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>N</keycap +></keycombo +></shortcut +> <guimenu +>Spiel</guimenu +> <guimenuitem +>Neu</guimenuitem +></menuchoice +></term> + <listitem +><para +><action +>Startet</action +> ein neues Spiel.</para +></listitem> + </varlistentry> + + <varlistentry> + <term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>Q</keycap +></keycombo +></shortcut +><guimenu +>Spiel</guimenu +><guimenuitem +>Beenden</guimenuitem +></menuchoice +></term> + <listitem +><para +><action +>Beendet</action +> &granatier;.</para +></listitem> + </varlistentry> + + <varlistentry> + <term +><menuchoice +><guimenu +>Einstellungen</guimenu +> <guimenuitem +>Kl??nge wiedergeben</guimenuitem +></menuchoice +></term> + <listitem +><para +>Falls markiert, <action +>werden die Kl??nge zum Spiel abgespielt.</action +> In der Voreinstellung sind die Kl??nge eingeschaltet. </para +></listitem> + </varlistentry> + </variablelist> + + <para +>Zus??tzlich hat &granatier; die bekannten &kde;-Eintr??ge im Men?? <guimenu +>Einstellungen</guimenu +> und <guimenu +>Hilfe</guimenu +>, weitere Informationen dazu finden Sie in den Abschnitten ??ber die Men??s <ulink url="help:/fundamentals/menus.html#menus-settings" +>Einstellungen</ulink +> und <ulink url="help:/fundamentals/menus.html#menus-help" +>Hilfe</ulink +> der &kde;-Grundlagen. </para> + + </sect1> + </chapter> + <chapter id="configuration" ><title >Spieleinstellungen</title > <!-- do not change this! --> <para ->To open the Configuration Dialogue, select <menuchoice +>Der Dialog f??r die Spieleinstellungen kann ??ber das Men?? <menuchoice ><guimenu ->Settings</guimenu +>Einstellungen</guimenu ><guimenuitem ->Configure &granatier;...</guimenuitem +>&granatier; einrichten ...</guimenuitem ></menuchoice -> </para> +> aufgerufen werden. </para> <sect1 id="config_general"> <title >Allgemein</title> @@ -487,13 +579,15 @@ <title >Design</title> <para ->To select the Theme you want to play, go to the Theme section. The Theme is loaded by clicking on <guibutton +>Das Design wird im Abschnitt <guilabel +>Design</guilabel +> ausgew??hlt und durch einen Klick auf <guibutton >OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Theme. </para> +> oder <guibutton +>Anwenden</guibutton +> geladen. Dadurch wird das aktuelle Spiel beendet und ein neues startet. Mittels Klick auf <guibutton +>Voreinstellungen</guibutton +> wird das Standarddesign wiederhergestellt. </para> <screenshot> <screeninfo >Einrichtungsdialog von &granatier;</screeninfo> @@ -512,23 +606,23 @@ <title >Spielfeld</title> <para ->To select the Arena you want to play, go to the Arena section. The Arena is loaded by clicking on <guibutton +>Das Spielfeld wird im Abschnitt <guilabel +>Spielfeld</guilabel +> ausgew??hlt und durch einen Klick auf <guibutton >OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Arena. </para> +> oder <guibutton +>Anwenden</guibutton +> geladen. Dadurch wird das aktuelle Spiel beendet und ein neues startet. Mittels Klick auf <guibutton +>Voreinstellungen</guibutton +> wird das Standardspielfeld wiederhergestellt. </para> <para ->If you have self-made <application +>Falls sie eigene <application >Clanbomber</application -> arenas, you can import them by clicking on <guibutton ->Import Clanbomber Arenas</guibutton ->. &granatier; is looking in <filename class="directory" +>-Spielfelder erstellt haben, k??nnen Sie sie in den Ordner <filename class="directory" >~/.clanbomber/maps</filename -> for the arenas. The default <application +> kopieren. &granatier; sucht in diesem Ordner nach Spielfeldern. Die standardm????igen Spielfelder von <application >Clanbomber</application -> arenas are already shipped with &granatier;. </para> +> werden bereits mit &granatier; ausgeliefert. </para> <screenshot> <screeninfo >Einrichtungsdialog von &granatier;</screeninfo> @@ -564,13 +658,15 @@ <title >Spieler</title> <para ->To select the Player you want to play, go to the Player section and select the Players with the checkboxes. The Shortcuts can be changed by clicking on the button for the action you want to change and then pressing the key you want to use. The changes are loaded by clicking on <guibutton +>Im Abschnitt <guilabel +>Spieler</guilabel +> k??nnen die gew??nschten Spieler ausgew??hlt werden (Farbe und Anzahl). Die Steuerungstasten k??nnen ge??ndert werden, indem auf die gew??nschte Aktion geklickt und danach die entsprechende Taste gedr??ckt wird. Durch einen Klick auf <guibutton >OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Shortcuts. </para> +> oder <guibutton +>Anwenden</guibutton +> werden die ??nderungen ??bernommen. Dadurch wird das aktuelle Spiel beendet und ein neues startet. Mittels Klick auf <guibutton +>Voreinstellungen</guibutton +> werden die standardm????igen Steuerungstasten wiederhergestellt. </para> <screenshot> <screeninfo >Einrichtungsdialog von &granatier;</screeninfo> @@ -592,26 +688,40 @@ >Spielfeld erstellen</title > <!-- do not change this! --> <para ->An Arena in &granatier; consists of two files, the <filename ->myarena.desktop</filename -> and the <filename ->myarena.xml</filename +>Die Spielfelder von &granatier; bestehen aus den zwei Dateien <filename +>meinSpielfeld.desktop</filename +> und <filename +>meinSpielfeld.xml</filename >. </para> <para ->The .desktop file contains the metadata like the arena name or the author of the arena and consists of the following entries. <programlisting> -[Arena] -Name=My Arena -Description=This is my first Arena +>Die <literal role="extension" +>.desktop</literal +>-Datei enth??lt die Metadaten wie den Namen und Autor des Spielfelds und besteht aus folgenden Eintr??gen. </para> + <para> + <programlisting +>[Arena] +Name=Mein Spielfeld +Description=Dies ist mein erstes Spielfeld Type=XML -FileName=myarena.xml +FileName=meinSpielfeld.xml Author=Joe User [email protected] - </programlisting -> You can choose whatever name you want, but FileName must be the name of the .xml file. </para> + </programlisting> + </para> + <para +>Sie k??nnen einen beliebigen Namen w??hlen, aber <literal +>FileName</literal +> muss der Name der <literal role="extension" +>.xml</literal +>-Datei sein. </para> <para ->The .xml file contains the actual arena map. <programlisting> -<?xml version="1.0"?> +>Die <filename +>.xml</filename +>-Datei beschreibt den Aufbau des Spielfelds. </para> + <para> + <programlisting +><?xml version="1.0"?> <Arena arenaFileVersion="1" rowCount="13" colCount="17"> <Row> ==== ==== </Row> <Row> ===+++++++=== </Row> @@ -627,8 +737,16 @@ <Row> ===+++++++=== </Row> <Row> ==== ==== </Row> </Arena> - </programlisting -> There is no limit for rowCount and colCount, so you can choose the size of the arena by yourself. The following symbols are used for the arena map. <programlisting + </programlisting> + </para> + <para +>F??r <userinput +>rowCount</userinput +> (= Anzahl der Zeilen) und <userinput +>colCount</userinput +> (= Anzahl der Spalten) gibt es keine H??chstwerte. Somit kann die Gr????e des Spielfelds beliebig gew??hlt werden. Die nachstehenden Zeichen k??nnen Verwendung finden: </para> + <para> + <programlisting >???<keycap >=</keycap >??? Wand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/es/docs/granatier/index.docbook new/granatier-21.12.0/po/es/docs/granatier/index.docbook --- old/granatier-21.08.3/po/es/docs/granatier/index.docbook 2021-11-02 01:10:55.000000000 +0100 +++ new/granatier-21.12.0/po/es/docs/granatier/index.docbook 2021-12-03 01:11:30.000000000 +0100 @@ -55,13 +55,13 @@ <legalnotice >&FDLNotice;</legalnotice> <date ->2016-05-09</date> +>2021-06-23</date> <releaseinfo ->1.3.1 (Applications 16.04)</releaseinfo> +>1.4.2 (KDE Gear 21.04)</releaseinfo> <abstract> <para ->This documentation describes the game of &granatier; version 1.3.1</para> +>Esta documentaci??n describe el juego &granatier; versi??n 1.4.2</para> </abstract> <keywordset> @@ -108,13 +108,13 @@ >Multijugador</para ></note> <para ->&granatier; is a clone of the classic <trademark +>&granatier; es un clon del cl??sico juego <trademark ><application >Bomberman</application ></trademark -> game, inspired by the work of the <application +>, inspirado por el trabajo del clon de <application >Clanbomber</application -> clone. </para> +>. </para> <para >El objetivo del juego es correr a trav??s de una zona de combate, utilizando >bombas para destruir obst??culos y eliminar a sus oponentes. Hay varias >bonificaciones y penalizaciones escondidas bajo los bloques –, que >pueden ayudarle o perjudicarle en su progreso. </para> <screenshot> @@ -143,9 +143,9 @@ >Elimine a todos sus oponentes.</para ></note> <para ->Each player is provided with five keys that they use to move their character and lay bombs. For example, the default keys for Player 1 are the Up, Down, Left and Right arrow keys to move respectively in those directions, and the &Enter; key to lay a bomb. Please refer to the <link linkend="config_player" ->Player Configuration</link -> Section to find shortcut keys for other players, as well as how to configure them. </para> +>A cada jugador se le asignan cinco teclas que usar??n para mover a su personaje y colocar bombas. Por ejemplo, las teclas predeterminadas para el jugador 1 son las flechas &Up;, &Down;, &Left; y &Right; para moverse en esas direcciones respectivamente, y la tecla Intro para colocar una bomba. Por favor, consulte la secci??n <link linkend="config_player" +>Configuraci??n de los jugadores</link +> para averiguar los accesos r??pidos para otros jugadores, adem??s de para saber c??mo configurarlos. </para> <para >El prop??sito de colocar bombas, adem??s de atacar a otros oponentes, es >destruir los muchos bloques repartidos por el terreno de juego para despejar >un camino o descubrir bonificaciones ocultas. Entre las muchas bonificaciones >que pueden ser descubiertas est??n las que le hacen moverse m??s r??pido o >las que aumentan el alcance de la explosi??n de las bombas; cuantas m??s >bonificaciones de este tipo recoja, m??s f??cil ser?? eliminar a sus >oponentes y ganar la ronda. Pero tenga en cuenta que tambi??n existen >penalizaciones que pueden volverse en su contra, como las que le ralentizan o >las que invierten sus teclas de movimiento. </para> <para @@ -378,16 +378,104 @@ </sect1> </chapter> + <chapter id="interface" +><title +>Descripci??n general de la interfaz</title +> <!-- do not change this! --> + + <sect1 id="menu"> + <title +>Elementos del men??</title> + + <variablelist> + <varlistentry> + <term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>N</keycap +></keycombo +></shortcut +> <guimenu +>Juego</guimenu +> <guimenuitem +>Nuevo</guimenuitem +></menuchoice +></term> + <listitem +><para +><action +>Empieza</action +> un nuevo juego.</para +></listitem> + </varlistentry> + + <varlistentry> + <term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>Q</keycap +></keycombo +></shortcut +> <guimenu +>Juego</guimenu +> <guimenuitem +>Salir</guimenuitem +></menuchoice +></term> + <listitem +><para +><action +>Sale</action +> de &granatier;.</para +></listitem> + </varlistentry> + + <varlistentry> + <term +><menuchoice +><guimenu +>Preferencias</guimenu +> <guimenuitem +>Reproducir sonidos</guimenuitem +></menuchoice +></term> + <listitem +><para +><action +>Conmuta la reproducci??n de sonidos al jugar</action +>. Por defecto est??n activados. </para +></listitem> + </varlistentry> + </variablelist> + + <para +>Adem??s, &granatier; tiene las opciones de men?? <guimenu +>Preferencias</guimenu +> y <guimenu +>Ayuda</guimenu +> comunes de &kde;. Para obtener m??s informaci??n, consulte las secciones sobre el <ulink url="help:/fundamentals/menus.html#menus-settings" +>Men?? ??Preferencias??</ulink +> y <ulink url="help:/fundamentals/menus.html#menus-help" +>Men?? ??Ayuda??</ulink +> de ??Aspectos b??sicos de &kde;??. </para> + + </sect1> + </chapter> + <chapter id="configuration" ><title >Configuraci??n del juego</title > <!-- do not change this! --> <para ->To open the Configuration Dialogue, select <menuchoice +>Para abrir el di??logo de configuraci??n, seleccione la opci??n del men?? <menuchoice ><guimenu ->Settings</guimenu -><guimenuitem ->Configure &granatier;...</guimenuitem +>Preferencias</guimenu +> <guimenuitem +>Configurar &granatier;...</guimenuitem ></menuchoice > </para> <sect1 id="config_general"> @@ -415,13 +503,13 @@ <title >Tema</title> <para ->To select the Theme you want to play, go to the Theme section. The Theme is loaded by clicking on <guibutton ->OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Theme. </para> +>Para seleccionar el tema con el que quiere jugar, vaya a la secci??n de temas. El tema se carga haciendo clic en <guibutton +>Aceptar</guibutton +> o en <guibutton +>Aplicar</guibutton +>. El juego actual terminar?? y empezar?? uno nuevo. Puede hacer clic en el bot??n <guibutton +>Predeterminado</guibutton +> para restaurar el tema por defecto. </para> <screenshot> <screeninfo >Captura de pantalla de la configuraci??n de &granatier;</screeninfo> @@ -440,23 +528,21 @@ <title >Terreno de juego</title> <para ->To select the Arena you want to play, go to the Arena section. The Arena is loaded by clicking on <guibutton ->OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Arena. </para> +>Para seleccionar el terreno en el que quiere jugar, vaya a la secci??n de Terreno. El terreno se carga haciendo clic en <guibutton +>Aceptar</guibutton +> o en <guibutton +>Aplicar</guibutton +>. El juego actual terminar?? y empezar?? uno nuevo. Puede hacer clic en el bot??n <guibutton +>Predeterminado</guibutton +> para restaurar el terreno por defecto. </para> <para ->If you have self-made <application +>Si ha dise??ado usted mismo terrenos de juego para <application >Clanbomber</application -> arenas, you can import them by clicking on <guibutton ->Import Clanbomber Arenas</guibutton ->. &granatier; is looking in <filename class="directory" +>, puede copiarlos en <filename class="directory" >~/.clanbomber/maps</filename -> for the arenas. The default <application +>, donde &granatier; los encontrar??. Los terrenos predeterminados de <application >Clanbomber</application -> arenas are already shipped with &granatier;. </para> +> ya vienen con &granatier;. </para> <screenshot> <screeninfo >Captura de pantalla de la configuraci??n de &granatier;</screeninfo> @@ -492,13 +578,13 @@ <title >Jugador</title> <para ->To select the Player you want to play, go to the Player section and select the Players with the checkboxes. The Shortcuts can be changed by clicking on the button for the action you want to change and then pressing the key you want to use. The changes are loaded by clicking on <guibutton ->OK</guibutton -> or <guibutton ->Apply</guibutton ->. The current game will be ended and a new one started. You can click on the <guibutton ->Defaults</guibutton -> button to restore the default Shortcuts. </para> +>Para seleccionar al jugador con el que desea jugar, vaya a la secci??n ??Jugador?? y seleccione los jugadores con las casillas de verificaci??n. Los accesos r??pidos de teclado se pueden cambiar haciendo clic en el bot??n para la acci??n que desee editar y presionando la tecla que quiera utilizar. Los cambios se cargan haciendo clic en <guibutton +>Aceptar</guibutton +> o en <guibutton +>Aplicar</guibutton +>. El juego actual finalizar?? y comenzar?? uno nuevo. Puede hacer clic en <guibutton +>Predeterminado</guibutton +> para restaurar los accesos r??pidos de teclado por omisi??n. </para> <screenshot> <screeninfo >Captura de pantalla de la configuraci??n de &granatier;</screeninfo> @@ -520,26 +606,40 @@ >Crear un terreno de juego personalizado</title > <!-- do not change this! --> <para ->An Arena in &granatier; consists of two files, the <filename +>Un terreno de juego de &granatier; consiste en dos archivos: <filename >myarena.desktop</filename -> and the <filename +> y <filename >myarena.xml</filename >. </para> <para ->The .desktop file contains the metadata like the arena name or the author of the arena and consists of the following entries. <programlisting> -[Arena] -Name=My Arena -Description=This is my first Arena +>El archivo <literal role="extension" +>.desktop</literal +> contiene los metadatos, como el nombre del terreno de juego o su autor, y consta de las siguientes entradas. </para> + <para> + <programlisting +>[Arena] +Name=Mi terreno de juego +Description=Este es mi primer terreno de juego Type=XML FileName=myarena.xml -Author=Joe User [email protected] - </programlisting -> You can choose whatever name you want, but FileName must be the name of the .xml file. </para> +Author=Nombre del usuario [email protected] + </programlisting> + </para> <para ->The .xml file contains the actual arena map. <programlisting> -<?xml version="1.0"?> +>Puede escoger el nombre que prefiera, pero <literal +>FileName</literal +> debe ser el nombre del archivo <literal role="extension" +>.xml</literal +>. </para> + <para +>El archivo <literal role="extension" +>.xml</literal +> contiene el mapa real del terreno de juego. </para> + <para> + <programlisting +><?xml version="1.0"?> <Arena arenaFileVersion="1" rowCount="13" colCount="17"> <Row> ==== ==== </Row> <Row> ===+++++++=== </Row> @@ -555,8 +655,16 @@ <Row> ===+++++++=== </Row> <Row> ==== ==== </Row> </Arena> - </programlisting -> There is no limit for rowCount and colCount, so you can choose the size of the arena by yourself. The following symbols are used for the arena map. <programlisting + </programlisting> + </para> + <para +>No hay l??mite para <literal +>rowCount</literal +> ni para <literal +>colCount</literal +>, por lo que puede escoger usted mismo el tama??o del terreno de juego. Los siguientes s??mbolos se usan en el mapa del terreno de juego. </para> + <para> + <programlisting >'=' a wall item ' ' a hole item '_' a ground item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/hu/granatier.po new/granatier-21.12.0/po/hu/granatier.po --- old/granatier-21.08.3/po/hu/granatier.po 2021-11-02 01:10:54.000000000 +0100 +++ new/granatier-21.12.0/po/hu/granatier.po 2021-12-03 01:11:30.000000000 +0100 @@ -4,19 +4,20 @@ # Laszlo Papp <[email protected]>, 2010. # Kiszel Krist??f <[email protected]>, 2010, 2015. # Bal??zs ??r <[email protected]>, 2012. +# Kristof Kiszel <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-04-09 00:15+0000\n" -"PO-Revision-Date: 2015-09-02 13:07+0200\n" -"Last-Translator: Krist??f Kiszel <[email protected]>\n" +"PO-Revision-Date: 2021-09-22 09:33+0200\n" +"Last-Translator: Kristof Kiszel <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 21.03.80\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, kde-format @@ -27,7 +28,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected],[email protected]" +msgstr "[email protected],[email protected]" #: config/arenaselector.cpp:260 config/playerselectoritem.cpp:155 #, kde-format @@ -312,12 +313,12 @@ #: main.cpp:77 #, kde-format msgid "Arturo Silva" -msgstr "" +msgstr "Arturo Silva" #: main.cpp:77 #, kde-format msgid "Most of the beautiful granatier graphics" -msgstr "" +msgstr "A Granatier gy??ny??r?? grafik??inak nagy r??sze" #: main.cpp:78 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/po/zh_CN/granatier.po new/granatier-21.12.0/po/zh_CN/granatier.po --- old/granatier-21.08.3/po/zh_CN/granatier.po 2021-11-02 01:10:55.000000000 +0100 +++ new/granatier-21.12.0/po/zh_CN/granatier.po 2021-12-03 01:11:30.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-04-09 00:15+0000\n" -"PO-Revision-Date: 2021-10-29 13:28\n" +"PO-Revision-Date: 2021-11-30 15:24\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/CMakeLists.txt new/granatier-21.12.0/src/CMakeLists.txt --- old/granatier-21.08.3/src/CMakeLists.txt 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/CMakeLists.txt 2021-12-02 22:27:31.000000000 +0100 @@ -6,36 +6,65 @@ add_executable(granatier) target_sources(granatier PRIVATE - config/arenaselector.cpp - config/arenasettings.cpp - config/playerselector.cpp - config/playerselectoritem.cpp - config/playersettings.cpp - granatier_debug.cpp arena.cpp + arena.h arenaitem.cpp + arenaitem.h block.cpp + block.h blockitem.cpp - bonus.cpp - bonusitem.cpp + blockitem.h bomb.cpp - bombitem.cpp bombexplosionitem.cpp + bombexplosionitem.h + bomb.h + bombitem.cpp + bombitem.h + bonus.cpp + bonus.h + bonusitem.cpp + bonusitem.h cell.cpp + cell.h character.cpp + character.h characteritem.cpp + characteritem.h + config/arenaselector.cpp + config/arenaselector.h + config/arenasettings.cpp + config/arenasettings.h + config/playerselector.cpp + config/playerselector.h + config/playerselectoritem.cpp + config/playerselectoritem.h + config/playersettings.cpp + config/playersettings.h element.cpp + element.h elementitem.cpp + elementitem.h game.cpp + game.h gamescene.cpp + gamescene.h gameview.cpp + gameview.h + granatierglobals.h + granatier_random.h infooverlay.cpp + infooverlay.h infosidebar.cpp + infosidebar.h main.cpp mainwindow.cpp + mainwindow.h mapparser.cpp + mapparser.h player.cpp + player.h playeritem.cpp + playeritem.h granatier.qrc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/arena.h new/granatier-21.12.0/src/arena.h --- old/granatier-21.08.3/src/arena.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/arena.h 2021-12-02 22:27:31.000000000 +0100 @@ -55,7 +55,7 @@ /** * Deletes the Arena instance. */ - ~Arena(); + ~Arena() override; /** * Creates the Arena matrix. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/arenaitem.h new/granatier-21.12.0/src/arenaitem.h --- old/granatier-21.08.3/src/arenaitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/arenaitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -35,7 +35,7 @@ /** * Deletes the ArenaItem instances. */ - ~ArenaItem(); + ~ArenaItem() override; public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/block.h new/granatier-21.12.0/src/block.h --- old/granatier-21.08.3/src/block.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/block.h 2021-12-02 22:27:31.000000000 +0100 @@ -31,7 +31,7 @@ /** * Deletes the Block instance. */ - ~Block(); + ~Block() override; /** * Sets the Bonus which is contained by the Block diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/blockitem.h new/granatier-21.12.0/src/blockitem.h --- old/granatier-21.08.3/src/blockitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/blockitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -41,7 +41,7 @@ /** * Deletes the BlockItem instance. */ - ~BlockItem(); + ~BlockItem() override; private Q_SLOTS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/bomb.h new/granatier-21.12.0/src/bomb.h --- old/granatier-21.08.3/src/bomb.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/bomb.h 2021-12-02 22:27:31.000000000 +0100 @@ -72,7 +72,7 @@ /** * Deletes the Bomb instance. */ - ~Bomb(); + ~Bomb() override; /** * Makes the Bomb go up. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/bombexplosionitem.h new/granatier-21.12.0/src/bombexplosionitem.h --- old/granatier-21.08.3/src/bombexplosionitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/bombexplosionitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -57,7 +57,7 @@ /** * Deletes the BombExplosionItem instance. */ - ~BombExplosionItem(); + ~BombExplosionItem() override; /** * Overrides the default shape function to make it a small circle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/bombitem.h new/granatier-21.12.0/src/bombitem.h --- old/granatier-21.08.3/src/bombitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/bombitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -59,7 +59,7 @@ /** * Deletes the BombItem instance. */ - ~BombItem(); + ~BombItem() override; /** * Overrides the default shape function to make it a small circle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/bonus.h new/granatier-21.12.0/src/bonus.h --- old/granatier-21.08.3/src/bonus.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/bonus.h 2021-12-02 22:27:31.000000000 +0100 @@ -30,7 +30,7 @@ /** * Deletes the Bonus instance. */ - ~Bonus(); + ~Bonus() override; /** * Computes an action on a collision with the Player. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/bonusitem.h new/granatier-21.12.0/src/bonusitem.h --- old/granatier-21.08.3/src/bonusitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/bonusitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -44,7 +44,7 @@ /** * Deletes the BonusItem instance. */ - ~BonusItem(); + ~BonusItem() override; /** * Sets the undestroyable explosion IDs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/character.h new/granatier-21.12.0/src/character.h --- old/granatier-21.08.3/src/character.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/character.h 2021-12-02 22:27:31.000000000 +0100 @@ -64,7 +64,7 @@ /** * Deletes the Character instance. */ - ~Character(); + ~Character() override; /** * Makes the Character go up. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/config/arenaselector.cpp new/granatier-21.12.0/src/config/arenaselector.cpp --- old/granatier-21.08.3/src/config/arenaselector.cpp 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/config/arenaselector.cpp 2021-12-02 22:27:31.000000000 +0100 @@ -209,7 +209,7 @@ { // TODO change this if we ever change ArenaSettings::loadDefault QLatin1String defaultPath("arenas/granatier.desktop"); - for(auto arenaSettings: qAsConst(arenaMap)) + for(auto arenaSettings: std::as_const(arenaMap)) { if (arenaSettings->path().endsWith(defaultPath)) { @@ -317,7 +317,7 @@ if(m_svgScaleFactor != svgScaleFactor) { m_svgScaleFactor = svgScaleFactor; - for(auto arenaItem: qAsConst(m_arenaItems)) + for(auto arenaItem: std::as_const(m_arenaItems)) { arenaItem->setRenderSize(calculateSvgSize()); arenaItem->setScale(m_svgScaleFactor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/config/playerselector.h new/granatier-21.12.0/src/config/playerselector.h --- old/granatier-21.08.3/src/config/playerselector.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/config/playerselector.h 2021-12-02 22:27:31.000000000 +0100 @@ -27,7 +27,7 @@ Q_DECLARE_FLAGS(Options, Option) explicit PlayerSelector(PlayerSettings* playerSettings, Options options = DefaultBehavior, QWidget* parent = nullptr); - virtual ~PlayerSelector(); + ~PlayerSelector() override; private: struct Private; Private* const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/config/playerselectoritem.h new/granatier-21.12.0/src/config/playerselectoritem.h --- old/granatier-21.08.3/src/config/playerselectoritem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/config/playerselectoritem.h 2021-12-02 22:27:31.000000000 +0100 @@ -47,7 +47,7 @@ public: PlayerSelectorItem(const QString& playerId, PlayerSettings* playerSettings, QWidget* parent = nullptr); - ~PlayerSelectorItem(); + ~PlayerSelectorItem() override; void setPlayerPreviewPixmap(const QPixmap& pixmap); void setPlayerAuthor(const QString& name, const QString& mail); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/config/playersettings.cpp new/granatier-21.12.0/src/config/playersettings.cpp --- old/granatier-21.08.3/src/config/playersettings.cpp 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/config/playersettings.cpp 2021-12-02 22:27:31.000000000 +0100 @@ -177,7 +177,7 @@ { playersGroupList = granatierConfig.group("Player").groupList(); playersGroupList.sort(); - for(const auto& player: qAsConst(playersGroupList)) + for(const auto& player: std::as_const(playersGroupList)) { strPlayerIDList.append(granatierConfig.group("Player").group(player).readEntry<QString>("PlayerID", QStringLiteral(""))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/element.h new/granatier-21.12.0/src/element.h --- old/granatier-21.08.3/src/element.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/element.h 2021-12-02 22:27:31.000000000 +0100 @@ -58,7 +58,7 @@ /** * Deletes the Element instance. */ - ~Element(); + ~Element() override; /** * Computes an action on a collision with the Player. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/elementitem.h new/granatier-21.12.0/src/elementitem.h --- old/granatier-21.08.3/src/elementitem.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/elementitem.h 2021-12-02 22:27:31.000000000 +0100 @@ -45,7 +45,7 @@ /** * Deletes the ElementItem instance. */ - ~ElementItem(); + ~ElementItem() override; /** * Gets the Element model. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/game.h new/granatier-21.12.0/src/game.h --- old/granatier-21.08.3/src/game.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/game.h 2021-12-02 22:27:31.000000000 +0100 @@ -123,7 +123,7 @@ /** * Deletes the Game instance. */ - ~Game(); + ~Game() override; /** * Starts the Game. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/gamescene.cpp new/granatier-21.12.0/src/gamescene.cpp --- old/granatier-21.08.3/src/gamescene.cpp 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/gamescene.cpp 2021-12-02 22:27:31.000000000 +0100 @@ -332,7 +332,7 @@ if (!blockElements.isEmpty()) { // Create the element item and set the image - for(const auto& element: qAsConst(blockElements)) + for(const auto& element: std::as_const(blockElements)) { Block* block = dynamic_cast <Block*> (element); BlockItem* blockItem = new BlockItem(block, m_rendererArenaItems); @@ -908,7 +908,7 @@ { bombElements = m_game->getArena()->getCell(nRow, nColumn).getElements(Granatier::Element::BOMB); int tempBombDetonationCountdown = nDetonationCountdown; - for(const auto& element: qAsConst(bombElements)) + for(const auto& element: std::as_const(bombElements)) { if(dynamic_cast <Bomb*> (element) != bomb && !(dynamic_cast <Bomb*> (element)->isDetonated())) { @@ -920,7 +920,7 @@ blockElements = m_game->getArena()->getCell(nRow, nColumn).getElements(Granatier::Element::BLOCK); if(!blockElements.isEmpty()) { - for(const auto& element: qAsConst(blockElements)) + for(const auto& element: std::as_const(blockElements)) { dynamic_cast <Block*> (element)->startDestruction(); if (m_blockItems[nRow][nColumn] != nullptr) @@ -975,7 +975,7 @@ { int tempBombDetonationCountdown = anDirectionDetonationCountdown[direction]; bool increaseDetonationTimeout = false; - for(const auto& element: qAsConst(bombElements)) + for(const auto& element: std::as_const(bombElements)) { if(dynamic_cast <Bomb*> (element) != bomb && !(dynamic_cast <Bomb*> (element)->isDetonated())) { @@ -992,7 +992,7 @@ if(!blockElements.isEmpty()) { abDirectionsDone[direction] = true; - for(const auto& element: qAsConst(blockElements)) + for(const auto& element: std::as_const(blockElements)) { dynamic_cast <Block*> (element)->startDestruction(); if (m_blockItems[nRow][nColumn] != nullptr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/gamescene.h new/granatier-21.12.0/src/gamescene.h --- old/granatier-21.08.3/src/gamescene.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/gamescene.h 2021-12-02 22:27:31.000000000 +0100 @@ -106,7 +106,7 @@ /** * Deletes the Game instance. */ - ~GameScene(); + ~GameScene() override; /** * @return the Game instance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/infooverlay.cpp new/granatier-21.12.0/src/infooverlay.cpp --- old/granatier-21.08.3/src/infooverlay.cpp 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/infooverlay.cpp 2021-12-02 22:27:31.000000000 +0100 @@ -102,7 +102,7 @@ hideItems(); // Find the score items and remove them - for(const auto& scoreItems: qAsConst(m_mapScore)) + for(const auto& scoreItems: std::as_const(m_mapScore)) { qDeleteAll(scoreItems); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/infooverlay.h new/granatier-21.12.0/src/infooverlay.h --- old/granatier-21.08.3/src/infooverlay.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/infooverlay.h 2021-12-02 22:27:31.000000000 +0100 @@ -57,7 +57,7 @@ /** * Deletes the InfoOverlay instance. */ - ~InfoOverlay(); + ~InfoOverlay() override; /** * Shows the get ready info. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/infosidebar.h new/granatier-21.12.0/src/infosidebar.h --- old/granatier-21.08.3/src/infosidebar.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/infosidebar.h 2021-12-02 22:27:31.000000000 +0100 @@ -66,7 +66,7 @@ /** * Deletes the InfoSidebar instance. */ - virtual ~InfoSidebar(); + ~InfoSidebar() override; /** * Resets the player states diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/mainwindow.h new/granatier-21.12.0/src/mainwindow.h --- old/granatier-21.08.3/src/mainwindow.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/mainwindow.h 2021-12-02 22:27:31.000000000 +0100 @@ -57,7 +57,7 @@ /** * Deletes the MainWindow instance. */ - ~MainWindow(); + ~MainWindow() override; private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/org.kde.granatier.appdata.xml new/granatier-21.12.0/src/org.kde.granatier.appdata.xml --- old/granatier-21.08.3/src/org.kde.granatier.appdata.xml 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/org.kde.granatier.appdata.xml 2021-12-02 22:27:31.000000000 +0100 @@ -136,6 +136,7 @@ <caption xml:lang="fi">Granatierin pelaaminen</caption> <caption xml:lang="fr">Partie de Granatier en cours</caption> <caption xml:lang="gl">Xogando a Granatier</caption> + <caption xml:lang="hu">Granatier j??t??k</caption> <caption xml:lang="id">Memainkan Granatier</caption> <caption xml:lang="it">Giocare con Granatier</caption> <caption xml:lang="ko">Granatier ?????????</caption> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-21.08.3/src/player.h new/granatier-21.12.0/src/player.h --- old/granatier-21.08.3/src/player.h 2021-11-01 03:18:50.000000000 +0100 +++ new/granatier-21.12.0/src/player.h 2021-12-02 22:27:31.000000000 +0100 @@ -101,7 +101,7 @@ /** * Deletes the Player instance. */ - ~Player(); + ~Player() override; /** * Shortcuts for moving and dropping bombs
