projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070321-1-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index aceedf17b3bec3652c04116d07ac5fb1935c82f1..134a3fcb193323817d65f8a7d32595acfe0e62b2 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-7051,24
+7051,14
@@
void DrawLevelEd()
#endif
MapControlButtons();
#endif
MapControlButtons();
-#if 0
- fading = menu.navigation;
-#endif
-
#if 1
#if 1
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCrossSaveBackbuffer();
- else
- FadeOut(REDRAW_FIELD);
+ FadeOut(REDRAW_FIELD);
#endif
DrawEditModeWindow();
#if 1
#endif
DrawEditModeWindow();
#if 1
- if (fading.anim_mode == ANIM_CROSSFADE)
- FadeCross(REDRAW_FIELD);
- else
- FadeIn(REDRAW_FIELD);
+ FadeIn(REDRAW_FIELD);
#endif
/* copy actual editor door content to door double buffer for OpenDoor() */
#endif
/* copy actual editor door content to door double buffer for OpenDoor() */
@@
-11361,8
+11351,13
@@
void RequestExitLevelEditor(boolean ask_if_level_has_changed,
CloseDoor(DOOR_CLOSE_1);
SetDoorState(DOOR_CLOSE_2);
CloseDoor(DOOR_CLOSE_1);
SetDoorState(DOOR_CLOSE_2);
+#if 1
+ if (quick_quit)
+ FadeSkipNextFadeIn();
+#else
if (quick_quit)
fading = fading_none;
if (quick_quit)
fading = fading_none;
+#endif
game_status = GAME_MODE_MAIN;
#if 1
game_status = GAME_MODE_MAIN;
#if 1