Removed the "About FreeSCI" menu as discussed in -devel, now that the FreeSCI contributors have been moved to the AUTHORS file

svn-id: r39476

3 files changed, 1 insertions, 203 deletions

diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index f08e0d3180..e878d6f6d6 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -106,183 +106,6 @@ reg_t kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 }
 
 
-#define ABOUT_FREESCI_PAGES_NR 7
-
-static struct {
-	const char *title;
-	const char *body;
-	int fgcolor, bgcolor;
-} _about_freesci_pages[ABOUT_FREESCI_PAGES_NR] = {
-	{"FreeSCI hackers and contributors",
-		"Alexander R. Angas\nDirectX 8 driver, Event sound server, Generic memory functions"
-		"\n\n"
-		"Anders Baden Nielsen\nPPC testing"
-		"\n\n"
-		"Bas Zoetekouw\nMan pages, debian package management, CVS maintenance"
-		"\n\n"
-		"Carl Muckenhoupt\nSources to the SCI resource viewer tools that started it all"
-		"\n\n"
-		"Chris Kehler\nMakefile enhancements"
-		"\n\n"
-		"Christoph Reichenbach\nUN*X code, VM/Graphics/Sound/other infrastructure"
-		"\n\n"
-		"Christopher T. Lansdown\nOriginal CVS maintainer, Alpha compatibility fixes"
-		, 0, 15},
-	{"More FreeSCI hackers and contributors",
-	 "Claudio Matsuoka\nCVS snapshots, daily builds, BeOS and cygwin ports"
-	 "\n\n"
-	 "Dark Minister\nSCI research (bytecode and parser)"
-	 "\n\n"
-	 "Dmitry Jemerov\nPort to the Win32 platform, numerous bugfixes"
-	 "\n\n"
-	 "Emmanuel Jeandel\nBugfixes and bug reports"
-	 "\n\n"
-	 "Francois-R Boyer\nMT-32 information and mapping code"
-	 "\n\n"
-	 "George Reid\nFreeBSD package management"
-	 "\n\n"
-	 "Hubert Maier\nAmigaOS 4 port"
-	 , 0, 15},
-	{"Even more FreeSCI hackers & contributors",
-	 "Hugues Valois\nGame selection menu"
-	 "\n\n"
-	 "Johannes Manhave\nDocument format translation"
-	 "\n\n"
-	 "Jordi Vilalta\nNumerous code and website clean-up patches"
-	 "\n\n"
-	 "Lars Skovlund\nProject maintenance, most documentation, bugfixes, SCI1 support"
-	 "\n\n"
-	 "Magnus Reftel\nHeap implementation, Python class viewer, bugfixes"
-	 "\n\n"
-	 "Matt Hargett\nClean-ups, bugfixes, Hardcore QA, Win32"
-	 "\n\n"
-	 "Max Horn\nSetJump implementation"
-	 , 0, 15},
-	{"Still more of them",
-	 "Paul David Doherty\nGame version information"
-	 "\n\n"
-	 "Petr Vyhnak\nThe DCL-INFLATE algorithm, many Win32 improvements"
-	 "\n\n"
-	 "Rainer Canavan\nIRIX MIDI driver and bug fixes"
-	 "\n\n"
-	 "Rainer De Temple\nSCI research"
-	 "\n\n"
-	 "Ravi I.\nSCI0 sound resource specification"
-	 "\n\n"
-	 "Ruediger Hanke\nPort to the MorphOS platform"
-	 "\n\n"
-	 "Rune Orsval\nConfiguration file editor"
-	 , 0, 15},
-	{"Is there no end to these contributors?",
-	 "Rickard Lind\nMT32->GM MIDI mapping magic, sound research"
-	 "\n\n"
-	 "Rink Springer\nPort to the DOS platform, several bug fixes"
-	 "\n\n"
-	 "Robey Pointer\nBug tracking system hosting"
-	 "\n\n"
-	 "Sergey Lapin\nPort of Carl's type 2 decompression code"
-	 "\n\n"
-	 "Solomon Peachy\nSDL ports and much of the sound subsystem"
-	 "\n\n"
-	 "Vyacheslav Dikonov\nConfig script improvements"
-	 "\n\n"
-	 "Walter van Niftrik\nPorts to the Dreamcast and GP32 platforms",
-	 0, 15},
-	{"The CSCI5573 Team at CU Boulder",
-	 "Xiaojun Chen\nSean Terrell\nChristoph Reichenbach\n\n"
-	 "Special thanks to Prof. Dr. Gary Nutt\n\nfor allowing the FreeSCI VM extension as a\ncourse project in his Advanced OS course"
-	 , 0, 15},
-	{"Special Thanks",
-	 "Special Thanks as well\n\n\nto the linuxgames.com and telefragged.com crew\nfor hosting us\n\n"
-	 "To the savannah.gnu.org staff\nfor hosting our mailing list\n\n"
-	 "To Bob Heitman and Corey Cole for their support"
-	 , 0, 15}
-};
-
-
-void about_freesci(EngineState *s) {
-	int page;
-	gfxw_port_t *port;
-	int bodyfont, titlefont;
-	Resource *bodyfont_res = NULL;
-	int i;
-
-	titlefont = s->titlebar_port->font_nr;
-
-	i = 999;
-	while (!bodyfont_res && (i > -1))
-		bodyfont_res = s->resmgr->testResource(kResourceTypeFont, i--);
-
-	if (i == -1) {
-		sciprintf("Sorry, couldn't find a font...\n");
-		return;
-	}
-
-	bodyfont = i + 1;
-	for (page = 0; page < ABOUT_FREESCI_PAGES_NR; ++page) {
-		sci_event_t event;
-		int cont = 2;
-		int width, height, width2, foo;
-
-		_about_freesci_pages[page].fgcolor = 0;
-		_about_freesci_pages[page].bgcolor = 15;
-
-		gfxop_get_text_params(s->gfx_state, bodyfont, _about_freesci_pages[page].body, 300, &width, &height, 0,
-		                      NULL, NULL, NULL);
-		gfxop_get_text_params(s->gfx_state, titlefont, _about_freesci_pages[page].title, 300, &width2, &foo, 0,
-		                      NULL, NULL, NULL);
-
-		width += 4;
-		width2 += 4;
-		height += 12;
-
-		if (width2 > width)
-			width = width2;
-
-		port = sciw_new_window(s, gfx_rect(156 - (width >> 1), 100 - (height >> 1), width, height),
-		                       bodyfont, s->ega_colors[_about_freesci_pages[page].fgcolor],
-		                       s->ega_colors[_about_freesci_pages[page].bgcolor],
-		                       titlefont, s->ega_colors[15], s->ega_colors[0],
-		                       _about_freesci_pages[page].title, WINDOW_FLAG_TITLE);
-
-		port->add(GFXWC(port), GFXW(gfxw_new_text(s->gfx_state, gfx_rect(0, 0, width, height), bodyfont,
-		                            _about_freesci_pages[page].body,
-		                            ALIGN_CENTER, ALIGN_CENTER, port->color, port->color,
-		                            port->bgcolor, 0)
-		                           ));
-
-		s->visual->add(GFXWC(s->visual), GFXW(port));
-
-		port->add_dirty_abs(GFXWC(port), gfx_rect_fullscreen, 1);
-		s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
-		gfxop_update(s->gfx_state);
-
-		while (cont) {
-			event = gfxop_get_event(s->gfx_state, SCI_EVT_ANY);
-
-			if (event.type == SCI_EVT_MOUSE_RELEASE || event.type == SCI_EVT_MOUSE_PRESS)
-				--cont;
-
-			if (event.type == SCI_EVT_QUIT) {
-				quit_vm();
-				return;
-			}
-
-			if (event.type == SCI_EVT_KEYBOARD)
-				cont = 0;
-
-			gfxop_sleep(s->gfx_state, 25);
-		}
-
-
-		port->widfree(GFXW(port));
-		s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
-		gfxop_update(s->gfx_state);
-
-	}
-}
-
-
 static int _menu_go_down(EngineState *s, int menu_nr, int item_nr) {
 	int seeker, max = s->menubar->menus[menu_nr].items_nr;
 	seeker = item_nr + 1;
@@ -504,11 +327,6 @@ reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 		if (menu_nr > -1) {
 			s->r_acc = make_reg(0, ((menu_nr + 1) << 8) | (item_nr + 1));
-#ifdef MENU_FREESCI_BLATANT_PLUG
-			if (s->menubar->menus[menu_nr].items[item_nr].flags == MENU_FREESCI_BLATANT_PLUG)
-				about_freesci(s);
-#endif
-
 		} else
 			s->r_acc = NULL_REG;
 
diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp
index 479e530548..f8615a8c69 100644
--- a/engines/sci/gfx/menubar.cpp
+++ b/engines/sci/gfx/menubar.cpp
@@ -117,7 +117,7 @@ int _menubar_add_menu_item(gfx_state_t *state, menu_t *menu, int type, char *lef
 }
 
 void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char *entries, int font, reg_t entries_base) {
-	int i, add_freesci = 0;
+	int i;
 	menu_t *menu;
 	char tracker;
 	char *left = NULL, *right;
@@ -127,9 +127,6 @@ void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char
 	int height;
 
 	if (menubar->menus_nr == 0) {
-#ifdef MENU_FREESCI_BLATANT_PLUG
-		add_freesci = 1;
-#endif
 		menubar->menus = (menu_t *)sci_malloc(sizeof(menu_t));
 		menubar->menus_nr = 1;
 	} else
@@ -266,16 +263,6 @@ void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char
 		} // right string finished
 	} while (tracker);
 
