change http to https

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}")

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.

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

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

macosx/Resources/Warzone-Info.plist.in

@@ -63,7 +63,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>net.wz2100.wz</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://developer.wz2100.net/wiki/ModsAndMaps</string>
+			<string>https://developer.wz2100.net/wiki/ModsAndMaps</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
@@ -82,7 +82,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>net.wz2100.wz.mod</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://developer.wz2100.net/wiki/ModsAndMaps</string>
+			<string>https://developer.wz2100.net/wiki/ModsAndMaps</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
@@ -101,7 +101,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>net.wz2100.wz.cam</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://developer.wz2100.net/wiki/ModsAndMaps</string>
+			<string>https://developer.wz2100.net/wiki/ModsAndMaps</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
@@ -120,7 +120,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>net.wz2100.wz.gmod</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://developer.wz2100.net/wiki/ModsAndMaps</string>
+			<string>https://developer.wz2100.net/wiki/ModsAndMaps</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
@@ -139,7 +139,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>net.wz2100.wz.music</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://developer.wz2100.net/wiki/ModsAndMaps</string>
+			<string>https://developer.wz2100.net/wiki/ModsAndMaps</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>

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.
 
 

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.

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

pkg/dpkg/copyright

@@ -2,7 +2,7 @@ This package was debianized by Angus Lees <[email protected]> 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:
 

pkg/dpkg/videos/debian/control

@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Warzone 2100 Project <[email protected]>
 Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.8.4
-Homepage: http://wz2100.net/
+Homepage: https://wz2100.net/
 
 Package: warzone2100-video
 Architecture: all

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:
 

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)
 

src/frontend.cpp

@@ -95,7 +95,9 @@ bool			bLimiterLoaded = false;
 static std::shared_ptr<IMAGEFILE> 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();
 	}
 }

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
 

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