ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/C64.cpp
(Generate patch)

Comparing Frodo4/Src/C64.cpp (file contents):
Revision 1.3 by cebix, 2003-07-02T14:46:24Z vs.
Revision 1.7 by berlac, 2007-01-28T19:24:36Z

# Line 1 | Line 1
1   /*
2   *  C64.cpp - Put the pieces together
3   *
4 < *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
4 > *  Frodo (C) 1994-1997,2002-2005 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 103 | Line 103 | C64::C64()
103          memset(RAM1541, 0, DRIVE_RAM_SIZE);
104  
105          // Open joystick drivers if required
106 <        open_close_joysticks(false, false, ThePrefs.Joystick1On, ThePrefs.Joystick2On);
106 >        open_close_joysticks(0, 0, ThePrefs.Joystick1Port, ThePrefs.Joystick2Port);
107          joykey = 0xff;
108  
109   #ifdef FRODO_SC
# Line 121 | Line 121 | C64::C64()
121  
122   C64::~C64()
123   {
124 <        open_close_joysticks(ThePrefs.Joystick1On, ThePrefs.Joystick2On, false, false);
124 >        open_close_joysticks(ThePrefs.Joystick1Port, ThePrefs.Joystick2Port, 0, 0);
125  
126          delete TheJob1541;
127          delete TheREU;
# Line 179 | Line 179 | void C64::NMI(void)
179  
180   void C64::NewPrefs(Prefs *prefs)
181   {
182 <        open_close_joysticks(ThePrefs.Joystick1On, ThePrefs.Joystick2On, prefs->Joystick1On, prefs->Joystick2On);
182 >        open_close_joysticks(ThePrefs.Joystick1Port, ThePrefs.Joystick2Port, prefs->Joystick1Port, prefs->Joystick2Port);
183          PatchKernal(prefs->FastReset, prefs->Emul1541Proc);
184  
185          TheDisplay->NewPrefs(prefs);
# Line 713 | Line 713 | bool C64::LoadSnapshot(char *filename)
713   #endif
714  
715   #ifdef __unix
716 < #include "C64_x.h"
716 > # if defined(QTOPIA) or defined(MAEMO)
717 > #  include "C64_Embedded.h"
718 > # else
719 > #  include "C64_x.h"
720 > # endif
721   #endif
722  
723   #ifdef __mac__

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines