Merge pull request #223 from RElesgoe/master

Sync

conf/supportfile.conf.in

@@ -2,8 +2,7 @@
 # some lines are commented out, cause they weren't installed by default in older versions
 
 IX86ver1.mpq
-ver-ix86-1.mpq
-ver-IX86-2.mpq
+ver-IX86-1.mpq
 PMACver1.mpq
 XMACver1.mpq
 bnserver-D2DV.ini

conf/versioncheck.conf.in

@@ -64,38 +64,26 @@
 # Warcraft III - TFT (Expansion) 1.27a
 # Note: this version check is sent in both FT and ROC mode
 "B=454282227 C=2370009462 A=2264812340 4 A=A^S B=B-C C=C-A A=A+B" \
- ver-IX86-2.mpq \
+ ver-IX86-1.mpq \
  IX86 \
  W3XP \
- "war3.exe 02/11/16 22:40:40 514536" \
+ "War3.exe 08/05/16 03:15:27 514536" \
  0x0000001b \
  1.27.0.16 \
- 0x5714f86e \
+ 0x960947fd \
  W3XP_127A
 
-# Warcraft III - TFT (Expansion) 1.26a
+# Warcraft III - ROC 1.27a
 # Note: this version check is sent in both FT and ROC mode
-"A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \
- IX86ver1.mpq \
- IX86 \
- W3XP \
- "war3.exe 03/18/11 20:03:55 471040" \
- 0x0000001a \
- 1.26.0.1 \
- 0xf2e7cec2 \
- W3XP_126A
-
-# Warcraft III - ROC 1.26a
-# Note: this version check is sent in both FT and ROC mode
-"A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \
- IX86ver1.mpq \
+"B=454282227 C=2370009462 A=2264812340 4 A=A^S B=B-C C=C-A A=A+B" \
+ ver-IX86-1.mpq \
  IX86 \
  WAR3 \
- "war3.exe 03/18/11 20:03:55 471040" \
- 0x0000001a \
- 1.26.0.1 \
- 0xf2e7cec2 \
- WAR3_126A
+ "War3.exe 08/05/16 03:15:27 514536" \
+ 0x0000001b \
+ 1.27.0.16 \
+ 0x960947fd \
+ WAR3_127A
 
 # Diablo II - LoD (Expansion) 1.13c
 "A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \
@@ -166,6 +154,29 @@
 # -=-=-=-=-=- Older Versions -=-=-=-=-=-=- Update Required -=-=-=-=-=-
 
 # =================== WarCraft 3 Expansion Entries ==================
+# Warcraft III - TFT (Expansion) 1.26a
+# Note: this version check is sent in both FT and ROC mode
+"A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \
+ IX86ver1.mpq \
+ IX86 \
+ W3XP \
+ "war3.exe 03/18/11 20:03:55 471040" \
+ 0x0000001a \
+ 1.26.0.1 \
+ 0xf2e7cec2 \
+ W3XP_126A
+
+# Warcraft III - ROC 1.26a
+# Note: this version check is sent in both FT and ROC mode
+"A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \
+ IX86ver1.mpq \
+ IX86 \
+ WAR3 \
+ "war3.exe 03/18/11 20:03:55 471040" \
+ 0x0000001a \
+ 1.26.0.1 \
+ 0xf2e7cec2 \
+ WAR3_126A
 
 # Warcraft III - TFT (Expansion) 1.25b
 # Note: this version check is sent in both FT and ROC mode

docs/adbanners.md

@@ -1,21 +1,32 @@
 # Ad Banners
 ---
 
-- The only graphic formats that Blizzard clients support are
-    - PCX
-    - SMK
-    - MNG
+### Configuration File
+The configuration file consists of a single array named ````ads```` which can contain an unlimited number of elements. Each element contains 4 pairs in the following order: ````filename````, ````url````, ````client````, and ````lang````.
+- ````filename````: A string containing the filename of the ad banner, should not include a path.
+- ````url````: A string containing the URL that users should be directed to when clicking on the ad banner.
+- ````client````: A string containing the 4 character client tag that the ad banner should be shown to, a string of "NULL" will cause the ad banner to be shown to any client.
+- ````lang````: A string containing a 4 character language code that will be displayed to users who have enabled that particular language, a string of "any" will cause the ad banner to be shown to any user. (e.g. deDE for German, enUS for English)
 
-- These are old and therefore uncommon formats that require specific software to create and modify. PCX allows still images while SMK and MNG formats allow animated images.
+### File Formats
+| Client     | Banner Format |
+|------------|---------------|
+| StarCraft  | PCX, SMK      |
+| Diablo 2   | ?             |
+| WarCraft 2 | PCX           |
+| WarCraft 3 | SMK, MNG, PNG |
+
+### Banner Dimensions
 - The dimensions for ad banners are **468 x 60** pixels
 
-- It is not known how to create PCX files that will display properly in PvPGN
-- Only WarCraft III supports the MNG format
----
-1. Download the [Old Smacker Tools](http://www.broodwarai.com/downloads/tools/OldSmackerTools.exe)(this only works on Windows XP)
+### How To Create SMK Files
+1. Download the [Old Smacker Tools](http://files.campaigncreations.org/resources/sc/programs/RADTools.zip)(this only works on Windows XP)
 2. Run *smackerw.exe* and then click on the *Smack (compress) a graphics file.*
 3. On the left side, navigate to the folder where your ad banner is stored and select it.
 4. Under *Options*, click on the *Palette* tab. Check *Total palette colors to use:*, set it to *64* and check *Starting palette index to use:*, set it to *32*.
 5. Set *8-bit input palettes* to *Create new.*
 5. Click on the *Frame* tab and check *Create ring?*
 6. *Smack!*
+
+### Notes
+- It is not known how to create PCX files that will display properly in PvPGN

files/CMakeLists.txt

@@ -19,6 +19,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/var/ DESTINATION ${LOCALSTATEDIR})
 
 install(FILES ad000001.png ad000001.smk ad000002.mng newbie.save
 	bnserver.ini bnserver-D2DV.ini bnserver-D2XP.ini bnserver-WAR3.ini
-	ver-ix86-1.mpq ver-IX86-2.mpq IX86ver1.mpq PMACver1.mpq XMACver1.mpq IX86ExtraWork.mpq
+	ver-IX86-1.mpq IX86ver1.mpq PMACver1.mpq XMACver1.mpq IX86ExtraWork.mpq
 	icons.bni icons-WAR3.bni
     DESTINATION ${LOCALSTATEDIR}/files)