ChangeLog

@@ -1,3 +1,19 @@
+2012-05-13: Version 3.1 beta10
+ * General:
+   * Fix: Loading of skirmish games (ticket:3451, commit:18216c60e76d05ad0fe2bf7d860347f76f70c8f8)
+   * Fix: Scavengers in Fast Play are on their own team again (ticket:3447, commit:c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c)
+   * Fix: Allow building the designed unit in the tutorial (ticket:3058, commit:7079ad295112abcd83e6be1e7c172d36aec64c25)
+ * Multiplayer:
+   * Fix: Don't desync occasionally when some player slots are empty (commit:1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409, commit:ef685d0b892327b6e8af90da0ade792575925e3d)
+   * Fix: Don't tell players who lost that they won (ticket:3449, commit:25e118c628881f20411d027ff2d48e8a63a44730)
+ * Graphics:
+   * Change: Updated texture for the urban building features (commit:4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9)
+   * Fix: Team colour mask on Plasmite Flamer, Sunburst AA and AA Flak Cannon (ticket:3433, commit:e36cdf11e827e85c79cbd9319507809c1fae838b)
+ * Translations:
+   * Update: Hungarian (ticket:3458, ticket:3470, commit:0def25206b7d23788919a2aa067e880626e542fc, commit:9bed66e764a176b7b4b448df5e1f534e1991c450)
+   * Update: Spanish (ticket:3473, commit:baa143872208ba54bec2dc41213ca622209e4868)
+
+
 2012-05-04: Version 3.1_beta9
  * General:
    * Change: Save campaign and skirmish games separately (ticket:3377, commit:d8789661fbffe2f648a06a0689de3a9350bbe8b0)

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1_beta9],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1_beta10],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 

data/base/components/weapons/trmair2.pie

@@ -3,86 +3,86 @@ TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1
-POINTS 32 
-	-12 1 -7 
-	-12 12 -3 
-	11 12 1 
-	11 0 -19 
-	14 0 15 
-	13 2 2 
-	12 9 18 
-	16 30 23 
-	17 5 15 
-	16 4 17 
-	11 6 -3 
-	-12 6 -3 
-	11 1 -7 
-	11 3 -14 
-	-12 3 -14 
-	-12 12 1 
-	-12 12 10 
-	11 12 -3 
-	-15 0 18 
-	-15 0 -1 
-	14 0 -1 
-	-12 0 -19 
-	14 0 18 
-	-12 12 20 
-	12 12 20 
-	12 12 5 
-	22 11 3 
-	19 9 16 
-	21 1 14 
-	24 4 2 
-	14 4 16 
+POINTS 32
+	-12 1 -7
+	-12 12 -3
+	11 12 1
+	11 0 -19
+	14 0 15
+	13 2 2
+	12 9 18
+	16 30 23
+	17 5 15
+	16 4 17
+	11 6 -3
+	-12 6 -3
+	11 1 -7
+	11 3 -14
+	-12 3 -14
+	-12 12 1
+	-12 12 10
+	11 12 -3
+	-15 0 18
+	-15 0 -1
+	14 0 -1
+	-12 0 -19
+	14 0 18
+	-12 12 20
+	12 12 20
+	12 12 5
+	22 11 3
+	19 9 16
+	21 1 14
+	24 4 2
+	14 4 16
 	12 12 10
 POLYGONS 49
-	4200 3 12 10 13 8 1 8 1 174 217 171 218 175 221
-	4200 3 13 10 17 8 1 8 1 175 221 171 218 170 221
-	4200 3 0 14 11 8 1 8 1 174 217 175 221 171 218
-	4200 3 11 14 1 8 1 8 1 171 218 175 221 170 221
+	200 3 12 10 13 174 217 171 218 175 221
+	200 3 13 10 17 175 221 171 218 170 221
+	200 3 0 14 11 174 217 175 221 171 218
+	200 3 11 14 1 171 218 175 221 170 221
 	200 3 2 10 15 35 176 42 176 35 191
 	200 3 15 10 11 35 191 42 176 42 191
 	200 3 0 11 12 45 191 42 191 45 176
 	200 3 12 11 10 45 176 42 191 42 176
