* Adding mod manager to Exult and Exult Studio. New Exult menu now displays

  all games in exult.cfg and has a sub-menu for each game's mods. Likewise,
  Exult Studio can load games and mods. In some of the files, converted some
  identation spaces into tabs, and some trailing spaces were removed.

Author: marzojr

ChangeLog

@@ -1,3 +1,37 @@
+2006-08-07  Marzo Sette Torres Junior <[email protected]>
+	* Adding mod manager to Exult and Exult Studio. New Exult menu now displays
+	  all games in exult.cfg and has a sub-menu for each game's mods. Likewise,
+	  Exult Studio can load games and mods. In some of the files, converted some
+	  identation spaces into tabs, and some trailing spaces were removed.
+	Detailed information:
+	* modmgr.*: New classes that (1) manage the game list, (2) manage each
+	  game's mods and (3) store information for each game/mod and correctly
+	  sets path information when needed. Games have their own entries in
+	  exult.cfg (with the additional "title" tag containing the string to
+	  display in the Exult menu), while mods have their own drop-in cfg files
+	  located in "<MODS>/*.cfg". The "<MODS>" directory is configurable for
+	  each game in exult.cfg (with the new "<mods>" tag), but defaults to
+	  "<path>/mods".
+	* menulist.*: New text-based menu entry classes replacing the shape-based
+	  ones (except for the MenuEntry, also referenced in game.cc, due to palette
+	  concerns) and added menu IDs to entries.
+	* exult.*: Command-line loading of mods with "--mod <mod>", modified loading
+	  of games to use classes from modmgr; moved some functions to modmgr.*;
+	  added "<MODS>" system path configurable in exult.cfg; Exult will now be
+	  centered in Windows when not in full-screen mode to prevent window
+	  being partially offscreen.
+	* game.*, bggame.*, sigame.*, devgame.*: Moved is_installed to modmgr.*,
+	  modified game creation to use modmgr.*, mod used is reported in stdout,
+	  initial game uses new menu IDs.
+	* exultmenu.*: The new menus mentioned above.
+	* exult0.pal, *.shp, flx.in: Removed old menu shapes and added fonts for them.
+	* cheat.cc: Map-editing loads Exult Studio using the current game and mod.
+	* studio.*, exult_studio.glade: Loading of games and mods via dialogs,
+	  loading of mods via command line with "-m <mod>" and creation of new
+	  mods via dialog. Uses the classes from modmgr.*
+	* makefile.*: Added modmgr.*, modified list of *.shp's used.
+
+
 2006-08-05 Willem Jan Palenstijn <[email protected]>
 	* configure.ac, desktop/Makefile.am: adapted version of patch #1532621:
 	  support alternative dirs for .desktop and icon files

Makefile.am

@@ -72,6 +72,8 @@ exult_SOURCES =	\
 	keyactions.h	\
 	menulist.cc	\
 	menulist.h	\
+	modmgr.cc \
+	modmgr.h \
 	monsters.cc	\
 	monsters.h	\
 	mouse.cc	\

Makefile.common

@@ -8,7 +8,7 @@ VERSION=1.4.01cvs
 MAIN_OBJS=actions.o actorio.o actors.o \
 	args.o bggame.o browser.o cheat.o  \
 	combat.o delobjs.o devgame.o \
-	 dir.o drag.o effects.o exult.o exultmenu.o \
+	dir.o drag.o effects.o exult.o exultmenu.o modmgr.o \
 	game.o gameclk.o gamedat.o gamemap.o \
 	gamerend.o gamewin.o keys.o keyactions.o \
 	menulist.o monsters.o mouse.o npcnear.o npctime.o palette.o \