-#ifdef MENU_FREESCI_BLATANT_PLUG
-	if (add_freesci) {
-		char *freesci_text = sci_strdup("About FreeSCI");
-		c_width = _menubar_add_menu_item(state, menu, MENU_TYPE_NORMAL, freesci_text, NULL, font, 0, 0, 0, NULL_REG);
-		if (c_width > max_width)
-			max_width = c_width;
-
-		menu->items[menu->items_nr-1].flags = MENU_FREESCI_BLATANT_PLUG;
-	}
-#endif
 	menu->width = max_width;
 }
 
diff --git a/engines/sci/gfx/menubar.h b/engines/sci/gfx/menubar.h
index 124344e539..d35e9f5fd0 100644
--- a/engines/sci/gfx/menubar.h
+++ b/engines/sci/gfx/menubar.h
@@ -36,10 +36,6 @@ namespace Sci {
 
 struct EngineState;
 
-#define MENU_FREESCI_BLATANT_PLUG 0xfff0
-/* This adds an "About FreeSCI" menu option to the first menu */
-
-
 #define MENU_HBAR_STRING_1 "--!"
 #define MENU_HBAR_STRING_2 "-!"
 #define MENU_HBAR_STRING_3 "!--"
@@ -159,9 +155,6 @@ void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char
 ** '^' : Control key (replaced by \002, which looks like "CTRL")
 ** '=' : Initial tag value
 ** and the special string "--!", which represents a horizontal bar in the menu.
-**
-** If MENU_FREESCI_BLATANT_PLUG is defined, an additional option "About FreeSCI" will be
-** added if this was the first menu to be added to the menu bar.
 */