Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > e03897ebe1a1dda78aec3da3263bae4a > files > 8

magicmaze-1.0.2-5.fc15.src.rpm

--- maze-1.0/include/mengine.h	2002-01-31 01:11:34.000000000 +0100
+++ maze-1.0.new/include/mengine.h	2008-01-19 14:55:09.000000000 +0100
@@ -13,6 +13,7 @@
 private:
 #ifndef NO_SOUND
     JGMOD *ex;
+    bool sound_enabled;
 #endif
     HiScore hiscore;
     int sequence;
@@ -31,4 +32,6 @@
     int activate ();
     void deactivate ();
     bool finished () { return !main_loop; }
+    int width;
+    int height;
 };
--- maze-1.0/src/main.cpp	2002-03-05 13:29:06.000000000 +0100
+++ maze-1.0.new/src/main.cpp	2008-01-19 14:33:08.000000000 +0100
@@ -77,30 +77,16 @@
     switch (gfxMode)
     {
     case GFX320X240:
-//        if (set_gfx_mode(GFX_AUTODETECT_WINDOWED,320,240,0,0)!=0)
-  //      {
-            // otherwise full screen will do
-            if (set_gfx_mode(GFX_AUTODETECT,320,240,0,0)!=0)
-            {
-                allegro_message("Unable initialize graphics module\n%s\n", allegro_error);
-                return 0;
-            }
-    //    }
+        m.width  = 320;
+        m.height = 240;
         break;
     case GFX640X480:
     default:
-//        if (set_gfx_mode(GFX_AUTODETECT_WINDOWED,640,480,0,0)!=0)
-  //      {
-            // otherwise full screen will do
-            if (set_gfx_mode(GFX_AUTODETECT,640,480,0,0)!=0)
-            {
-                allegro_message("Unable initialize graphics module\n%s\n", allegro_error);
-                return 0;
-            }
-    //    }
+        m.width  = 640;
+        m.height = 480;
         break;
     }
-    buffer = create_bitmap(SCREEN_W, SCREEN_H);
+    buffer = create_bitmap(m.width, m.height);
     if (!buffer)
     {
         allegro_message ("Error creating background buffer");
@@ -110,6 +96,11 @@
     {
         return 0;
     }
+    if (set_gfx_mode(GFX_AUTODETECT,m.width,m.height,0,0)!=0)
+    {
+        allegro_message("Unable initialize graphics module\n%s\n", allegro_error);
+        return 0;
+    }
     set_window_title ("Magic Maze");
     return 1;
 }
--- maze-1.0/src/mengine.cpp	2008-01-20 11:29:24.000000000 +0100
+++ maze-1.0.new/src/mengine.cpp	2008-01-19 14:51:46.000000000 +0100
@@ -43,7 +43,7 @@
 {
     main_loop = true;
     sequence = 0;
-    background = create_bitmap (SCREEN_W, SCREEN_H);
+    background = create_bitmap (width, height);
     clear_bitmap (background);
     createbackground();
 
@@ -87,23 +87,25 @@
     score.setHiScore (&hiscore);
 
 #ifndef NO_SOUND
+    sound_enabled = 0;
     reserve_voices (16, -1);
     if (install_sound (DIGI_AUTODETECT, MIDI_NONE, NULL) < 0)
     {
         allegro_message ("Error initializing sound card\n%s\n", allegro_error);
-        return 0;
+        return 1;
     }
     if (install_mod (8) < 0)    // leave some for sfx. 8 voices for mod. And
     {                       // 8 for wavs. Get it ?
         allegro_message ("Error setting digi voices");
-        return 0;
+        return 1;
     }
     ex = load_mod ("maze.dat#MUSIC");
     if (ex==NULL)
     {
         allegro_message ("Error reading Music from datafile");
-        return 0;
+        return 1;
     }
+    sound_enabled = 1;
     set_mod_volume (150);
     play_mod (ex, TRUE);
 #endif