summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2017-04-23 09:19:32 +0000
committerpeter1138 <peter1138@openttd.org>2017-04-23 09:19:32 +0000
commitc973f65acb31a3b966f4270a72ae8a5d0b970e5b (patch)
treeb84e39854ea15055f656af03f55cf346950f83ba
parent3c3693583d0ab2a19cb74d7413fbddd78cadcece (diff)
downloadopenttd-c973f65acb31a3b966f4270a72ae8a5d0b970e5b.tar.xz
(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)
-rw-r--r--src/fontcache.cpp2
-rw-r--r--src/ship_cmd.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 6bea59c10..9307c2edd 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -529,7 +529,7 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
return glyph->sprite;
}
}
- FT_Load_Glyph(this->face, key, FT_LOAD_DEFAULT);
+ FT_Load_Glyph(this->face, key, FT_LOAD_NO_HINTING);
FT_Render_Glyph(this->face->glyph, aa ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
/* Despite requesting a normal glyph, FreeType may have returned a bitmap */
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index de1bf4f8c..771863a24 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -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"
@@ -421,6 +422,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));
}
}