Hello community, here is the log from the commit of package knavalbattle for openSUSE:Factory checked in at 2013-12-02 12:35:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knavalbattle (Old) and /work/SRC/openSUSE:Factory/.knavalbattle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knavalbattle" Changes: -------- --- /work/SRC/openSUSE:Factory/knavalbattle/knavalbattle.changes 2013-10-03 15:59:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knavalbattle.new/knavalbattle.changes 2013-12-02 12:35:08.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 18:28:55 UTC 2013 - [email protected] + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sun Nov 10 08:01:09 UTC 2013 - [email protected] + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:47:02 UTC 2013 - [email protected] + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- knavalbattle-4.11.2.tar.xz New: ---- knavalbattle-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knavalbattle.spec ++++++ --- /var/tmp/diff_new_pack.AO6XBL/_old 2013-12-02 12:35:09.000000000 +0100 +++ /var/tmp/diff_new_pack.AO6XBL/_new 2013-12-02 12:35:09.000000000 +0100 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 4.11.2 +Version: 4.11.90 Release: 0 Source0: knavalbattle-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +49,7 @@ %install cd build %kde4_makeinstall - %suse_update_desktop_file -r kbattleship Game BoardGame + %suse_update_desktop_file -r knavalbattle Game BoardGame %kde_post_install %post -p /sbin/ldconfig @@ -59,11 +59,13 @@ %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kbattleship -%{_kde4_applicationsdir}/kbattleship.desktop -%{_kde4_htmldir}/en/kbattleship/ -%{_kde4_iconsdir}/hicolor/*/apps/kbattleship.* -%{_kde4_servicesdir}/kbattleship.protocol -%{_kde4_appsdir}/kbattleship/ +%{_kde4_bindir}/knavalbattle +%{_kde4_applicationsdir}/knavalbattle.desktop +%{_kde4_htmldir}/en/knavalbattle/ +%{_kde4_iconsdir}/hicolor/*/apps/knavalbattle.* +%{_kde4_servicesdir}/knavalbattle.protocol +%{_kde4_appsdir}/knavalbattle/ +%dir %{_kde4_appsdir}/kconf_update +%{_kde4_appsdir}/kconf_update/knavalbattle.upd %changelog ++++++ knavalbattle-4.11.2.tar.xz -> knavalbattle-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/CMakeLists.txt new/knavalbattle-4.11.90/CMakeLists.txt --- old/knavalbattle-4.11.2/CMakeLists.txt 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -1,4 +1,4 @@ -project(kbattleship) +project(knavalbattle) if(NOT COMPILING_KDEGAMES) find_package(KDE4 REQUIRED) @@ -14,3 +14,4 @@ add_subdirectory(src) add_subdirectory(data) add_subdirectory(doc) +add_subdirectory(kconf_update) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/data/pictures/CMakeLists.txt new/knavalbattle-4.11.90/data/pictures/CMakeLists.txt --- old/knavalbattle-4.11.2/data/pictures/CMakeLists.txt 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/data/pictures/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -2,7 +2,7 @@ install(FILES default.desktop default_theme.svgz -DESTINATION ${DATA_INSTALL_DIR}/kbattleship/pictures) +DESTINATION ${DATA_INSTALL_DIR}/knavalbattle/pictures) kde4_install_icons(${ICON_INSTALL_DIR}) Files old/knavalbattle-4.11.2/data/pictures/hi128-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi128-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi128-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi128-app-knavalbattle.png differ Files old/knavalbattle-4.11.2/data/pictures/hi16-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi16-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi16-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi16-app-knavalbattle.png differ Files old/knavalbattle-4.11.2/data/pictures/hi22-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi22-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi22-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi22-app-knavalbattle.png differ Files old/knavalbattle-4.11.2/data/pictures/hi32-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi32-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi32-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi32-app-knavalbattle.png differ Files old/knavalbattle-4.11.2/data/pictures/hi48-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi48-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi48-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi48-app-knavalbattle.png differ Files old/knavalbattle-4.11.2/data/pictures/hi64-app-kbattleship.png and new/knavalbattle-4.11.90/data/pictures/hi64-app-kbattleship.png differ Files old/knavalbattle-4.11.2/data/pictures/hi64-app-knavalbattle.png and new/knavalbattle-4.11.90/data/pictures/hi64-app-knavalbattle.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/data/sounds/CMakeLists.txt new/knavalbattle-4.11.90/data/sounds/CMakeLists.txt --- old/knavalbattle-4.11.2/data/sounds/CMakeLists.txt 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/data/sounds/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -2,4 +2,4 @@ ship-player1-shoot.ogg ship-player2-shoot.ogg ship-sink.ogg - DESTINATION ${DATA_INSTALL_DIR}/kbattleship/sounds) + DESTINATION ${DATA_INSTALL_DIR}/knavalbattle/sounds) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/doc/CMakeLists.txt new/knavalbattle-4.11.90/doc/CMakeLists.txt --- old/knavalbattle-4.11.2/doc/CMakeLists.txt 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/doc/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -1,3 +1,3 @@ ########### install files ############### # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kbattleship) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR knavalbattle) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/doc/index.docbook new/knavalbattle-4.11.90/doc/index.docbook --- old/knavalbattle-4.11.2/doc/index.docbook 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/doc/index.docbook 2013-10-18 18:17:06.000000000 +0200 @@ -63,7 +63,7 @@ <keywordset> <keyword>KDE</keyword> <keyword>kdegames</keyword> -<keyword>kbattleship</keyword> +<keyword>knavalbattle</keyword> <keyword>game</keyword> <keyword>battleship</keyword> <keyword>battle</keyword> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/kconf_update/CMakeLists.txt new/knavalbattle-4.11.90/kconf_update/CMakeLists.txt --- old/knavalbattle-4.11.2/kconf_update/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/kconf_update/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1 @@ +install(FILES knavalbattle.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/kconf_update/knavalbattle.upd new/knavalbattle-4.11.90/kconf_update/knavalbattle.upd --- old/knavalbattle-4.11.2/kconf_update/knavalbattle.upd 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/kconf_update/knavalbattle.upd 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1,3 @@ +Id=knavalbattle +File=kbattleshiprc,knavalbattlerc +AllGroups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/CMakeLists.txt new/knavalbattle-4.11.90/src/CMakeLists.txt --- old/knavalbattle-4.11.2/src/CMakeLists.txt 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/CMakeLists.txt 2013-10-18 18:17:06.000000000 +0200 @@ -1,6 +1,6 @@ include_directories(${CMAKE_SOURCE_DIR}/libkdegames/highscore ${CMAKE_CURRENT_SOURCE_DIR}/kwelcomescreen) -set(kbattleship_SRCS +set(knavalbattle_SRCS ai/ai.cpp ai/dummyai.cpp ai/smartai.cpp @@ -40,14 +40,14 @@ welcomescreen.cpp) -kde4_add_kcfg_files(kbattleship_SRCS settingsbase.kcfgc) +kde4_add_kcfg_files(knavalbattle_SRCS settingsbase.kcfgc) -kde4_add_app_icon(kbattleship_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/hi*-app-kbattleship.png") -kde4_add_executable(kbattleship ${kbattleship_SRCS} ${kwelcomescreen_SRCS}) +kde4_add_app_icon(knavalbattle_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/hi*-app-knavalbattle.png") +kde4_add_executable(knavalbattle ${knavalbattle_SRCS} ${kwelcomescreen_SRCS}) -target_link_libraries(kbattleship ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDNSSD_LIBS} kdegames) +target_link_libraries(knavalbattle ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDNSSD_LIBS} kdegames) -install(TARGETS kbattleship ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install( FILES kbattleshipui.rc DESTINATION ${DATA_INSTALL_DIR}/kbattleship ) -install(PROGRAMS kbattleship.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES kbattleship.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS knavalbattle ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( FILES knavalbattleui.rc DESTINATION ${DATA_INSTALL_DIR}/knavalbattle ) +install(PROGRAMS knavalbattle.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( FILES knavalbattle.protocol DESTINATION ${SERVICES_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/Messages.sh new/knavalbattle-4.11.90/src/Messages.sh --- old/knavalbattle-4.11.2/src/Messages.sh 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/Messages.sh 2013-10-18 18:17:06.000000000 +0200 @@ -1,3 +1,3 @@ $EXTRACTRC *.rc *.kcfg >> rc.cpp -$XGETTEXT `find . -name "*.cpp"` -o $podir/kbattleship.pot +$XGETTEXT `find . -name "*.cpp"` -o $podir/knavalbattle.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/ai/smartai.cpp new/knavalbattle-4.11.90/src/ai/smartai.cpp --- old/knavalbattle-4.11.2/src/ai/smartai.cpp 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/ai/smartai.cpp 2013-10-18 18:17:06.000000000 +0200 @@ -180,6 +180,7 @@ int m_offset; int m_range; + // following a diagonal, return true if there is water at the enemy's panel. bool movesAvailable() const { Sea::Player opp = Sea::opponent(m_player); for (int i = 0; i < m_sea->size().x; i++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/aientity.cpp new/knavalbattle-4.11.90/src/aientity.cpp --- old/knavalbattle-4.11.2/src/aientity.cpp 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/aientity.cpp 2013-10-18 18:17:06.000000000 +0200 @@ -41,6 +41,16 @@ void AIEntity::notify(Sea::Player player, const Coord& c, const HitInfo& info) { m_ai->notify(player, c, info); + + // add a border around opponent sunk ship in KBS4 mode when no adjacentShips + // are allowed, the AI will not try to shoot at points that are not free + if (m_level == COMPAT_KBS4 && + player == m_player && + !m_sea->isAdjacentShipsAllowed() && + info.shipDestroyed) { + m_sea->addBorder(Sea::opponent(player), info.shipPos); + } + getShoot(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/kbattleship.desktop new/knavalbattle-4.11.90/src/kbattleship.desktop --- old/knavalbattle-4.11.2/src/kbattleship.desktop 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/kbattleship.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -[Desktop Entry] -Name=Naval Battle -Name[bs]=Pomorska bitka -Name[ca]=Batalla naval -Name[ca@valencia]=Batalla naval -Name[da]=Naval Battle -Name[de]=Naval Battle -Name[el]=Ναυμαχία -Name[en_GB]=Naval Battle -Name[es]=Batalla Naval -Name[et]=Merelahing -Name[fi]=Meritaistelu -Name[fr]=Bataille navale -Name[ga]=Comhrac Cabhlaigh -Name[gl]=Batalla Naval -Name[hu]=Tengeri csata -Name[it]=Battaglia navale -Name[kk]=Теңіз соғысы -Name[km]=ចម្បាំងតាមនាវា -Name[lt]=Jūrų mūšis -Name[lv]=Naval Battle -Name[mr]=नाविक युद्ध -Name[nb]=Sjøslag -Name[nds]=Scheep versenken -Name[nl]=Naval Battle -Name[pl]=Bitwa Morska -Name[pt]=Batalha Naval -Name[pt_BR]=Batalha Naval -Name[ro]=Bătălie navală -Name[ru]=Naval Battle -Name[sk]=Námorná bitka -Name[sl]=Potapljanje ladjic -Name[sr]=Поморска битка -Name[sr@ijekavian]=Поморска битка -Name[sr@ijekavianlatin]=Pomorska bitka -Name[sr@latin]=Pomorska bitka -Name[sv]=Sänka fartyg -Name[tr]=Amiral Battı -Name[ug]=دېڭىز ئۇرۇشى -Name[uk]=Морський бій -Name[x-test]=xxNaval Battlexx -Name[zh_CN]=Naval Battle -Name[zh_TW]=海上戰爭 -Exec=kbattleship -caption %c %U -MimeType=inode/vnd.kde.service.kbattleship; -Icon=kbattleship -Type=Application -X-DocPath=kbattleship/index.html -GenericName=Ship Sinking Game -GenericName[bs]=Igra potapanja brodova -GenericName[ca]=Joc d'enfonsar vaixells -GenericName[ca@valencia]=Joc d'enfonsar vaixells -GenericName[da]=Sænke slagskibe -GenericName[de]=Schiffe versenken -GenericName[el]=Παιχνίδι βύθισης πλοίων -GenericName[en_GB]=Ship Sinking Game -GenericName[es]=Juego de hundir barcos -GenericName[et]=Laevade pommitamise mäng -GenericName[fi]=Laivanupotuspeli -GenericName[fr]=Jeu de touché-coulé -GenericName[ga]=Cluiche Comhraic Chabhlaigh -GenericName[gl]=Xogo de afundir barcos. -GenericName[hu]=Hajóelsüllyesztő játék -GenericName[it]=Gioco di affondamento navi -GenericName[kk]=Теңіздегі соғыс ойны -GenericName[km]=ល្បែងពន្លិចកប៉ាល់ -GenericName[lt]=Laivų skandinimo žaidimas -GenericName[lv]=Kuģu gremdēšanas spēle -GenericName[mr]=नाव बुडविण्याचा खेळ -GenericName[nb]=Spill om å senke skip -GenericName[nds]=Scheep versenken -GenericName[nl]=Het spel voor het laten zinken van schepen -GenericName[pl]=Gra w zatapianie statków -GenericName[pt]=Jogo para Afundar Navios -GenericName[pt_BR]=Jogo para afundar navios -GenericName[ro]=Joc de scufundat corăbii -GenericName[ru]=Морской бой -GenericName[sk]=Potápanie lodí -GenericName[sl]=Igra potapljanja ladjic -GenericName[sr]=Игра потапања бродова -GenericName[sr@ijekavian]=Игра потапања бродова -GenericName[sr@ijekavianlatin]=Igra potapanja brodova -GenericName[sr@latin]=Igra potapanja brodova -GenericName[sv]=Sänka fartygsspel -GenericName[tr]=Gemi Batırma Oyunu -GenericName[ug]=كېمە چۆكتۈرۈش ئويۇنى -GenericName[uk]=Гра у битву кораблів -GenericName[x-test]=xxShip Sinking Gamexx -GenericName[zh_CN]=击沉舰船游戏 -GenericName[zh_TW]=擊沉船隻的遊戲 -Terminal=false -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Game;StrategyGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/kbattleship.kcfg new/knavalbattle-4.11.90/src/kbattleship.kcfg --- old/knavalbattle-4.11.2/src/kbattleship.kcfg 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/kbattleship.kcfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE kcfg SYSTEM - "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd";> -<kcfg> - <kcfgfile name="kbattleshiprc"/> - <include>kglobalsettings.h</include> - <group name="network"> - <entry name="Hostname" type="String"> - <label>Default hostname for multiplayer games.</label> - <default>localhost</default> - </entry> - <entry name="Port" type="Int"> - <label>Default port for multiplayer games.</label> - <default>54321</default> - </entry> - </group> - <group name="general"> - <entry name="Nickname" type="String"> - <label>User nickname.</label> - </entry> - <entry name="EnableSounds" type="Bool"> - <label>Whether sound effects should be played.</label> - <default>false</default> - </entry> - <entry name="AdjacentShips" type="Bool"> - <label>Allow the ships to be adjacent without one empty space between them.</label> - <default>true</default> - </entry> - </group> -</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/kbattleship.protocol new/knavalbattle-4.11.90/src/kbattleship.protocol --- old/knavalbattle-4.11.2/src/kbattleship.protocol 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/kbattleship.protocol 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -[Protocol] -protocol=kbattleship - -input=none -output=none - -Icon=kbattleship -Description=A protocol for the game Naval Battle -Description[bs]=Protokol za Pomorsku bitku -Description[ca]=Un protocol pel joc Batalla naval -Description[ca@valencia]=Un protocol pel joc Batalla naval -Description[da]=En protokol til spillet Naval Battle -Description[de]=Ein Protokoll für das Spiel Naval Battle -Description[el]=Ένα πρωτόκολλο για το παιχνίδι Ναυμαχία -Description[en_GB]=A protocol for the game Naval Battle -Description[es]=Protocolo para el juego Batalla Naval -Description[et]=Merelahingu protokoll -Description[fi]=Meritaistelu-pelin yhteyskäytäntö -Description[fr]=Un protocole pour le jeu de Bataille Navale -Description[ga]=Prótacal le haghaidh an chluiche Naval Battle -Description[gl]=Protocolo para o xogo Batalla Naval. -Description[hu]=Protokoll a Tengeri csata játékhoz -Description[it]=Un protocollo per Battaglia navale -Description[kk]=Теңіздегі соғыс ойынның протоколы -Description[km]=ពិធីការសម្រាប់ល្បែង នាវាចំបាំង -Description[lv]=Protokols spēlei Naval Battle -Description[mr]=नाविक युद्ध खेळाकरिता शिष्टाचार -Description[nb]=En protokoll for spillet Sjøslag -Description[nds]=En Protokoll för dat Speel "Scheep versenken" -Description[nl]=Een protocol voor het spel Naval Battle -Description[pl]=Protokół dla gry Bitwy Morskiej -Description[pt]=Um protocolo para o jogo da Batalha Naval -Description[pt_BR]=Um protocolo para o jogo Batalha Naval -Description[ru]=Протокол для игры Naval Battle -Description[sk]=Protokol pre hru Námorná bitka -Description[sl]=Protokol za igro Potapljanje ladjic -Description[sr]=Протокол за Поморску битку -Description[sr@ijekavian]=Протокол за Поморску битку -Description[sr@ijekavianlatin]=Protokol za Pomorsku bitku -Description[sr@latin]=Protokol za Pomorsku bitku -Description[sv]=Ett protokoll för spelet Sänka fartyg -Description[tr]=Amiral Battı oyunu protokolü -Description[uk]=Протокол для гри у морський бій -Description[x-test]=xxA protocol for the game Naval Battlexx -Description[zh_CN]=Naval Battle 的游戏用协议 -Description[zh_TW]=海上戰爭遊戲使用的協定 - -helper=true -Class=:internet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/kbattleshipui.rc new/knavalbattle-4.11.90/src/kbattleshipui.rc --- old/knavalbattle-4.11.2/src/kbattleshipui.rc 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/kbattleshipui.rc 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<gui name="kbattleship" - version="4" - xmlns="http://www.kde.org/standards/kxmlgui/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 - http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd";> - -<MenuBar> - <Menu name="game"> - <Action name="game_server" /> - <Action name="game_client" /> - <Action name="game_local" /> - <Action name="game_create_server" /> - <Action name="game_create_client" /> - </Menu> - <Menu name="settings"> - <Action name="options_nickname" /> - <Action name="options_sounds" /> - <Action name="options_adjacent" /> - <Action name="options_show_endgame_message" /> - <Action name="options_showleftgrid" /> - <Action name="options_showrightgrid" /> - </Menu> -</MenuBar> - -<ToolBar name="gameToolbar" > - <text>Game Toolbar</text> - <Action name="game_new" /> - <Action name="game_restart" /> - <Action name="game_local" /> - <Action name="game_create_server" /> - <Action name="game_create_client" /> - </ToolBar> - -<State name="playing"> - <enable> - <Action name="game_restart"/> - </enable> - <disable> - <Action name="options_adjacent"/> - </disable> -</State> - -</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/knavalbattle.desktop new/knavalbattle-4.11.90/src/knavalbattle.desktop --- old/knavalbattle-4.11.2/src/knavalbattle.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/src/knavalbattle.desktop 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1,93 @@ +[Desktop Entry] +Name=Naval Battle +Name[bs]=Pomorska bitka +Name[ca]=Batalla naval +Name[ca@valencia]=Batalla naval +Name[da]=Naval Battle +Name[de]=Naval Battle +Name[el]=Ναυμαχία +Name[en_GB]=Naval Battle +Name[es]=Batalla Naval +Name[et]=Merelahing +Name[fi]=Meritaistelu +Name[fr]=Bataille navale +Name[ga]=Comhrac Cabhlaigh +Name[gl]=Batalla Naval +Name[hu]=Tengeri csata +Name[it]=Battaglia navale +Name[kk]=Теңіз соғысы +Name[km]=ចម្បាំងតាមនាវា +Name[lt]=Jūrų mūšis +Name[lv]=Naval Battle +Name[mr]=नाविक युद्ध +Name[nb]=Sjøslag +Name[nds]=Scheep versenken +Name[nl]=Naval Battle +Name[pl]=Bitwa Morska +Name[pt]=Batalha Naval +Name[pt_BR]=Batalha Naval +Name[ro]=Bătălie navală +Name[ru]=Naval Battle +Name[sk]=Námorná bitka +Name[sl]=Potapljanje ladjic +Name[sr]=Поморска битка +Name[sr@ijekavian]=Поморска битка +Name[sr@ijekavianlatin]=Pomorska bitka +Name[sr@latin]=Pomorska bitka +Name[sv]=Sänka fartyg +Name[tr]=Amiral Battı +Name[ug]=دېڭىز ئۇرۇشى +Name[uk]=Морський бій +Name[x-test]=xxNaval Battlexx +Name[zh_CN]=Naval Battle +Name[zh_TW]=海上戰爭 +Exec=knavalbattle -caption %c %U +MimeType=inode/vnd.kde.service.knavalbattle; +Icon=knavalbattle +Type=Application +X-DocPath=knavalbattle/index.html +GenericName=Ship Sinking Game +GenericName[bs]=Igra potapanja brodova +GenericName[ca]=Joc d'enfonsar vaixells +GenericName[ca@valencia]=Joc d'enfonsar vaixells +GenericName[da]=Sænke slagskibe +GenericName[de]=Schiffe versenken +GenericName[el]=Παιχνίδι βύθισης πλοίων +GenericName[en_GB]=Ship Sinking Game +GenericName[es]=Juego de hundir barcos +GenericName[et]=Laevade pommitamise mäng +GenericName[fi]=Laivanupotuspeli +GenericName[fr]=Jeu de touché-coulé +GenericName[ga]=Cluiche Comhraic Chabhlaigh +GenericName[gl]=Xogo de afundir barcos. +GenericName[hu]=Hajóelsüllyesztő játék +GenericName[it]=Gioco di affondamento navi +GenericName[kk]=Теңіздегі соғыс ойны +GenericName[km]=ល្បែងពន្លិចកប៉ាល់ +GenericName[lt]=Laivų skandinimo žaidimas +GenericName[lv]=Kuģu gremdēšanas spēle +GenericName[mr]=नाव बुडविण्याचा खेळ +GenericName[nb]=Spill om å senke skip +GenericName[nds]=Scheep versenken +GenericName[nl]=Het spel voor het laten zinken van schepen +GenericName[pl]=Gra w zatapianie statków +GenericName[pt]=Jogo para Afundar Navios +GenericName[pt_BR]=Jogo para afundar navios +GenericName[ro]=Joc de scufundat corăbii +GenericName[ru]=Морской бой +GenericName[sk]=Potápanie lodí +GenericName[sl]=Igra potapljanja ladjic +GenericName[sr]=Игра потапања бродова +GenericName[sr@ijekavian]=Игра потапања бродова +GenericName[sr@ijekavianlatin]=Igra potapanja brodova +GenericName[sr@latin]=Igra potapanja brodova +GenericName[sv]=Sänka fartygsspel +GenericName[tr]=Gemi Batırma Oyunu +GenericName[ug]=كېمە چۆكتۈرۈش ئويۇنى +GenericName[uk]=Гра у битву кораблів +GenericName[x-test]=xxShip Sinking Gamexx +GenericName[zh_CN]=击沉舰船游戏 +GenericName[zh_TW]=擊沉船隻的遊戲 +Terminal=false +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Game;StrategyGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/knavalbattle.kcfg new/knavalbattle-4.11.90/src/knavalbattle.kcfg --- old/knavalbattle-4.11.2/src/knavalbattle.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/src/knavalbattle.kcfg 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE kcfg SYSTEM + "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd";> +<kcfg> + <kcfgfile name="knavalbattlerc"/> + <include>kglobalsettings.h</include> + <group name="network"> + <entry name="Hostname" type="String"> + <label>Default hostname for multiplayer games.</label> + <default>localhost</default> + </entry> + <entry name="Port" type="Int"> + <label>Default port for multiplayer games.</label> + <default>54321</default> + </entry> + </group> + <group name="general"> + <entry name="Nickname" type="String"> + <label>User nickname.</label> + </entry> + <entry name="EnableSounds" type="Bool"> + <label>Whether sound effects should be played.</label> + <default>false</default> + </entry> + <entry name="AdjacentShips" type="Bool"> + <label>Allow the ships to be adjacent without one empty space between them.</label> + <default>true</default> + </entry> + </group> +</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/knavalbattle.protocol new/knavalbattle-4.11.90/src/knavalbattle.protocol --- old/knavalbattle-4.11.2/src/knavalbattle.protocol 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/src/knavalbattle.protocol 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1,49 @@ +[Protocol] +protocol=kbattleship + +input=none +output=none + +Icon=kbattleship +Description=A protocol for the game Naval Battle +Description[bs]=Protokol za Pomorsku bitku +Description[ca]=Un protocol pel joc Batalla naval +Description[ca@valencia]=Un protocol pel joc Batalla naval +Description[da]=En protokol til spillet Naval Battle +Description[de]=Ein Protokoll für das Spiel Naval Battle +Description[el]=Ένα πρωτόκολλο για το παιχνίδι Ναυμαχία +Description[en_GB]=A protocol for the game Naval Battle +Description[es]=Protocolo para el juego Batalla Naval +Description[et]=Merelahingu protokoll +Description[fi]=Meritaistelu-pelin yhteyskäytäntö +Description[fr]=Un protocole pour le jeu de Bataille Navale +Description[ga]=Prótacal le haghaidh an chluiche Naval Battle +Description[gl]=Protocolo para o xogo Batalla Naval. +Description[hu]=Protokoll a Tengeri csata játékhoz +Description[it]=Un protocollo per Battaglia navale +Description[kk]=Теңіздегі соғыс ойынның протоколы +Description[km]=ពិធីការសម្រាប់ល្បែង នាវាចំបាំង +Description[lv]=Protokols spēlei Naval Battle +Description[mr]=नाविक युद्ध खेळाकरिता शिष्टाचार +Description[nb]=En protokoll for spillet Sjøslag +Description[nds]=En Protokoll för dat Speel "Scheep versenken" +Description[nl]=Een protocol voor het spel Naval Battle +Description[pl]=Protokół dla gry Bitwy Morskiej +Description[pt]=Um protocolo para o jogo da Batalha Naval +Description[pt_BR]=Um protocolo para o jogo Batalha Naval +Description[ru]=Протокол для игры Naval Battle +Description[sk]=Protokol pre hru Námorná bitka +Description[sl]=Protokol za igro Potapljanje ladjic +Description[sr]=Протокол за Поморску битку +Description[sr@ijekavian]=Протокол за Поморску битку +Description[sr@ijekavianlatin]=Protokol za Pomorsku bitku +Description[sr@latin]=Protokol za Pomorsku bitku +Description[sv]=Ett protokoll för spelet Sänka fartyg +Description[tr]=Amiral Battı oyunu protokolü +Description[uk]=Протокол для гри у морський бій +Description[x-test]=xxA protocol for the game Naval Battlexx +Description[zh_CN]=Naval Battle 的游戏用协议 +Description[zh_TW]=海上戰爭遊戲使用的協定 + +helper=true +Class=:internet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/knavalbattleui.rc new/knavalbattle-4.11.90/src/knavalbattleui.rc --- old/knavalbattle-4.11.2/src/knavalbattleui.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-4.11.90/src/knavalbattleui.rc 2013-10-18 18:17:06.000000000 +0200 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gui name="knavalbattle" + version="5" + xmlns="http://www.kde.org/standards/kxmlgui/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 + http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd";> + +<MenuBar> + <Menu name="game"> + <Action name="game_server" /> + <Action name="game_client" /> + <Action name="game_local" /> + <Action name="game_create_server" /> + <Action name="game_create_client" /> + </Menu> + <Menu name="settings"> + <Action name="options_nickname" /> + <Action name="options_sounds" /> + <Action name="options_adjacent" /> + <Action name="options_show_endgame_message" /> + <Action name="options_showleftgrid" /> + <Action name="options_showrightgrid" /> + </Menu> +</MenuBar> + +<ToolBar name="gameToolbar" > + <text>Game Toolbar</text> + <Action name="game_new" /> + <Action name="game_restart" /> + <Action name="game_local" /> + <Action name="game_create_server" /> + <Action name="game_create_client" /> + </ToolBar> + +<State name="playing"> + <enable> + <Action name="game_restart"/> + </enable> + <disable> + <Action name="options_adjacent"/> + </disable> +</State> + +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/main.cpp new/knavalbattle-4.11.90/src/main.cpp --- old/knavalbattle-4.11.2/src/main.cpp 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/main.cpp 2013-10-18 18:17:06.000000000 +0200 @@ -21,7 +21,7 @@ int main(int argc, char** argv) { - KAboutData aboutData("kbattleship", 0, ki18n("Naval Battle"), "2.0", + KAboutData aboutData("knavalbattle", 0, ki18n("Naval Battle"), "2.0", ki18n("The KDE ship sinking game"), KAboutData::License_GPL, ki18n("(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin\n" "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship"; ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/playerentity.cpp new/knavalbattle-4.11.90/src/playerentity.cpp --- old/knavalbattle-4.11.2/src/playerentity.cpp 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/playerentity.cpp 2013-10-18 18:17:06.000000000 +0200 @@ -106,13 +106,6 @@ void PlayerEntity::notify(Sea::Player player, const Coord& c, const HitInfo& info) { UIEntity::notify(player, c, info); - - // add a border around sunk ship in KBS3 mode - if (m_level == COMPAT_KBS3 && - player == m_player && - info.shipDestroyed) { - m_sea->addBorder(player, info.shipPos); - } } void PlayerEntity::changeDirection(Sea::Player player) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/playfield.cpp new/knavalbattle-4.11.90/src/playfield.cpp --- old/knavalbattle-4.11.2/src/playfield.cpp 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/playfield.cpp 2013-10-18 18:17:06.000000000 +0200 @@ -206,7 +206,7 @@ else { m_status_bar->showMessage(i18n("You lose.")); if (m_show_endofgame_message) { - KMessageBox::information(this, i18n("You lose. Try harder next time!")); + KMessageBox::information(this, i18n("You lose. Better luck next time!")); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/sea.h new/knavalbattle-4.11.90/src/sea.h --- old/knavalbattle-4.11.2/src/sea.h 2013-08-28 19:11:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/sea.h 2013-10-18 18:17:06.000000000 +0200 @@ -67,6 +67,7 @@ inline Player turn() const { return m_turn; } static Player opponent(Player p); inline Coord size() const { return m_size; } + inline bool isAdjacentShipsAllowed() const { return m_allow_adjacent_ships; } }; #endif // Sea_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-4.11.2/src/settingsbase.kcfgc new/knavalbattle-4.11.90/src/settingsbase.kcfgc --- old/knavalbattle-4.11.2/src/settingsbase.kcfgc 2013-06-28 19:47:50.000000000 +0200 +++ new/knavalbattle-4.11.90/src/settingsbase.kcfgc 2013-10-18 18:17:06.000000000 +0200 @@ -1,4 +1,4 @@ -File=kbattleship.kcfg +File=knavalbattle.kcfg ClassName=SettingsBase Singleton=true Mutators=true -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
