/[enigma]/enigma/src/main.cc
ViewVC logotype

Diff of /enigma/src/main.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18 by ant_39, Sat Jun 21 18:30:40 2003 UTC revision 1.19 by dheck, Thu Jul 17 20:18:59 2003 UTC
# Line 223  init() Line 223  init()
223      else if (ap.nomusic)      else if (ap.nomusic)
224          sound::DisableMusic();          sound::DisableMusic();
225    
     oxyd::Init();  
     oxyd::ChangeSoundset(options::SoundSet, 1);  
   
226      video::Init();      video::Init();
227      video::SetPalette("enigma.pal");      video::SetPalette("enigma.pal");
228      display::Init();      display::Init();
# Line 234  init() Line 231  init()
231    
232      video::SetMouseCursor(enigma::LoadImage("cur-magic"), 4, 4);      video::SetMouseCursor(enigma::LoadImage("cur-magic"), 4, 4);
233      video::ShowMouse();      video::ShowMouse();
234    
235        oxyd::Init();
236        oxyd::ChangeSoundset(options::SoundSet, 1);
237  }  }
238    
239  static void  static void
# Line 280  main(int argc, char** argv) Line 280  main(int argc, char** argv)
280      chdir ("../Resources/"); /* chdir to the .app's parent */      chdir ("../Resources/"); /* chdir to the .app's parent */
281  #endif //MACOSX  #endif //MACOSX
282    
283      app.init(argc,argv);      try
284        {
285      init();          app.init(argc,argv);
286    
287      GUI_MainMenu(LevelPacks[0], 0);          init();
288      shutdown();  
289            GUI_MainMenu(LevelPacks[0], 0);
290            shutdown();
291        }
292        catch (px::XGeneric &e) {
293            cerr << "Error: " << e.what() << endl;
294        }
295        catch (std::exception &e) {
296            cerr << "Error: " << e.what() << endl;
297        }
298      return 0;      return 0;
299  }  }

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26