diff --git a/Multiplayer/raknet/RakNetLibStatic.lib b/Multiplayer/raknet/RakNetLibStatic.lib index 979011a8..0e6772f6 100644 Binary files a/Multiplayer/raknet/RakNetLibStatic.lib and b/Multiplayer/raknet/RakNetLibStatic.lib differ diff --git a/Multiplayer/raknet/raknetlibstatic.pdb b/Multiplayer/raknet/raknetlibstatic.pdb new file mode 100644 index 00000000..3687f052 Binary files /dev/null and b/Multiplayer/raknet/raknetlibstatic.pdb differ diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index de223113..75b7b4d8 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -2756,7 +2756,7 @@ void RenderSMPanel( BOOLEAN *pfDirty ) CreateMouseRegionForPauseOfClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y ); // CHRISL: Change function call to include X,Y coordinates. RenderTownIDString( LOCATION_NAME_X, LOCATION_NAME_Y ); - } + }//XXXj in tactical bug is: NIV pushes town name +Y and boom else { RemoveMouseRegionForPauseOfClock( ); @@ -6186,6 +6186,9 @@ void RenderTownIDString( INT16 sX, INT16 sY ) CHAR16 zTownIDString[80]; INT16 sFontX, sFontY; + // when NIV is open in tactical + if (sY+GetFontHeight(COMPFONT) >= SCREEN_HEIGHT) return; + // Render town, position SetFont( COMPFONT ); SetFontForeground( 183 );