projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused function parameter
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 41cde998f09bb12e1488f56f0e08cee0735daf3e..b7ad82d4d4fcd2e8bbf7827b577d95001912a677 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-7138,7
+7138,12
@@
static void ToggleUseApiServerIfNeeded(void)
runtime.use_api_server = setup.use_api_server;
if (runtime.use_api_server)
runtime.use_api_server = setup.use_api_server;
if (runtime.use_api_server)
+ {
+ if (setup.has_remaining_tapes)
+ setup.ask_for_uploading_tapes = TRUE;
+
CheckApiServerTasks();
CheckApiServerTasks();
+ }
}
static void ModifyGameSpeedIfNeeded(void)
}
static void ModifyGameSpeedIfNeeded(void)
@@
-7677,7
+7682,7
@@
static Key getSetupKey(void)
{
case EVENT_KEYPRESS:
{
{
case EVENT_KEYPRESS:
{
- key = GetEventKey((KeyEvent *)&event
, TRUE
);
+ key = GetEventKey((KeyEvent *)&event);
// press 'Escape' or 'Enter' to keep the existing key binding
if (key == KSYM_Escape || key == KSYM_Return)
// press 'Escape' or 'Enter' to keep the existing key binding
if (key == KSYM_Escape || key == KSYM_Return)
@@
-8474,7
+8479,7
@@
static boolean CustomizeKeyboardMain(int player_nr)
{
case EVENT_KEYPRESS:
{
{
case EVENT_KEYPRESS:
{
- Key key = GetEventKey((KeyEvent *)&event
, FALSE
);
+ Key key = GetEventKey((KeyEvent *)&event);
// press 'Escape' to abort and keep the old key bindings
if (key == KSYM_Escape)
// press 'Escape' to abort and keep the old key bindings
if (key == KSYM_Escape)
@@
-9125,7
+9130,7
@@
static boolean ConfigureVirtualButtonsMain(void)
case EVENT_KEYPRESS:
{
case EVENT_KEYPRESS:
{
- Key key = GetEventKey((KeyEvent *)&event
, FALSE
);
+ Key key = GetEventKey((KeyEvent *)&event);
action = (key == KSYM_Escape ? ACTION_ESCAPE :
key == KSYM_BackSpace ||
action = (key == KSYM_Escape ? ACTION_ESCAPE :
key == KSYM_BackSpace ||
@@
-10482,6
+10487,9
@@
static boolean OfferUploadTapes(void)
"Upload all your tapes to the high score server now?", REQ_ASK))
return FALSE;
"Upload all your tapes to the high score server now?", REQ_ASK))
return FALSE;
+ // when uploading tapes, make sure that high score server is enabled
+ runtime.use_api_server = setup.use_api_server = TRUE;
+
int num_tapes_uploaded = UploadTapes();
char message[100];
int num_tapes_uploaded = UploadTapes();
char message[100];