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.8 by cebix, 2010-04-21T21:58:21Z

# Line 1 | Line 1
1   /*
2   *  C64.cpp - Put the pieces together
3   *
4 < *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
4 > *  Frodo Copyright (C) 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
109          CycleCounter = 0;
111 – #endif
110  
111          // System-dependent things
112          c64_ctor2();
# Line 121 | Line 119 | C64::C64()
119  
120   C64::~C64()
121   {
122 <        open_close_joysticks(ThePrefs.Joystick1On, ThePrefs.Joystick2On, false, false);
122 >        open_close_joysticks(ThePrefs.Joystick1Port, ThePrefs.Joystick2Port, 0, 0);
123  
124          delete TheJob1541;
125          delete TheREU;
# Line 179 | Line 177 | void C64::NMI(void)
177  
178   void C64::NewPrefs(Prefs *prefs)
179   {
180 <        open_close_joysticks(ThePrefs.Joystick1On, ThePrefs.Joystick2On, prefs->Joystick1On, prefs->Joystick2On);
180 >        open_close_joysticks(ThePrefs.Joystick1Port, ThePrefs.Joystick2Port, prefs->Joystick1Port, prefs->Joystick2Port);
181          PatchKernal(prefs->FastReset, prefs->Emul1541Proc);
182  
183          TheDisplay->NewPrefs(prefs);
# Line 713 | Line 711 | bool C64::LoadSnapshot(char *filename)
711   #endif
712  
713   #ifdef __unix
714 < #include "C64_x.h"
714 > # if defined(QTOPIA) or defined(MAEMO)
715 > #  include "C64_Embedded.h"
716 > # else
717 > #  include "C64_x.h"
718 > # endif
719   #endif
720  
721   #ifdef __mac__

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines