diff --git a/CMakeLists.txt b/CMakeLists.txt index 3725c7fecf2..804efd8fe9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,7 +672,7 @@ include_directories(SYSTEM "3rdparty/date/include") SET(STDC_HEADERS ON) SET(PACKAGE "warzone2100${WZ_OUTPUT_NAME_SUFFIX}") -SET(PACKAGE_BUGREPORT "http://wz2100.net/") +SET(PACKAGE_BUGREPORT "https://wz2100.net/") SET(PACKAGE_NAME "Warzone 2100") SET(PACKAGE_TARNAME "warzone2100") SET(PACKAGE_DISTRIBUTOR "${WZ_DISTRIBUTOR}") diff --git a/ChangeLog b/ChangeLog index 1b6437186af..90baaf8ded2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1411,7 +1411,7 @@ * Fix: Still/moving helicopter/VTOL animations were reversed (commit:fb9bea5e0adc24a1a0de14ebdc883168380e5576, ticket:4489) * Fix: Prevent structure turret stretching again (commit:f79286dc13562e8b1277be0ab120a79f7d2d2fa7, ticket:4537) * Campaign: - * Change: Lots of initial campaign ported to Javascript. Discuss these changes in our new porting forum here: http://forums.wz2100.net/viewforum.php?f=51 + * Change: Lots of initial campaign ported to Javascript. Discuss these changes in our new porting forum here: https://forums.wz2100.net/viewforum.php?f=51 * Scripting: * Change: Function donateObject() works on structures. Function findResearch() works on other players (commit:839e0b0f5c0ec3a2b5b6018d1c82697db0804d22) * Add: New function hackDoNotSave(global name) to prevent variable from being put in savegames (commit:ff57dc5733b69123b76a8f5dc469c4555f7b49f1) @@ -3592,7 +3592,7 @@ master_20110320qt and before: * New: Units and structures will constantly look for a better target taking into consideration targets of the friendly units nearby - won't lock on one target forever anymore. * Skirmish/Multiplayer AI: - * New: Enabled basic level of Human-AI cooperation, for more information visit: http://wz2100.net/wiki/gameplay:cooperative_ai + * New: Enabled basic level of Human-AI cooperation, for more information visit: https://wz2100.net/wiki/gameplay:cooperative_ai * New: AI units now return to defend its own base when it's in trouble. * Improved: AI is faster at producing units, upgrading structures and oil capturing. * Several other improvements. diff --git a/appveyor.yml b/appveyor.yml index 284cedeaa4a..38eb828ab5f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ environment: WZ_JOB_ID: release_x86 wz_deploy_build: true # NOTE: Additional environment variables are set later to maintain consistent job identifiers - ## NOTE: Unfortunately, 64-bit Windows builds are currently broken because of QScript (see: http://developer.wz2100.net/ticket/4763) + ## NOTE: Unfortunately, 64-bit Windows builds are currently broken because of QScript (see: https://developer.wz2100.net/ticket/4763) ## Whenever that ticket is resolved, the following will build 64-bit: # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 # WZ_JOB_ID: release_x64 diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h index 3e26f256c28..af3609ef78c 100644 --- a/lib/framework/wzglobal.h +++ b/lib/framework/wzglobal.h @@ -39,7 +39,7 @@ # include "config.h" #elif !defined(HAVE_CONFIG_H) # define PACKAGE "warzone2100" -# define PACKAGE_BUGREPORT "http://wz2100.net/" +# define PACKAGE_BUGREPORT "https://wz2100.net/" # define PACKAGE_NAME "Warzone 2100" # define PACKAGE_TARNAME "warzone2100" #endif diff --git a/macosx/Resources/Warzone-Info.plist.in b/macosx/Resources/Warzone-Info.plist.in index e19b5954b55..6a6b8ad093e 100644 --- a/macosx/Resources/Warzone-Info.plist.in +++ b/macosx/Resources/Warzone-Info.plist.in @@ -63,7 +63,7 @@ UTTypeIdentifier net.wz2100.wz UTTypeReferenceURL - http://developer.wz2100.net/wiki/ModsAndMaps + https://developer.wz2100.net/wiki/ModsAndMaps UTTypeTagSpecification public.filename-extension @@ -82,7 +82,7 @@ UTTypeIdentifier net.wz2100.wz.mod UTTypeReferenceURL - http://developer.wz2100.net/wiki/ModsAndMaps + https://developer.wz2100.net/wiki/ModsAndMaps UTTypeTagSpecification public.filename-extension @@ -101,7 +101,7 @@ UTTypeIdentifier net.wz2100.wz.cam UTTypeReferenceURL - http://developer.wz2100.net/wiki/ModsAndMaps + https://developer.wz2100.net/wiki/ModsAndMaps UTTypeTagSpecification public.filename-extension @@ -120,7 +120,7 @@ UTTypeIdentifier net.wz2100.wz.gmod UTTypeReferenceURL - http://developer.wz2100.net/wiki/ModsAndMaps + https://developer.wz2100.net/wiki/ModsAndMaps UTTypeTagSpecification public.filename-extension @@ -139,7 +139,7 @@ UTTypeIdentifier net.wz2100.wz.music UTTypeReferenceURL - http://developer.wz2100.net/wiki/ModsAndMaps + https://developer.wz2100.net/wiki/ModsAndMaps UTTypeTagSpecification public.filename-extension diff --git a/pkg/dpkg/README b/pkg/dpkg/README index 570af047573..c1d7b667736 100644 --- a/pkg/dpkg/README +++ b/pkg/dpkg/README @@ -13,7 +13,7 @@ play. Install them as root with "dpkg -i warzone*.deb". For the videos, download the sequences.wz you want from -http://wz2100.net/download, put it into pkg/dpkg/video, then run +https://wz2100.net/download, put it into pkg/dpkg/video, then run "dpkg-buildpackage -uc -b" from that folder. diff --git a/pkg/dpkg/changelog b/pkg/dpkg/changelog index dc3196bd33f..92054c2fe7a 100644 --- a/pkg/dpkg/changelog +++ b/pkg/dpkg/changelog @@ -276,7 +276,7 @@ warzone2100 (2.1.0~beta1-0) unstable; urgency=low on one target forever anymore. * Skirmish/Multiplayer AI: * New: Enabled basic level of Human-AI cooperation, for more information - visit: http://wz2100.net/wiki/gameplay:cooperative_ai + visit: https://wz2100.net/wiki/gameplay:cooperative_ai * New: AI units now return to defend its own base when it's in trouble. * Improved: AI is faster at producing units, upgrading structures and oil capturing. diff --git a/pkg/dpkg/control b/pkg/dpkg/control index b212daa9b8f..9e8796cd1a0 100644 --- a/pkg/dpkg/control +++ b/pkg/dpkg/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7), zip, unzip Standards-Version: 3.8.4 -Homepage: http://www.wz2100.net/ +Homepage: https://wz2100.net/ Package: warzone2100 Architecture: any diff --git a/pkg/dpkg/copyright b/pkg/dpkg/copyright index fa9ddd6143e..f191eedc023 100644 --- a/pkg/dpkg/copyright +++ b/pkg/dpkg/copyright @@ -2,7 +2,7 @@ This package was debianized by Angus Lees on Mon, 27 Mar 2006 21:31:19 +0100. Copyright Holder: originally Pumpkin Studios - Now developed by the Warzone 2100 Project, http://wz2100.net. + Now developed by the Warzone 2100 Project, https://wz2100.net. License: diff --git a/pkg/dpkg/videos/debian/control b/pkg/dpkg/videos/debian/control index 52235c95ce9..d15bed88491 100644 --- a/pkg/dpkg/videos/debian/control +++ b/pkg/dpkg/videos/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Warzone 2100 Project Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.4 -Homepage: http://wz2100.net/ +Homepage: https://wz2100.net/ Package: warzone2100-video Architecture: all diff --git a/pkg/dpkg/videos/debian/copyright b/pkg/dpkg/videos/debian/copyright index 6f2126b6af2..13a15f38797 100644 --- a/pkg/dpkg/videos/debian/copyright +++ b/pkg/dpkg/videos/debian/copyright @@ -4,7 +4,7 @@ This work was packaged for Debian by: It was downloaded from: - http://wz2100.net/ + https://wz2100.net/ License: diff --git a/pkg/rpm/warzone2100.spec b/pkg/rpm/warzone2100.spec index 2e71738e7ec..8a03cd1f2cb 100644 --- a/pkg/rpm/warzone2100.spec +++ b/pkg/rpm/warzone2100.spec @@ -6,7 +6,7 @@ Summary: Innovative 3D real-time strategy Group: Amusements/Games License: GPLv2+ and CC-BY-SA -URL: http://wz2100.net/ +URL: https://wz2100.net/ Source0: http://download.gna.org/warzone/releases/2.2/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/src/frontend.cpp b/src/frontend.cpp index 0de084175de..f4166700837 100644 --- a/src/frontend.cpp +++ b/src/frontend.cpp @@ -95,7 +95,9 @@ bool bLimiterLoaded = false; static std::shared_ptr pFlagsImages; #define TUTORIAL_LEVEL "TUTORIAL3" -#define TRANSLATION_URL "https://translate.wz2100.net" +#define HOMEPAGE_URL "https://wz2100.net/" +#define DONATIONS_URL "https://donations.wz2100.net/" +#define TRANSLATION_URL "https://translate.wz2100.net/" // //////////////////////////////////////////////////////////////////////////// // Forward definitions @@ -162,12 +164,12 @@ static void runUpgrdHyperlink() static void runHyperlink() { - openURLInBrowser("https://wz2100.net/"); + openURLInBrowser(HOMEPAGE_URL); } static void rundonatelink() { - openURLInBrowser("http://donations.wz2100.net/"); + openURLInBrowser(DONATIONS_URL); } static void runchatlink() @@ -216,7 +218,7 @@ void startTitleMenu() else { addTextButton(FRONTEND_PLAYINTRO, FRONTEND_POS6X, FRONTEND_POS6Y, _("View Intro"), WBUT_TXTCENTRE | WBUT_DISABLE); - widgSetTip(psWScreen, FRONTEND_PLAYINTRO, _("Videos are missing, download them from http://wz2100.net")); + widgSetTip(psWScreen, FRONTEND_PLAYINTRO, astringf(_("Videos are missing, download them from %s"), HOMEPAGE_URL).c_str()); notifyAboutMissingVideos(); } @@ -233,9 +235,9 @@ void startTitleMenu() addTextButton(FRONTEND_QUIT, FRONTEND_POS8X, FRONTEND_POS8Y, _("Quit Game"), WBUT_TXTCENTRE); addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("MAIN MENU")); - addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, _("Official site: http://wz2100.net/"), 0); + addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, astringf(_("Official site: %s"), HOMEPAGE_URL).c_str(), 0); widgSetTip(psWScreen, FRONTEND_HYPERLINK, _("Come visit the forums and all Warzone 2100 news! Click this link.")); - W_BUTTON * pRightAlignedButton = addSmallTextButton(FRONTEND_DONATELINK, FRONTEND_POS9X + 360, FRONTEND_POS9Y, _("Donate: http://donations.wz2100.net/"), 0); + W_BUTTON * pRightAlignedButton = addSmallTextButton(FRONTEND_DONATELINK, FRONTEND_POS9X + 360, FRONTEND_POS9Y, astringf(_("Donate: %s"), DONATIONS_URL).c_str(), 0); moveToParentRightEdge(pRightAlignedButton, 1); widgSetTip(psWScreen, FRONTEND_DONATELINK, _("Help support the project with our server costs, Click this link.")); pRightAlignedButton = addSmallTextButton(FRONTEND_CHATLINK, FRONTEND_POS9X + 360, 0, _("Chat with players on Discord or IRC"), 0); @@ -380,7 +382,7 @@ void startSinglePlayerMenu() // show this only when the video sequences are not installed if (!seq_hasVideos()) { - addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, _("Campaign videos are missing! Get them from http://wz2100.net"), 0); + addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, astringf(_("Campaign videos are missing! Get them from %s"), HOMEPAGE_URL).c_str(), 0); notifyAboutMissingVideos(); } } @@ -402,7 +404,7 @@ void startCampaignSelector() // show this only when the video sequences are not installed if (!seq_hasVideos()) { - addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, _("Campaign videos are missing! Get them from http://wz2100.net"), 0); + addSmallTextButton(FRONTEND_HYPERLINK, FRONTEND_POS9X, FRONTEND_POS9Y, astringf(_("Campaign videos are missing! Get them from %s"), HOMEPAGE_URL).c_str(), 0); notifyAboutMissingVideos(); } } diff --git a/tools/conversion/pie2wzm.c b/tools/conversion/pie2wzm.c index 391ea6dbc2f..99d50d068c6 100644 --- a/tools/conversion/pie2wzm.c +++ b/tools/conversion/pie2wzm.c @@ -35,7 +35,7 @@ typedef int bool; #endif // The WZM format is a proposed successor to the PIE format used by Warzone. -// For an explanation of the WZM format, see http://developer.wz2100.net/wiki/WZM_format +// For an explanation of the WZM format, see https://developer.wz2100.net/wiki/WZM_format // To compile: gcc -o pie2wzm pie2wzm.c -Wall -g -O0 -Wshadow diff --git a/tools/display/wzmviewer.c b/tools/display/wzmviewer.c index 5e36cd74de9..efa9894143d 100644 --- a/tools/display/wzmviewer.c +++ b/tools/display/wzmviewer.c @@ -33,7 +33,7 @@ #endif // The WZM format is a proposed successor to the PIE format used by Warzone. -// For an explanation of the WZM format, see http://developer.wz2100.net/wiki/WZM_format +// For an explanation of the WZM format, see https://developer.wz2100.net/wiki/WZM_format // To compile: gcc -o wzmviewer wzmviewer.c wzmutils.c -Wall -g -O0 -Wshadow -lpng `sdl-config --libs --cflags` -lGL -lGLU diff --git a/tools/guidecode/guide.inc.php b/tools/guidecode/guide.inc.php index b12acc4470c..a9be40408bd 100644 --- a/tools/guidecode/guide.inc.php +++ b/tools/guidecode/guide.inc.php @@ -29,7 +29,7 @@

