projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added function to get graphics for MM style game elements
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index e8171d5e1360c4772678403d7ce9bd641f1c5acb..ab1d2be1188928f23ee4fc54d066a8de9c5fee02 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-3312,6
+3312,13
@@
void DrawInfoScreen_Version()
DrawTextF(xstart1, ystart2, font_header, "Version");
DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
DrawTextF(xstart1, ystart2, font_header, "Version");
DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
+ if (!strEqual(getProgramVersionString(), getProgramRealVersionString()))
+ {
+ ystart2 += ystep;
+ DrawTextF(xstart1, ystart2, font_header, "Version (real)");
+ DrawTextF(xstart2, ystart2, font_text, getProgramRealVersionString());
+ }
+
ystart2 += ystep;
DrawTextF(xstart1, ystart2, font_header, "Platform");
DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING);
ystart2 += ystep;
DrawTextF(xstart1, ystart2, font_header, "Platform");
DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING);
@@
-5597,12
+5604,10
@@
static Key getSetupKey()
while (!got_key_event)
{
while (!got_key_event)
{
- if (PendingEvent()) /* got event */
- {
- Event event;
-
- NextEvent(&event);
+ Event event;
+ if (NextValidEvent(&event))
+ {
switch (event.type)
{
case EVENT_KEYPRESS:
switch (event.type)
{
case EVENT_KEYPRESS:
@@
-6283,12
+6288,10
@@
void CustomizeKeyboard(int player_nr)
while (!finished)
{
while (!finished)
{
- if (PendingEvent()) /* got event */
- {
- Event event;
-
- NextEvent(&event);
+ Event event;
+ if (NextValidEvent(&event))
+ {
switch (event.type)
{
case EVENT_KEYPRESS:
switch (event.type)
{
case EVENT_KEYPRESS: