ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/main_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.22 by jlachmann, 2002-06-23T08:27:05Z vs.
Revision 1.26 by asvitkine, 2009-10-18T16:21:19Z

# Line 1 | Line 1
1   /*
2   *  main_amiga.cpp - Startup code for AmigaOS
3   *
4 < *  Basilisk II (C) 1997-2001 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 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 192 | Line 192 | int main(int argc, char **argv)
192                  QuitEmulator();
193          }
194  
195 <        if (FindTask((UBYTE *) "« Enforcer »"))
196 <                {
195 >        if (FindTask((UBYTE *) "« Enforcer »")) {
196                  ErrorAlert(STR_ENFORCER_RUNNING_ERR);
197                  QuitEmulator();
198 <                }
198 >        }
199  
200          // These two can fail (the respective gfx support won't be available, then)
201          P96Base = OpenLibrary((UBYTE *) "Picasso96API.library", 2);
202          CyberGfxBase = OpenLibrary((UBYTE *) "cybergraphics.library", 2);
203  
204          // Read preferences
205 <        PrefsInit(argc, argv);
205 >        PrefsInit(NULL, argc, argv);
206  
207          // Open AHI
208          ahi_port = CreateMsgPort();
# Line 312 | Line 311 | int main(int argc, char **argv)
311          FPUType = attn & AFF_68881 ? 1 : 0;
312  
313          // Initialize everything
314 <        if (!InitAll())
314 >        if (!InitAll(NULL))
315                  QuitEmulator();
316  
317          // Move VBR away from 0 if neccessary

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines