--- a/ChangeLog.txt	Fri Nov 11 14:13:25 2011 -0500
+++ b/ChangeLog.txt	Fri Nov 11 15:11:41 2011 -0500
@@ -1,6 +1,37 @@
 + features
 * bugfixes
 
+0.9.16 -> 0.9.17:
+ + New theme, Cave
+ + New voicepack, Hillbilly
+ + More attractive mission screen with previews
+ + Chat timestamping, links, input history, tab completion
+ + Customisable chat by dragging a .css file, see file generated by the /saveStyleSheet command
+ + Errors/warnings in chat instead of popup boxes
+ + Mousewheel to change hog/weapon counts in game creation
+ + Refresh DLC page on access, display notice if DLC page is not accessible
+ + Team colours changed, again
+ + Land texture on maps using mask of black
+ + Spread clouds/flakes over near/far layers for more 3D
+ + Team coloured RC/airstrike
+ + Icy girders/bridges on Snow/Christmas themes, support for ice land type (blue in mask)
+ + Sticky mines, mines activate 1s after use in infinite attack mode
+ + Grenades/bazooka/melon pieces/ballgun now kicked by explosions
+ + Minor theme optimisation, Optional SkyR
+ + Camera follows melon, clusterbomb, gas cloud
+ * Vertical movement should be restricted for small displays, camera will try less hard to keep hog in centre
+ * Keep mouse from jumping around when ammo menu is active
+ * Hogs can now move after trapping another hog in a portal loop
+ * ctrl-w no longer closes engine window
+ * Fix bugs in blowtorch angle/direction
+ * Fix playing notes on the piano
+ * Fix some colours in greyscale 3D
+ * Fix Lua overrides of map config
+ * Girders no longer make windows in tunnels
+ * Prevent some more escaping through border, firepunch, pickhammer
+ * Many frontend bugfixes, code cleanup. Crash in game abort, flake clipping, invalid state on room close
+ * Many other engine bugfixes.  SDL event crasher, timebox crasher, birdy hang, desync on quits, crash in birdy eggshell, clouds on Deep Space theme, etc
+
 0.9.15 -> 0.9.16:
  + In-game chat now supports backspace-repeat and Escape to close the text input area
  + Team status bars shrunk/made translucent if they take up a significant portion of the screen

--- a/hedgewars/GSHandlers.inc	Fri Nov 11 14:13:25 2011 -0500
+++ b/hedgewars/GSHandlers.inc	Fri Nov 11 15:11:41 2011 -0500
@@ -3654,7 +3654,8 @@
     Gear^.X := HHGear^.X;
     Gear^.Y := HHGear^.Y;
     // For some reason I need to reapply followgear here, something else grabs it otherwise.
-    if not bShowAmmoMenu and not CurrentTeam^.ExtDriven then FollowGear := HHGear;
+    // This is probably not needed anymore
+    if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 
     if not isUnderWater and hasBorder and ((HHGear^.X < _0) or (hwRound(HHGear^.X) > LAND_WIDTH)) then HHGear^.dY.isNegative:= false;
     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
@@ -3785,7 +3786,8 @@
     Gear^.X := HHGear^.X;
     Gear^.Y := HHGear^.Y - int2hwFloat(32);
     // For some reason I need to reapply followgear here, something else grabs it otherwise.
-    if not bShowAmmoMenu then FollowGear := HHGear;
+    // this is probably not needed anymore
+    if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 
     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);