From 43c49b0e3314b8674f8320ccc86b87c3aacdfa16 Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 28 Dec 2016 09:06:03 +0000
Subject: [PATCH] Added atexit(SDL_Quit) for bail out without crash. Don't bail
 out when music file couldn't be loaded.

git-svn-id: https://svn.aros.org/svn/aros/trunk/ports@53114 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 game/madbomber/madbomber-0.2.5-aros.diff | 43 +++++++++++++++++++++++++++++---
 game/madbomber/mmakefile.src             |  4 +--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/game/madbomber/madbomber-0.2.5-aros.diff b/game/madbomber/madbomber-0.2.5-aros.diff
index 05fb3a7..f71b918 100644
--- a/game/madbomber/madbomber-0.2.5-aros.diff
+++ b/game/madbomber/madbomber-0.2.5-aros.diff
@@ -1,7 +1,44 @@
 diff -Naur madbomber-0.2.5-orig/madbomber.c madbomber-0.2.5/madbomber.c
---- madbomber-0.2.5-orig/madbomber.c	2010-07-11 11:10:25.749486791 +0200
-+++ madbomber-0.2.5/madbomber.c	2010-07-11 11:13:03.230740186 +0200
-@@ -4150,8 +4150,9 @@
+--- madbomber-0.2.5-orig/madbomber.c	2016-12-28 09:56:03.551794326 +0100
++++ madbomber-0.2.5/madbomber.c	2016-12-28 09:42:27.420813567 +0100
+@@ -2678,7 +2678,8 @@
+       exit(1);
+     }
+ 
+-  
++  atexit(SDL_Quit);
++
+   /* Init SDL Audio: */
+   
+   if (use_sound == 1)
+@@ -2998,7 +2999,7 @@
+ 		  "%s\n"
+ 		  "The Simple DirectMedia error that occured was:\n"
+ 		  "%s\n\n", MUS_TITLE, SDL_GetError());
+-	  exit(1);
++	  // exit(1);
+ 	}
+       
+      
+@@ -3011,7 +3012,7 @@
+ 		  "%s\n"
+ 		  "The Simple DirectMedia error that occured was:\n"
+ 		  "%s\n\n", MUS_TITLE, SDL_GetError());
+-	  exit(1);
++	  // exit(1);
+ 	}
+ #endif
+       
+@@ -3026,7 +3027,7 @@
+ 		      "%s\n"
+ 		      "The Simple DirectMedia error that occured was:\n"
+ 		      "%s\n\n", game_music_names[i], SDL_GetError());
+-	      exit(1);
++	      // exit(1);
+ 	    }
+ 	}
+     }
+@@ -4150,8 +4151,9 @@
    char * filename, * home;
    FILE * fi;
    
diff --git a/game/madbomber/mmakefile.src b/game/madbomber/mmakefile.src
index 735b5d6..0d71af4 100644
--- a/game/madbomber/mmakefile.src
+++ b/game/madbomber/mmakefile.src
@@ -19,13 +19,13 @@ TARGETDIR    := $(AROS_CONTRIB)/Games/Action/MadBomber
 SDL_PREFIX   := $(AROS_DEVELOPMENT)
 NOWARN_FLAGS := $(NOWARN_SEQUENCE_POINT) $(NOWARN_UNUSED_VARIABLE)
 USER_CFLAGS  := $(NOWARN_FLAGS) $(shell $(SDL_PREFIX)/bin/sdl-config --prefix=$(SDL_PREFIX) --cflags) \
-                -DDATA_PREFIX=\"PROGDIR:data/\" -D__SOUND
+                -DDATA_PREFIX=\"PROGDIR:data/\"
 
 FILES := $(PORTSDIR)/madbomber/$(ARCHBASE)/madbomber
 
 %build_prog mmake=ports-game-madbomber progname=MadBomber \
     files=$(FILES) targetdir=$(TARGETDIR) \
-    uselibs="SDL_image png jpeg SDL_mixer vorbisfile vorbis ogg SDL GL z"
+    uselibs="SDL_image png jpeg SDL_mixer vorbisfile vorbis ogg SDL z"
 
 %fetch mmake=ports-game-madbomber-fetch archive=$(ARCHBASE) destination=$(PORTSDIR)/madbomber \
     location=$(PORTSSOURCEDIR) archive_origins=$(REPOSITORIES) suffixes="tar.gz" \
-- 
2.11.4.GIT