[BACK]Return to main.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/main.c between versions 1.18 and 1.22

version 1.18, 2004/06/17 14:36:33 version 1.22, 2005/03/12 12:36:13
Line 10 Line 10
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 138  main(int argc, char *argv[]) Line 136  main(int argc, char *argv[])
         int rv = 1;          int rv = 1;
         int ch;          int ch;
         int i, drvmax;          int i, drvmax;
         BOOL shared_pixmap_flag = FALSE;  
   
         progname = argv[0];          progname = argv[0];
   
Line 252  main(int argc, char *argv[]) Line 249  main(int argc, char *argv[])
         mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;          mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif  #endif
   
         use_shared_pixmap = np2oscfg.shared_pixmap && shared_pixmap_flag;          use_shared_pixmap = np2oscfg.shared_pixmap;
   
         TRACEINIT();          TRACEINIT();
   
Line 296  main(int argc, char *argv[]) Line 293  main(int argc, char *argv[])
                 }                  }
         }          }
   
           joymng_initialize();
         mousemng_initialize();          mousemng_initialize();
         if (np2oscfg.MOUSE_SW) {          if (np2oscfg.MOUSE_SW) {
                 mouse_running(MOUSE_ON);                  mouse_running(MOUSE_ON);
Line 305  main(int argc, char *argv[]) Line 303  main(int argc, char *argv[])
         sysmng_initialize();          sysmng_initialize();
         taskmng_initialize();          taskmng_initialize();
   
         joy_init();  
         pccore_init();          pccore_init();
         S98_init();          S98_init();
   
Line 326  main(int argc, char *argv[]) Line 323  main(int argc, char *argv[])
                 }                  }
         }          }
   
   #if !defined(CPUCORE_IA32)
         if (np2oscfg.resume) {          if (np2oscfg.resume) {
                 flagload(np2resumeext, "Resume", FALSE);                  flagload(np2resumeext, "Resume", FALSE);
         }          }
   #endif
         sysmng_workclockreset();          sysmng_workclockreset();
   
         drvmax = (argc < 4) ? argc : 4;          drvmax = (argc < 4) ? argc : 4;
Line 350  main(int argc, char *argv[]) Line 349  main(int argc, char *argv[])
         pccore_cfgupdate();          pccore_cfgupdate();
   
         mouse_running(MOUSE_OFF);          mouse_running(MOUSE_OFF);
           joymng_deinitialize();
         S98_trash();          S98_trash();
   
   #if !defined(CPUCORE_IA32)
         if (np2oscfg.resume) {          if (np2oscfg.resume) {
                 flagsave(np2resumeext);                  flagsave(np2resumeext);
         } else {          } else {
                 flagdelete(np2resumeext);                  flagdelete(np2resumeext);
         }          }
   #endif
   
         pccore_term();          pccore_term();
         debugwin_destroy();          debugwin_destroy();
Removed from v.1.18  
changed lines
  Added in v.1.22

RetroPC.NET-CVS <cvs@retropc.net>