X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b67573e61a4d9c9c552a796ac979e429f0086ade;hb=0f007d1d01007a58b0493c60143f2b0bf58ff1b1;hp=d3bf2981968faff2cdada0f4d8895adeed22a252;hpb=499ad3bb12d513266ddcebe41a84eee8237a7fb5;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index d3bf2981..b67573e6 100644 --- a/src/screens.c +++ b/src/screens.c @@ -3308,16 +3308,22 @@ void DrawInfoScreen_Version() DrawTextF(xstart1, ystart2, font_header, "Name"); DrawTextF(xstart2, ystart2, font_text, getProgramTitleString()); - ystart2 += ystep; - DrawTextF(xstart1, ystart2, font_header, "Version"); - DrawTextF(xstart2, ystart2, font_text, getProgramVersionString()); - if (!strEqual(getProgramVersionString(), getProgramRealVersionString())) { + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Version (fake)"); + DrawTextF(xstart2, ystart2, font_text, getProgramVersionString()); + ystart2 += ystep; DrawTextF(xstart1, ystart2, font_header, "Version (real)"); DrawTextF(xstart2, ystart2, font_text, getProgramRealVersionString()); } + else + { + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Version"); + DrawTextF(xstart2, ystart2, font_text, getProgramVersionString()); + } ystart2 += ystep; DrawTextF(xstart1, ystart2, font_header, "Platform"); @@ -5604,12 +5610,10 @@ static Key getSetupKey() while (!got_key_event) { - if (PendingEvent()) /* got event */ - { - Event event; - - NextEvent(&event); + Event event; + if (NextValidEvent(&event)) + { switch (event.type) { case EVENT_KEYPRESS: @@ -6290,12 +6294,10 @@ void CustomizeKeyboard(int player_nr) while (!finished) { - if (PendingEvent()) /* got event */ - { - Event event; - - NextEvent(&event); + Event event; + if (NextValidEvent(&event)) + { switch (event.type) { case EVENT_KEYPRESS: