ChangeLog

@@ -1,3 +1,22 @@
+2012-03-13: Version 3.1_beta5
+ * General:
+   * Change: Adjust the burning time of destroyed oil derricks by the percentage they were completed (commit:f6ddbf1878ff2a387c4be95449d8a7835c18ebd8)
+   * Fix: Don't corrupt savegames (ticket:3200, commit:da9d427e5def9b82ab95c99b42ec8e2049bfcd12)
+   * Fix: Reduce unit delay by 200 ms (commit:f36cb966ce6effd58e1dc42e275d00fe9bd8904d)
+   * Fix: Reduce units shuffling around their destination (ticket:2996, commit:0b7605c4ee9464f5966a31d6523fb7e248f4323a)
+   * Fix: Don't land several VTOLs on the same tile (commit:9dcf5bdf4eb4d590ea15e1c5201ceefe0819a5dc)
+   * Fix: When picking up artifacts or oil drums with a sensor unit, don't make the units attached to it shoot (ticket:1281, commit:42017f5e12a29f21dd31e7b595a7158168efb063)
+   * Fix: Disable target prediction for droids that are trying to drive through stuff (commit:a94bd6629d17f50df9b3a58b97bb3f8cd734e12b)
+   * Fix: Make "Go to Transport" button work sensibly (commit:2d938a0323e5c47ce4a41c9fb6c5a0d42eb9593d)
+ * Multiplayer:
+   * Fix: Supertransporter fixes (ticket:3196, ticket:3210, ticket:3224, commit:fcede64e428e46657db2ef7b0f7bd1ce26b1d91d, commit:6bc90e6d2e0343d7d5e6e54be09f97f2c8e1cbd8, commit:475d1e625218924d252f5eb546e55824a5f697ed, commit:9e63fe34339128f5844d21a67f72a5c2d2bf0814)
+   * Fix: Don't kick players several times (ticket:3209, commit:bc65f978015b73bef462e53726ff53fcdc607d18)
+ * Translations:
+   * Update: Russian (ticket:3221, commit:f627fd803c3356fe344e09ac172634e93e774332)
+   * Update: German (ticket:3205, commit:6f5bf39951eccb4d2ee01cef7a64269820a1ddcb)
+   * Update: Polish (ticket:1347, commit:2042b60e4f144b483b12164d67f99adf4e915ac0)
+   * Update: French (ticket:3276, commit:a26aa5f3ad89312e47b026bcfe1b44271b47faef, commit:2c093a6ff96bce87f2edc1d1a7c10369a2f78c58)
+
 2012-02-21: Version 3.1-beta4
  * General:
    * Change: New keyboard shortcuts for unit selection:

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1_beta5],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 
@@ -262,7 +262,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
 # Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
-	[ enable_debug=${enableval} ], [ enable_debug=yes ])
+	[ enable_debug=${enableval} ], [ enable_debug=no ])
 AC_MSG_CHECKING([whether to compile in debug mode])
 AC_MSG_RESULT([${enable_debug}])
 

data/base/components/weapons/trmair2.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1

data/base/components/weapons/trmair3.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1

data/base/effects/fxvulcan.pie

@@ -3,21 +3,21 @@ TYPE 200
 TEXTURE 0 page-21-fx.png 256 256
 LEVELS 1
 LEVEL 1
-POINTS 8 
-	0 5 0 
-	0 14 0 
-	0 14 -25 
-	0 5 -25 
-	-4 10 0 
-	4 10 0 
-	4 10 -25 
-	-4 10 -25
+POINTS 8
+	0 -4 0
+	0 5 0
+	0 5 -25
+	0 -4 -25
+	-4 1 0
+	4 1 0
+	4 1 -25
+	-4 1 -25
 POLYGONS 8
-	200 3 0 1 2 240 49 251 49 251 28
-	200 3 0 2 3 240 49 251 28 240 28
 	200 3 3 2 1 240 28 251 28 251 49
 	200 3 3 1 0 240 28 251 49 240 49
-	200 3 4 5 6 240 49 251 49 251 28
-	200 3 4 6 7 240 49 251 28 240 28
 	200 3 7 6 5 240 28 251 28 251 49
-	200 3 7 5 4 240 28 251 49 240 49
+	200 3 7 5 4 240 28 251 49 240 49
+	200 3 3 0 1 240 28 240 49 251 49
+	200 3 3 1 2 240 28 251 49 251 28
+	200 3 7 4 5 240 28 240 49 251 49
+	200 3 7 5 6 240 28 251 49 251 28

data/mp/stats/templates.txt