-	4200 3 13 0 12 8 1 16 1 129 204 143 201 129 201
-	4200 3 0 13 14 8 1 16 1 143 201 129 204 143 204
-	4200 3 1 14 19 8 1 25 1 9 20 3 24 10 27
-	4200 3 19 14 21 8 1 25 1 10 27 3 24 0 27
-	4200 3 1 19 15 8 1 25 1 9 20 10 27 13 20
-	4200 3 15 19 16 8 1 25 1 13 20 10 27 19 20
-	4200 3 13 3 14 8 1 16 1 129 204 129 207 143 204
-	4200 3 14 3 21 8 1 16 1 143 204 129 207 143 207
-	4200 3 10 2 17 8 1 8 1 171 218 168 218 170 221
-	4200 3 1 15 11 8 1 8 1 170 221 168 218 171 218
+	200 3 13 0 12 129 204 143 201 129 201
+	200 3 0 13 14 143 201 129 204 143 204
+	200 3 1 14 19 9 20 3 24 10 27
+	200 3 19 14 21 10 27 3 24 0 27
+	200 3 1 19 15 9 20 10 27 13 20
+	200 3 15 19 16 13 20 10 27 19 20
+	200 3 13 3 14 129 204 129 207 143 204
+	200 3 14 3 21 143 204 129 207 143 207
+	200 3 10 2 17 171 218 168 218 170 221
+	200 3 1 15 11 170 221 168 218 171 218
 	200 3 15 16 2 35 191 30 191 35 176
 	200 3 2 16 31 35 176 30 191 30 176
-	4200 3 17 20 13 8 1 25 1 9 20 10 27 3 24
-	4200 3 13 20 3 8 1 25 1 3 24 10 27 0 27
-	4200 3 17 2 20 8 1 25 1 9 20 13 20 10 27
-	4200 3 20 2 31 8 1 25 1 10 27 13 20 19 20
-	4200 3 18 23 19 8 1 25 1 23 27 24 20 10 27
-	4200 3 3 20 21 8 1 16 1 26 174 24 168 35 174
-	4200 3 18 19 22 8 1 16 1 37 160 37 168 24 160
-	4200 3 22 19 20 8 1 16 1 24 160 37 168 24 168
-	4200 3 19 21 20 8 1 16 1 37 168 35 174 24 168
-	4200 3 20 24 22 8 1 25 1 10 27 24 20 23 27
-	4200 3 22 24 18 8 1 18 1 0 47 2 38 17 47
-	4200 3 18 24 23 8 1 18 1 17 47 2 38 16 38
-	4200 3 4 5 28 8 1 16 1 10 131 0 131 9 137
-	4200 3 28 5 29 8 1 16 1 9 137 0 131 0 139
-	4200 3 25 26 5 8 1 18 1 4 28 13 30 4 37
-	4200 3 5 26 29 8 1 18 1 4 37 13 30 13 36
-	4200 3 6 27 25 8 1 16 1 10 131 9 137 0 131
-	4200 3 25 27 26 8 1 16 1 0 131 9 137 0 139
-	4200 3 6 4 27 8 1 16 1 4 14 4 3 11 12
-	4200 3 27 4 28 8 1 16 1 11 12 4 3 11 3
-	4200 3 28 29 27 8 1 15 1 6 120 5 126 0 120
-	4200 3 27 29 26 8 1 15 1 0 120 5 126 0 126
+	200 3 17 20 13 9 20 10 27 3 24
+	200 3 13 20 3 3 24 10 27 0 27
+	200 3 17 2 20 9 20 13 20 10 27
+	200 3 20 2 31 10 27 13 20 19 20
+	200 3 18 23 19 23 27 24 20 10 27
+	200 3 3 20 21 26 174 24 168 35 174
+	200 3 18 19 22 37 160 37 168 24 160
+	200 3 22 19 20 24 160 37 168 24 168
+	200 3 19 21 20 37 168 35 174 24 168
+	200 3 20 24 22 10 27 24 20 23 27
+	200 3 22 24 18 0 47 2 38 17 47
+	200 3 18 24 23 17 47 2 38 16 38
+	200 3 4 5 28 10 131 0 131 9 137
+	200 3 28 5 29 9 137 0 131 0 139
+	200 3 25 26 5 4 28 13 30 4 37
+	200 3 5 26 29 4 37 13 30 13 36
+	200 3 6 27 25 10 131 9 137 0 131
+	200 3 25 27 26 0 131 9 137 0 139
+	200 3 6 4 27 4 14 4 3 11 12
+	200 3 27 4 28 11 12 4 3 11 3
+	200 3 28 29 27 6 120 5 126 0 120
+	200 3 27 29 26 0 120 5 126 0 126
 	200 3 7 8 30 97 72 96 61 101 61
 	200 3 7 30 9 97 72 96 61 99 61
 	200 3 7 9 8 97 72 99 61 101 61
