projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved door handling when entering level editor with read-only warning
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 5254a19fca9b2be1394bce4afd64e0984f18ffcb..8af84590b36f2a9325874e90a7aa471fa55927ba 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-2168,10
+2168,10
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
else if (pos == MAIN_CONTROL_EDITOR)
{
if (leveldir_current->readonly &&
else if (pos == MAIN_CONTROL_EDITOR)
{
if (leveldir_current->readonly &&
-
!strEqual(setup.player_name, "Artsoft")
)
- Request("This level is read-only!", REQ_CONFIRM);
+
setup.editor.show_read_only_warning
)
+ Request("This level is read-only!", REQ_CONFIRM
| REQ_STAY_OPEN
);
- CloseDoor(DOOR_CLOSE_
2
);
+ CloseDoor(DOOR_CLOSE_
ALL
);
SetGameStatus(GAME_MODE_EDITOR);
SetGameStatus(GAME_MODE_EDITOR);
@@
-6729,6
+6729,8
@@
static struct TokenInfo setup_info_editor[] =
#endif
{ TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" },
{ TYPE_EMPTY, NULL, "" },
#endif
{ TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }