Merge branch 'master' of mkxp

This commit is contained in:
Jonas Kulla 2015-03-23 09:08:12 +01:00
commit 115ea9d8f7
4 changed files with 9 additions and 3 deletions

View File

@ -152,7 +152,7 @@ RB_METHOD(FontSetName)
Font *f = getPrivateData<Font>(self); Font *f = getPrivateData<Font>(self);
char result[256]; char result[256];
fontSetNameHelper(self, argc, argv, "default_name", fontSetNameHelper(self, argc, argv, "name",
result, sizeof(result)); result, sizeof(result));
f->setName(result); f->setName(result);

View File

@ -179,6 +179,7 @@ void AudioStream::fadeOut(int duration)
lockStream(); lockStream();
ALStream::State sState = stream.queryState(); ALStream::State sState = stream.queryState();
noResumeStop = true;
if (fade.active) if (fade.active)
{ {

View File

@ -55,7 +55,10 @@ struct AudioStream
/* Note that 'extPaused' and 'noResumeStop' are /* Note that 'extPaused' and 'noResumeStop' are
* effectively only used with the AudioStream * effectively only used with the AudioStream
* instance representing the BGM */ * instance representing the BGM.
* They are not AtomicFlags because they're regarded
* as part of the underlying stream state, and
* always accessed with the stream lock held */
/* Flag indicating that the MeWatch paused this /* Flag indicating that the MeWatch paused this
* (BGM) stream because a ME started playing. * (BGM) stream because a ME started playing.

View File

@ -1107,6 +1107,8 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
p->ensureFormat(txtSurf, SDL_PIXELFORMAT_ABGR8888); p->ensureFormat(txtSurf, SDL_PIXELFORMAT_ABGR8888);
int rawTxtSurfH = txtSurf->h;
if (p->font->getShadow()) if (p->font->getShadow())
applyShadow(txtSurf, *p->format, c); applyShadow(txtSurf, *p->format, c);
@ -1155,7 +1157,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
if (alignX < rect.x) if (alignX < rect.x)
alignX = rect.x; alignX = rect.x;
int alignY = rect.y + (rect.h - txtSurf->h) / 2; int alignY = rect.y + (rect.h - rawTxtSurfH) / 2;
float squeeze = (float) rect.w / txtSurf->w; float squeeze = (float) rect.w / txtSurf->w;