@@ -364,6 +364,6 @@ SK-Mantis-VTOL-HBB,743,Body12SUP,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNU
 SK-Retre-VTOL-HBB,744,Body7ABT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
 SK-Retal-VTOL-Scourge,745,Body3MBT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
 SK-Retre-VTOL-Plasmite,746,Body7ABT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
-SuperTransport,746,SuperTransportBody,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,YES,V-Tol,ZNULLREPAIR,TRANSPORTER,DefaultSensor1Mk1,1
+SuperTransport,746,SuperTransportBody,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,YES,V-Tol,ZNULLREPAIR,SUPERTRANSPORTER,DefaultSensor1Mk1,1
 SK-Veng-Hover-Seraph,747,Body10MBT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,hover01,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
 Dragon-Hover-SeraphGauss,748,Body14SUP,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,hover01,ZNULLREPAIR,DROID,DefaultSensor1Mk1,2

data/mp/structs/trmflmrp.pie

@@ -1,5 +1,5 @@
 PIE 2
-TYPE 200
+TYPE 10200
 TEXTURE 0 page-17-droid-weapons.png 256 256
 LEVELS 1
 LEVEL 1
@@ -50,4 +50,4 @@ POLYGONS 28
 	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
+	4200 3 17 14 15 8 1 18 9 18 28 0 37 18 37

lib/exceptionhandler/exceptionhandler.cpp

@@ -519,7 +519,7 @@ static bool gdbExtendedBacktrace(int const dumpFile)
 	int status;
 	pid_t wpid;
 	                                  // Retrieve a full stack backtrace
-	static const char gdbCommands[] = "backtrace full\n"
+	static const char gdbCommands[] = "thread apply all backtrace full\n"
 
 	                                  // Move to the stack frame where we triggered the crash
 	                                  "frame 4\n"

lib/framework/input.h

@@ -246,7 +246,7 @@ extern void inputNewFrame(void);
 
 static inline bool specialOrderKeyDown()
 {
-	return keyDown(KEY_LALT) || keyDown(KEY_RALT) || keyDown(KEY_LMETA) || keyDown(KEY_RMETA);
+	return keyDown(KEY_LALT) || keyDown(KEY_RALT) || keyDown(KEY_LMETA) || keyDown(KEY_RMETA) || keyDown(KEY_LSUPER) || keyDown(KEY_RSUPER);
 }
 
 #endif // _input_h

lib/framework/wzglobal.h

@@ -164,7 +164,7 @@
 #  define WZ_OS_INTEGRITY
 #elif defined(__MAKEDEPEND__)
 #else
-#  error "Warzone has not been tested on this OS. Please contact warzone-dev@gna.org"
+#  error "Warzone has not been tested on this OS. Please contact warzone2100-project@lists.sourceforge.net"
 #endif /* WZ_OS_x */
 
 #if defined(WZ_OS_WIN32) || defined(WZ_OS_WIN64)
@@ -248,7 +248,7 @@
 #  define WZ_CC_TINYC
 
 #else
-#  error "Warzone has not been tested on this compiler. Please contact warzone-dev@gna.org"
+#  error "Warzone has not been tested on this compiler. Please contact warzone2100-project@lists.sourceforge.net"
 #endif /* WZ_CC_x */
 
 
@@ -286,7 +286,7 @@
 #  define WZ_WS_X11
 
 #else
-#  error "Warzone has not been tested on this window system. Please contact warzone-dev@gna.org"
+#  error "Warzone has not been tested on this window system. Please contact warzone2100-project@lists.sourceforge.net"
 #endif /* WZ_WS_x */
 
 #if defined(WZ_WS_WIN16) || defined(WZ_WS_WIN32)

lib/gamelib/animobj.cpp

@@ -221,7 +221,7 @@ animObj_Add( void *pParentObj, int iAnimID,
 	/* init object */
 	psObj->uwID           = (UWORD) iAnimID;
 	psObj->psAnim         = (ANIM3D *) psAnim;
-	psObj->udwStartTime   = gameTime - deltaGameTime;  // Start animation at beginning of update period.
+	psObj->udwStartTime   = gameTime - deltaGameTime + 1;  // Start animation at beginning of update period.
 	psObj->udwStartDelay  = udwStartDelay;
 	psObj->uwCycles       = uwCycles;
 	psObj->bVisible       = true;

lib/gamelib/gtime.cpp

@@ -310,24 +310,18 @@ void gameTimeReset(UDWORD time)
 	deltaRealTime = 0;
 }
 
