mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)

This commit is contained in:
peter1138 2017-04-23 09:19:32 +00:00
parent 3c3693583d
commit c973f65acb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fontcache.cpp
View File

@ -529,7 +529,7 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
return glyph->sprite; 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); 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 */ /* Despite requesting a normal glyph, FreeType may have returned a bitmap */

2
src/ship_cmd.cpp
View File

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