Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Conflicts:
	src/misc.cpp
This commit is contained in:
Jonathan G Rennison
2015-11-11 19:20:36 +00:00
6 changed files with 87 additions and 26 deletions

View File

@@ -30,6 +30,7 @@
#include "linkgraph/linkgraphschedule.h"
#include "tracerestrict.h"
#include "programmable_signals.h"
#include "viewport_func.h"
#include "safeguards.h"
@@ -61,6 +62,8 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
AllocateMap(size_x, size_y);
ViewportMapClearTunnelCache();
_pause_mode = PM_UNPAUSED;
_fast_forward = 0;
_tick_counter = 0;