-void	getTimeComponents(UDWORD time, UDWORD *hours, UDWORD *minutes, UDWORD *seconds)
+void getTimeComponents(unsigned time, int *hours, int *minutes, int *seconds, int *milliseconds)
 {
-	UDWORD	h, m, s;
-	UDWORD	ticks_per_hour, ticks_per_minute;
+	*milliseconds = time % GAME_TICKS_PER_SEC;
+	time /= GAME_TICKS_PER_SEC;
 
-	/* Ticks in a minute */
-	ticks_per_minute = GAME_TICKS_PER_SEC * 60;
+	*seconds = time % 60;
+	time /= 60;
 
-	/* Ticks in an hour */
-	ticks_per_hour = ticks_per_minute * 60;
+	*minutes = time % 60;
+	time /= 60;
 
-	h = time / ticks_per_hour;
-	m = (time - (h * ticks_per_hour)) / ticks_per_minute;
-	s = (time - ((h * ticks_per_hour) + (m * ticks_per_minute))) / GAME_TICKS_PER_SEC;
-
-	*hours = h;
-	*minutes = m;
-	*seconds = s;
+	*hours = time;
 }
 
 static void updateLatency()

lib/gamelib/gtime.h

@@ -56,9 +56,7 @@ extern UDWORD realTime;
 #define gameTime2 realTime
 
 /// The difference between the previous and current gameTime.
-/// FIXME This should be renamed from frameTime to deltaGameTime.
 extern UDWORD deltaGameTime;
-#define frameTime deltaGameTime
 /// The difference between the previous and current graphicsTime.
 extern UDWORD deltaGraphicsTime;
 /// The difference between the previous and current realTime.
@@ -136,7 +134,7 @@ extern UDWORD getModularScaledRealTime(UDWORD timePeriod, UDWORD requiredRange);
 
 
 /** Break down given time into its constituent components. */
-extern void	getTimeComponents(UDWORD time, UDWORD *hours, UDWORD *minutes, UDWORD *seconds);
+void getTimeComponents(unsigned time, int *hours, int *minutes, int *seconds, int *milliseconds);
 
 
 

lib/ivis_opengl/screen.cpp

@@ -145,15 +145,13 @@ bool screenInitialise()
 	}
 	else // less than 1.5
 	{
-#ifndef WZ_OS_MAC
 		// Check if VBO extension available for haxx
 		if (GLEW_VERSION_1_4 && GLEW_ARB_vertex_buffer_object)
 		{
 			debug(LOG_POPUP, _("OpenGL 1.5/2.0 is not supported by your system. Some things may look wrong. Please upgrade your graphics driver/hardware, if possible."));
 			// screen_EnableVBO should be called later, so nothing (quesoGLC) will call glewInit twice and flush our tweaks into void
 		}
 		else
-#endif
 		{
 			debug(LOG_FATAL, _("OpenGL 1.4 + VBO extension is not supported by your system. The game requires this. Please upgrade your graphics drivers/hardware, if possible."));
 			exit(1);
@@ -173,10 +171,9 @@ void screenShutDown(void)
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 }
 
-// Make OpenGL's VBO functions available under the core names for implementations that have them only as extensions, namely Mesa.
+// Make OpenGL's VBO functions available under the core names for drivers that support OpenGL 1.4 only but have the VBO extension
 void screen_EnableVBO()
 {
-#ifndef WZ_OS_MAC
 	// no need if there is OpenGL 1.5 available
 	if (!GLEW_VERSION_1_5 && GLEW_ARB_vertex_buffer_object)
 	{
@@ -194,7 +191,6 @@ void screen_EnableVBO()
 		__glewMapBuffer = __glewMapBufferARB;
 		__glewUnmapBuffer = __glewUnmapBufferARB;
 	}
-#endif
 }
 
 void screen_SetBackDropFromFile(const char* filename)

lib/netplay/netplay.cpp

@@ -165,7 +165,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 = 5;
+static int NETCODE_VERSION_MINOR = 20120313;
 
 bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
 {
@@ -1378,6 +1378,11 @@ static bool NETprocessSystemMessage(NETQUEUE playerQueue, uint8_t type)
 				debug(LOG_ERROR, "Incomplete NET_SEND_TO_PLAYER.");
 				break;
 			}
+			if (sender > MAX_PLAYERS || receiver > MAX_PLAYERS)
+			{
+				debug(LOG_ERROR, "Bad NET_SEND_TO_PLAYER.");
+				break;
+			}
 			if ((receiver == selectedPlayer || receiver == NET_ALL_PLAYERS) && playerQueue.index == NetPlay.hostPlayer)
 			{
 				// Message was sent to us via the host.