projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed function 'NextEvent' to 'WaitEvent'
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 83c436140e665996b01aed85bf21115ffdebbc04..0a0f1f25b7a22a8092be8511a199641347d6e98c 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1482,6
+1482,8
@@
void DrawMainMenu()
LoadLevel(level_nr);
LoadScore(level_nr);
LoadLevel(level_nr);
LoadScore(level_nr);
+ SaveLevelSetup_SeriesInfo();
+
// set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
SetDrawDeactivationMask(REDRAW_NONE);
SetDrawBackgroundMask(REDRAW_FIELD);
// set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
SetDrawDeactivationMask(REDRAW_NONE);
SetDrawBackgroundMask(REDRAW_FIELD);
@@
-1785,6
+1787,8
@@
void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr)
LoadTape(level_nr);
DrawCompleteVideoDisplay();
LoadTape(level_nr);
DrawCompleteVideoDisplay();
+ SaveLevelSetup_SeriesInfo();
+
/* needed because DrawPreviewLevelInitial() takes some time */
BackToFront();
/* SyncDisplay(); */
/* needed because DrawPreviewLevelInitial() takes some time */
BackToFront();
/* SyncDisplay(); */
@@
-3308,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,7
+5608,7
@@
static Key getSetupKey()
{
Event event;
{
Event event;
-
Nex
tEvent(&event);
+
Wai
tEvent(&event);
switch (event.type)
{
switch (event.type)
{
@@
-6283,7
+6294,7
@@
void CustomizeKeyboard(int player_nr)
{
Event event;
{
Event event;
-
Nex
tEvent(&event);
+
Wai
tEvent(&event);
switch (event.type)
{
switch (event.type)
{