Of course, we need a better, more dynamic approach before we can actually put this page in use. For example using PHP or the wiki. This version is only an example of how it COULD look, and meant primarly for getting as much feedback as possible, so we can use the maximum potential.

For now, this page contains some random suggestions. These are all scraped from the warzone forums without mentioning who suggested them. If any content on this page is your property, and you would like to see it removed, please post in the appropriate forum thread.

For more \'about\'-information, look below the list!

-

All discussion about this page can be found here: http://forums.wz2100.net/viewtopic.php?f=2&t=2212. Please help us improve this page by giving your opinion!

+

All discussion about this page can be found here: https://forums.wz2100.net/viewtopic.php?f=2&t=2212. Please help us improve this page by giving your opinion!

Features List

GUI

@@ -132,7 +132,7 @@ Gates
Mod
- + Optional, requires ctrl + click @@ -255,10 +255,10 @@

The wishlist topics can be found here:

  1. - Wishlist 1
  2. + Wishlist 1 -
  3. Wishlist 2
  4. -
  5. Wishlist 3
  6. +
  7. Wishlist 2
  8. +
  9. Wishlist 3

Why this list?

    @@ -277,12 +277,12 @@
  • Look for topics discussing certain existing features and add them to this list.
  • Do useful feature requests the right way!
  • Update the progress in this list (not available yet, since you can not edit it).
  • -
  • Discuss everything about this page. Colors, categories,... Everything is welcome!
  • +
  • Discuss everything about this page. Colors, categories,... Everything is welcome!
  • Especially, discuss the best way to put this page in use, technically.
  • Always keep looking for ways to do things the best way.