-	4200 3 31 23 24 8 1 13 1 12 211 8 223 8 211
-	4200 3 20 31 24 8 1 25 1 10 27 19 20 24 20
-	4200 3 16 23 31 8 1 13 1 12 223 8 223 12 211
-	4200 3 16 19 23 8 1 25 1 19 20 10 27 24 20
+	200 3 31 23 24 12 211 8 223 8 211
+	200 3 20 31 24 10 27 19 20 24 20
+	200 3 16 23 31 12 223 8 223 12 211
+	200 3 16 19 23 19 20 10 27 24 20

data/base/components/weapons/trmair3.pie

@@ -3,37 +3,37 @@ TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1
-POINTS 12 
-	-10 13 6 
-	-10 0 6 
-	-10 13 -6 
-	0 0 12 
-	10 0 6 
-	10 0 -6 
-	10 13 6 
-	10 13 -6 
-	-10 0 -6 
-	0 0 -12 
-	0 13 -12 
+POINTS 12
+	-10 13 6
+	-10 0 6
+	-10 13 -6
+	0 0 12
+	10 0 6
+	10 0 -6
+	10 13 6
+	10 13 -6
+	-10 0 -6
+	0 0 -12
+	0 13 -12
 	0 13 12
 POLYGONS 20
-	4200 3 0 2 1 8 1 16 1 129 192 143 192 129 207
-	4200 3 1 2 8 8 1 16 1 129 207 143 192 143 207
-	4200 3 11 0 3 8 1 13 1 6 241 12 241 6 254
-	4200 3 3 0 1 8 1 13 1 6 254 12 241 12 254
-	4200 3 6 11 4 8 1 13 1 0 241 6 241 0 254
-	4200 3 4 11 3 8 1 13 1 0 254 6 241 6 254
-	4200 3 7 6 5 8 1 16 1 129 192 143 192 129 207
-	4200 3 5 6 4 8 1 16 1 129 207 143 192 143 207
-	4200 3 10 7 9 8 1 16 1 8 0 15 0 8 18
-	4200 3 9 7 5 8 1 16 1 8 18 15 0 15 18
-	4200 3 2 10 8 8 1 16 1 0 0 8 0 0 18
-	4200 3 8 10 9 8 1 16 1 0 18 8 0 8 18
-	4200 3 8 9 3 8 1 11 1 34 104 36 108 26 108
-	4200 3 8 3 1 8 1 11 1 34 104 26 108 28 104
-	4200 3 3 9 4 8 1 11 1 26 108 36 108 28 112
-	4200 3 4 9 5 8 1 11 1 28 112 36 108 34 112
-	4200 3 2 0 10 8 1 11 1 34 104 28 104 36 108
-	4200 3 0 11 10 8 1 11 1 28 104 26 108 36 108
-	4200 3 6 7 11 8 1 11 1 28 112 34 112 26 108
-	4200 3 7 10 11 8 1 11 1 34 112 36 108 26 108
+	200 3 0 2 1 129 192 143 192 129 207
+	200 3 1 2 8 129 207 143 192 143 207
+	200 3 11 0 3 6 241 12 241 6 254
+	200 3 3 0 1 6 254 12 241 12 254
+	200 3 6 11 4 0 241 6 241 0 254
+	200 3 4 11 3 0 254 6 241 6 254
+	200 3 7 6 5 129 192 143 192 129 207
+	200 3 5 6 4 129 207 143 192 143 207
+	200 3 10 7 9 8 0 15 0 8 18
+	200 3 9 7 5 8 18 15 0 15 18
+	200 3 2 10 8 0 0 8 0 0 18
+	200 3 8 10 9 0 18 8 0 8 18
+	200 3 8 9 3 34 104 36 108 26 108
+	200 3 8 3 1 34 104 26 108 28 104
+	200 3 3 9 4 26 108 36 108 28 112
+	200 3 4 9 5 28 112 36 108 34 112
+	200 3 2 0 10 34 104 28 104 36 108
+	200 3 0 11 10 28 104 26 108 36 108
+	200 3 6 7 11 28 112 34 112 26 108
+	200 3 7 10 11 34 112 36 108 26 108

data/mp/structs/trmflmrp.pie