@@ -74,32 +74,19 @@ OBJS=$(MAIN_OBJS) $(PATH_OBJS) $(CONF_OBJS) $(AUDIO_OBJS) $(FLIC_OBJS) $(FILE_OB
 EXULT_FLX = data/exult.flx data/exult_flx.h
 EXULT_FLX_OBJECTS = \
 	data/flx.in \
-	data/exult_quotes.shp \
-	data/exult_credits.shp \
 	data/quotes.txt \
 	data/credits.txt \
 	data/exult_logo.shp \
 	data/exult0.pal \
-	data/black_gate.shp \
-	data/serpent_isle.shp \
 	data/meditown.mid \
 	data/font.shp \
-	data/setup.shp \
-	data/play_intro.shp \
-	data/full_screen.shp \
-	data/cheating.shp \
-	data/ok.shp \
-	data/cancel.shp \
+	data/fonton.shp \
+	data/navfont.shp \
+	data/navfonton.shp \
 	data/pointers.shp \
-	data/exit.shp \
-	data/play_1st_scene.shp \
 	data/extras.shp \
-	data/midi_conversion.shp \
 	data/notebook.shp \
 	data/stats_extra.shp \
-	data/sfx_conversion.shp \
-	data/palette_fades.shp \
-	data/scaling_method.shp \
 	data/savegump.shp \
 	data/sav_downdown.shp \
 	data/sav_down.shp \

Makefile.studio.mingw

@@ -51,7 +51,7 @@ SERVER_OBJS=objserial.o servemsg.o servewin32.o
 MAPEDIT_OBJS=bargeedit.o chunklst.o combo.o eggedit.o compile.o execbox.o \
 	exult_studio.o locator.o maps.o \
 	npcedit.o npclst.o objbrowse.o objedit.o contedit.o paledit.o shapedraw.o \
-	shapefile.o shapegroup.o \
+	shapefile.o shapegroup.o modmgr.o \
 	shapeedit.o shapelst.o studio.o
 
 FILES_OBJS=Flat.o Flex.o IFF.o listfiles.o msgfile.o Table.o U7file.o utils.o

bggame.cc

@@ -39,6 +39,7 @@
 #include "exult.h"
 #include "Configuration.h"
 #include "shapeid.h"
+#include "modmgr.h"
 
 #ifndef ALPHA_LINUX_CXX
 #  include <cctype>
@@ -1538,7 +1539,7 @@ bool BG_Game::new_game(Vga_file &shapes)
 	Font *font = fontManager.get_font("MENU_FONT");
 
 	// Need to know if SI is installed
-	bool si_installed = SI_Game::is_installed();
+	bool si_installed = gamemanager->is_si_installed();
 
 	U7object faces_u7o("<DATA>/exult_bg.flx", EXULT_BG_FLX_MR_INTRO_SHP);
 	size_t shapesize;
@@ -1743,25 +1744,3 @@ bool BG_Game::new_game(Vga_file &shapes)
 
 	return ok;
 }
-
-bool BG_Game::is_installed()
-{
-	std::string buf("<BLACKGATE_STATIC>/endgame.dat");
-	bool foundbg = U7exists(buf);
-	bool foundbgflx = U7exists("<DATA>/exult_bg.flx");
-
-	if (foundbg)
-		std::cout << "Black Gate   : found" << std::endl;
-	else
-		std::cout << "Black Gate   : not found (" 
-				  << get_system_path(buf) << ")" << std::endl;
-
-	if (foundbgflx)
-		std::cout << "exult_bg.flx : found" << std::endl;
-	else
-		std::cout << "exult_bg.flx : not found (" 
-				  << get_system_path("<DATA>/exult_bg.flx")
-				  << ")" << std::endl;
-
-	return (foundbg && foundbgflx);
-}

bggame.h

@@ -38,7 +38,6 @@ class BG_Game: public Game {
 	virtual int  get_start_tile_y()
 		{ return (136*c_tiles_per_chunk); }
 	virtual void show_journey_failed();
-	static bool is_installed();
 
 private:
 	Vga_file shapes;

cheat.cc

@@ -177,6 +177,13 @@ void Cheat::toggle_map_editor (void) {
 					strcat(cmnd, " -g ");	// Now want game name.
 					std::string gamenamestr = Game::get_gametitle();
 					strcat(cmnd, gamenamestr.c_str());
+					// Now want mod name.
+					std::string modnamestr = Game::get_modtitle();
+					if (modnamestr != "")
+					{
+						strcat(cmnd, " -m ");
+						strcat(cmnd, modnamestr.c_str());
+					}
 					strcat(cmnd, " &");
 					cout << "Executing: " << cmnd << endl;
 #ifndef WIN32