From aba332d569a346c09134e07c479cce488bf4a235 Mon Sep 17 00:00:00 2001
From: Chris Taylor <chris@icculus.org>
Date: Fri, 1 Apr 2005 03:21:32 +0000
Subject: [PATCH] "Go to Main Menu" now works in editor

---
 ChangeLog            |  5 +++++
 main/editor/kdefs.h  |  4 ++--
 main/editor/kfuncs.c |  6 +++---
 main/editor/med.c    | 25 +++++++++++--------------
 main/game.c          |  6 +++---
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adbb989c..cde00a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-01  Chris Taylor  <chris@icculus.org>
+
+	* main/game.c, main/editor/kdefs.h, main/editor/kfuncs.c,
+	main/editor/med.c: "Go to Main Menu" now works in editor
+
 2005-03-31  Chris Taylor  <chris@icculus.org>
 
 	* main/bm.c, main/bm.h, main/bmread.c, main/editor/editor.h,
diff --git a/main/editor/kdefs.h b/main/editor/kdefs.h
index cccafc67..3ff9ece8 100644
--- a/main/editor/kdefs.h
+++ b/main/editor/kdefs.h
@@ -1,4 +1,4 @@
-/* $Id: kdefs.h,v 1.3 2005-01-24 21:26:24 schaffner Exp $ */
+/* $Id: kdefs.h,v 1.4 2005-04-01 03:21:32 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -249,7 +249,7 @@ int set_average_light_on_all_quick(void);
 // Miscellaneous, please put in correct file if you have time
 int IncreaseDrawDepth();
 int DecreaseDrawDepth();
-int GotoGame();
+int GotoMainMenu();
 int GotoGameScreen();
 int DropIntoDebugger();
 int CreateDefaultNewSegment();
diff --git a/main/editor/kfuncs.c b/main/editor/kfuncs.c
index 8350e3b8..575a768e 100644
--- a/main/editor/kfuncs.c
+++ b/main/editor/kfuncs.c
@@ -1,4 +1,4 @@
-/* $Id: kfuncs.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: kfuncs.c,v 1.4 2005-04-01 03:21:32 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  */
 
 #ifdef RCS
-static char rcsid[] = "$Id: kfuncs.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: kfuncs.c,v 1.4 2005-04-01 03:21:32 chris Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -367,7 +367,7 @@ FUNCTION med_functions[] = {
 
 {   "med-increase-draw-depth",          0,        IncreaseDrawDepth },
 {   "med-decrease-draw-depth",          0,        DecreaseDrawDepth },
-{   "med-goto-game",                    0,        GotoGame },
+{   "med-goto-main-menu",                    0,        GotoMainMenu },
 {   "med-goto-game-screen",             0,        GotoGameScreen },
 {   "med-drop-into-debugger",           0,        DropIntoDebugger },
 // {   "med-sync-large-view",              0,        SyncLargeView },
diff --git a/main/editor/med.c b/main/editor/med.c
index 682bbc1a..d9dd78de 100644
--- a/main/editor/med.c
+++ b/main/editor/med.c
@@ -1,4 +1,4 @@
-/* $Id: med.c,v 1.8 2005-02-27 03:55:46 chris Exp $ */
+/* $Id: med.c,v 1.9 2005-04-01 03:21:32 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -278,7 +278,8 @@ int ExitEditor()
 	return 1;
 }
 
-int	GotoGameCommon(int mode) {
+int	GotoGameScreen()
+{
 	stop_time();
 
 //@@	init_player_stats();
@@ -301,18 +302,14 @@ int	GotoGameCommon(int mode) {
 
 	start_time();
 
-	ModeFlag = mode;
+	ModeFlag = 3;
 	return 1;
 }
 
-int GotoGameScreen()
-{
-	return GotoGameCommon(3);
-}
-
-int GotoGame()
+int GotoMainMenu()
 {
-	return GotoGameCommon(2);
+	ModeFlag = 2;
+	return 1;
 }
 
 
@@ -1196,10 +1193,10 @@ void editor(void)
 
 		if (ModeFlag==2) //-- && MacroStatus==UI_STATUS_NORMAL )
 		{
-			ui_mouse_hide();
-			Function_mode = FMODE_GAME;
-			gr_bm_ubitblt( w, h, 0, 0, 0, 0, savedbitmap, &GameViewBox->canvas->cv_bitmap);
-			gr_free_bitmap( savedbitmap );
+			close_editor_screen();
+			Function_mode = FMODE_MENU;
+			set_screen_mode(SCREEN_MENU);		//put up menu screen
+			gr_free_bitmap(savedbitmap);
 			break;
 		}
 
diff --git a/main/game.c b/main/game.c
index bbd0ff9e..1b74bd57 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.35 2005-03-20 12:53:33 btb Exp $ */
+/* $Id: game.c,v 1.36 2005-04-01 03:21:32 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char game_rcsid[] = "$Id: game.c,v 1.35 2005-03-20 12:53:33 btb Exp $";
+char game_rcsid[] = "$Id: game.c,v 1.36 2005-04-01 03:21:32 chris Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -854,7 +854,7 @@ WIN(static int force_mode_change=0);
 WIN(static int saved_window_w);
 WIN(static int saved_window_h);
 
-#ifdef EDITOR
+#if 0 //def EDITOR
 	if ( (sm==SCREEN_MENU) && (Screen_mode==SCREEN_EDITOR) )	{
 		gr_set_current_canvas( Canv_editor );
 		return 1;
-- 
2.39.2