[Scummvm-cvs-logs] CVS: scummvm/dc dcmain.cpp,1.2,1.3 selector.cpp,1.3,1.4
Marcus Comstedt
marcus_c at users.sourceforge.net
Sat Feb 2 15:32:02 CET 2002
Update of /cvsroot/scummvm/scummvm/dc
In directory usw-pr-cvs1:/tmp/cvs-serv10297
Modified Files:
dcmain.cpp selector.cpp
Log Message:
Keep a copy of the game icon, for savegame purposes.
Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dc/dcmain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dcmain.cpp 2002/02/02 19:20:27 1.2
--- dcmain.cpp 2002/02/02 23:31:50 1.3
***************
*** 26,33 ****
--- 26,36 ----
#include "sound.h"
#include "dc.h"
+ #include "icon.h"
+
Scumm scumm;
ScummDebugger debugger;
Gui gui;
+ Icon icon;
SoundEngine sound;
***************
*** 80,93 ****
init_arm();
! if(!selectGame(&scumm, argv[1]))
exit(0);
sound.initialize(&scumm, &snd_driv);
- printf("Sound initalized.\n");
scumm._gui = &gui;
scumm.scummMain(argc, argv);
- printf("scummMain called.\n");
gui.init(&scumm);
--- 83,94 ----
init_arm();
! if(!selectGame(&scumm, argv[1], icon))
exit(0);
sound.initialize(&scumm, &snd_driv);
scumm._gui = &gui;
scumm.scummMain(argc, argv);
gui.init(&scumm);
***************
*** 109,113 ****
} while(1);
! printf("All done. Returning to menu.\n");
exit(0);
}
--- 110,114 ----
} while(1);
! /* NOTREACHED */
exit(0);
}
Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dc/selector.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** selector.cpp 2002/02/02 19:20:27 1.3
--- selector.cpp 2002/02/02 23:31:50 1.4
***************
*** 354,358 ****
}
! bool selectGame(Scumm *s, char *&ret)
{
Game *games = new Game[MAX_GAMES];
--- 354,358 ----
}
! bool selectGame(Scumm *s, char *&ret, Icon &icon)
{
Game *games = new Game[MAX_GAMES];
***************
*** 394,397 ****
--- 394,398 ----
chdir(the_game.dir);
ret = the_game.filename_base;
+ icon = the_game.icon;
return true;
} else
More information about the Scummvm-git-logs
mailing list