[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.37,1.38
Drigo Zoxx
drigo at users.sourceforge.net
Sat Mar 9 05:49:02 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv21877
Modified Files:
sdl.cpp
Log Message:
Added the config file support for the MacOS classic port. Inserted an atexit call so now the cursor is re-enabled on quit.
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** sdl.cpp 7 Mar 2002 05:18:55 -0000 1.37
--- sdl.cpp 9 Mar 2002 13:48:02 -0000 1.38
***************
*** 42,45 ****
--- 42,49 ----
static int current_shake_pos;
+ void resetCursor(void) {
+ SDL_ShowCursor(SDL_ENABLE);
+ }
+
void updateScreen(Scumm *s);
***************
*** 114,118 ****
}
! #if defined(__APPLE__)
if (event.key.keysym.sym=='q' && event.key.keysym.mod&KMOD_LMETA) {
exit(1);
--- 118,122 ----
}
! #if defined(__APPLE__) || defined(MACOS)
if (event.key.keysym.sym=='q' && event.key.keysym.mod&KMOD_LMETA) {
exit(1);
***************
*** 623,626 ****
--- 627,631 ----
/* Clean up on exit */
atexit(SDL_Quit);
+ atexit(resetCursor);
char buf[512], *gameName;
***************
*** 691,694 ****
--- 696,733 ----
int delta;
int last_time, new_time;
+
+ #if defined(MACOS)
+ /* support for config file on macos */
+
+ char *argitem;
+ char *argstr;
+ FILE *argf;
+
+ if (( argf = fopen("configuration.macos", "r")) == NULL) {
+ error("Can't open configuration file.\n");
+ exit(1);
+ }
+
+ argc=0;
+ argstr = (char *) malloc(64);
+ argstr = fgets(argstr, 64, argf);
+ if ((argitem = strchr(argstr, '\n'))!=NULL)
+ *argitem = '\0';
+
+ argitem = strtok(argstr, " ");
+
+ while (argitem!=NULL) {
+ argv = (char**) realloc(argv, (argc+1)*8);
+ argv[argc] = (char *) malloc(64);
+ strcpy(argv[argc], argitem);
+ argc++;
+
+ argitem = strtok(NULL, " ");
+ }
+
+ free(argstr);
+ fclose(argf);
+
+ #endif
sound.initialize(&scumm, &snd_driv);
More information about the Scummvm-git-logs
mailing list