Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/galician.txt
This commit is contained in:
Jonathan G Rennison
2017-05-10 19:40:39 +01:00
7 changed files with 259 additions and 105 deletions

View File

@@ -28,6 +28,7 @@
#include "vehicle_func.h"
#include "sound_func.h"
#include "ai/ai.hpp"
#include "game/game.hpp"
#include "pathfinder/opf/opf_ship.h"
#include "engine_base.h"
#include "company_base.h"
@@ -442,6 +443,7 @@ static void ShipArrivesAt(const Vehicle *v, Station *st)
st->index
);
AI::NewEvent(v->owner, new ScriptEventStationFirstVehicle(st->index, v->index));
Game::NewEvent(new ScriptEventStationFirstVehicle(st->index, v->index));
}
}