@@ -3,24 +3,24 @@ TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1
-POINTS 18 
-	14 7 30 
-	16 0 21 
-	0 0 21 
-	3 7 30 
-	-2 7 30 
-	-15 0 21 
-	-13 7 30 
-	-2 29 12 
-	-13 29 12 
-	-16 22 3 
-	0 22 3 
-	14 29 12 
-	16 22 3 
-	3 29 12 
-	-7 0 -18 
-	-6 17 -9 
-	8 0 -18 
+POINTS 18
+	14 7 30
+	16 0 21
+	0 0 21
+	3 7 30
+	-2 7 30
+	-15 0 21
+	-13 7 30
+	-2 29 12
+	-13 29 12
+	-16 22 3
+	0 22 3
+	14 29 12
+	16 22 3
+	3 29 12
+	-7 0 -18
+	-6 17 -9
+	8 0 -18
 	7 17 -9
 POLYGONS 28
 	200 3 3 2 1 46 177 46 192 60 192
@@ -43,11 +43,11 @@ POLYGONS 28
 	200 3 7 6 4 226 23 245 1 226 1
 	200 3 11 13 3 226 23 245 23 245 1
 	200 3 11 3 0 226 23 245 1 226 1
-	4200 3 5 9 15 8 1 25 7 25 27 25 20 0 20
-	4200 3 5 15 14 8 1 25 7 25 27 0 20 0 27
-	4200 3 17 12 1 8 1 25 7 0 20 25 20 25 27
-	4200 3 17 1 16 8 1 25 7 0 20 25 27 0 27
-	4200 3 12 17 15 8 1 16 19 16 0 0 0 0 19
-	4200 3 12 15 9 8 1 16 19 16 0 0 19 16 19
-	4200 3 17 16 14 8 1 18 9 18 28 0 28 0 37
-	4200 3 17 14 15 8 1 18 9 18 28 0 37 18 37
+	200 3 5 9 15 25 27 25 20 0 20
+	200 3 5 15 14 25 27 0 20 0 27
+	200 3 17 12 1 0 20 25 20 25 27
+	200 3 17 1 16 0 20 25 27 0 27
+	200 3 12 17 15 16 0 0 0 0 19
+	200 3 12 15 9 16 0 0 19 16 19
+	200 3 17 16 14 18 28 0 28 0 37
+	200 3 17 14 15 18 28 0 37 18 37

lib/netplay/netplay.cpp

@@ -175,7 +175,7 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
 **/
 static char const *versionString = version_getVersionString();
 static int NETCODE_VERSION_MAJOR = 6;
-static int NETCODE_VERSION_MINOR = 20120504;
+static int NETCODE_VERSION_MINOR = 20120513;
 
 bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
 {
@@ -280,7 +280,7 @@ void NET_InitPlayer(int i, bool initPosition)
 	NetPlay.players[i].heartattacktime = 0;
 	NetPlay.players[i].heartbeat = true;		// we always start with a hearbeat
 	NetPlay.players[i].kick = false;
-	if (!NetPlay.isHost)
+	if (ingame.localJoiningInProgress)
 	{	// only clear name outside of games.
 		NetPlay.players[i].name[0] = '\0';
 	}
@@ -3407,6 +3407,16 @@ void _syncDebugBacktrace(const char *function)
 	syncDebugLog[syncDebugNext].setCrc(backupCrc);
 }
 
+uint32_t syncDebugGetCrc()
+{
+	return syncDebugLog[syncDebugNext].getCrc();
+}
+
+void syncDebugSetCrc(uint32_t crc)
+{
+	syncDebugLog[syncDebugNext].setCrc(crc);
+}
+
 void resetSyncDebug()
 {
 	for (unsigned i = 0; i < MAX_SYNC_HISTORY; ++i)

lib/netplay/netplay.h

@@ -351,6 +351,8 @@ void _syncDebug(const char *function, const char *str, ...)
 void _syncDebugIntList(const char *function, const char *str, int *ints, size_t numInts);
 #define syncDebugBacktrace() do { _syncDebugBacktrace(__FUNCTION__); } while(0)
 void _syncDebugBacktrace(const char *function);                  ///< Adds a backtrace to syncDebug, if the platform supports it. Can be a bit slow, don't call way too often, unless desperate.
+uint32_t syncDebugGetCrc();                                      ///< syncDebug() calls between uint32_t crc = syncDebugGetCrc(); and syncDebugSetCrc(crc); appear in synch debug logs, but without triggering a desynch if different.
+void syncDebugSetCrc(uint32_t crc);                              ///< syncDebug() calls between uint32_t crc = syncDebugGetCrc(); and syncDebugSetCrc(crc); appear in synch debug logs, but without triggering a desynch if different.
 
 typedef uint16_t GameCrcType;  // Truncate CRC of game state to 16 bits, to save a bit of bandwidth.
 void resetSyncDebug();                                              ///< Resets the syncDebug, so syncDebug from a previous game doesn't cause a spurious desynch dump.