projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1d626a
)
moved code for hiding tapes upload to setup menu function
author
Holger Schemel
<info@artsoft.org>
Tue, 7 Sep 2021 08:40:28 +0000
(10:40 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 7 Sep 2021 08:40:28 +0000
(10:40 +0200)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index dfc08900a8ddc82ea290cc69df41ea07be223741..54c03fde2eaf02edcd7df9b68fd47447c33f2c38 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-283,6
+283,7
@@
static void MapScreenTreeGadgets(TreeInfo *);
static void UpdateScreenMenuGadgets(int, boolean);
static boolean OfferUploadTapes(void);
static void UpdateScreenMenuGadgets(int, boolean);
static boolean OfferUploadTapes(void);
+static void execOfferUploadTapes(void);
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
@@
-5568,6
+5569,9
@@
static void execSetupGame(void)
execSetupGame_setNetworkServerText();
execSetupGame_setNetworkServerText();
+ if (!setup.provide_uploading_tapes)
+ setHideSetupEntry(execOfferUploadTapes);
+
setup_mode = SETUP_MODE_GAME;
DrawSetupScreen();
setup_mode = SETUP_MODE_GAME;
DrawSetupScreen();
@@
-9881,7
+9885,6
@@
static boolean OfferUploadTapes(void)
// after all tapes have been uploaded, remove entry from setup menu
setup.provide_uploading_tapes = FALSE;
// after all tapes have been uploaded, remove entry from setup menu
setup.provide_uploading_tapes = FALSE;
- setHideSetupEntry(execOfferUploadTapes);
SaveSetup();
SaveSetup();
@@
-9890,9
+9893,6
@@
static boolean OfferUploadTapes(void)
void CheckUploadTapes(void)
{
void CheckUploadTapes(void)
{
- if (!setup.provide_uploading_tapes)
- setHideSetupEntry(execOfferUploadTapes);
-
if (!setup.ask_for_uploading_tapes)
return;
if (!setup.ask_for_uploading_tapes)
return;
@@
-9908,7
+9908,6
@@
void CheckUploadTapes(void)
{
// if tapes directory does not exist yet, never offer uploading all tapes
setup.provide_uploading_tapes = FALSE;
{
// if tapes directory does not exist yet, never offer uploading all tapes
setup.provide_uploading_tapes = FALSE;
- setHideSetupEntry(execOfferUploadTapes);
}
// after asking for uploading all tapes once, do not ask again
}
// after asking for uploading all tapes once, do not ask again