-

All discussion about this page can be found here: http://forums.wz2100.net/viewtopic.php?f=2&t=2212. Please help us improve this page by giving your opinion!

', +

All discussion about this page can be found here: https://forums.wz2100.net/viewtopic.php?f=2&t=2212. Please help us improve this page by giving your opinion!

', 'cachedsb' => '
  • Introduction
  • Features List
  • About this page
  • Wishlist
  • Why this list?
  • How to help?' ), 'b' => array( @@ -381,7 +381,7 @@ function resizemovie(nsize)

    Larger size »

    @@ -464,13 +464,13 @@ function resizemovie(nsize)

    Warzone can be downloaded from:

    - +

    On most distributions of Linux, Warzone should be available in your repositories. However, these are often outdated, and you are encouraged to compile Warzone yourself, which is the usual:

    ./configure && make

    -For compiling tips on other platforms, or if the above fails, see the Compile Guide. +For compiling tips on other platforms, or if the above fails, see the Compile Guide.

    Playing Warzone

    @@ -1389,11 +1389,11 @@ function resizemovie(nsize) C:/Program Files/Warzone 2100/mods/multiplay/rebalance_0.5.1.wz

    -Refer to the FAQ for installation information. +Refer to the FAQ for installation information.

    -In other platforms, mods must be enabled with command-line options. +In other platforms, mods must be enabled with command-line options.

    Changelog

      @@ -2245,11 +2245,11 @@ function resizemovie(nsize) 'autogen' => TRUE, 'text' => '

      The walkthrough is incomplete.

      -For a more complete walkthrough, see New Walkthrough by themousemaster1, which is the walkthrough which I will eventually adapt into the current Warzone Guide. +For a more complete walkthrough, see New Walkthrough by themousemaster1, which is the walkthrough which I will eventually adapt into the current Warzone Guide.

      -