pkgsrc-WIP-discuss archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[khorben%defora.org@localhost: supertux in pkgsrc/wip]
I assume this mail didn't arrived to pkgsrc-wip-discuss@, because it was sent
to the netbsd.org domain.
----- Forwarded message from Pierre Pronchery <khorben%defora.org@localhost>
-----
Hi pkgsrc-wip-discuss,
just like in this mail from last year:
http://archive.netbsd.se/?ml=pkgsrc-wip-discuss&a=2005-12&t=1552580
supertux from pkgsrc/wip does not want to read MOD music on my system
(SDL_Mixer won't). I would not mind if it would still allow me to play,
since I don't think a program should abort if an optional feature is not
supported.
I managed to write a patch for supertux to avoid this. It should also
help with the default fullscreen option, although there is certainly
more to fix before enabling this back.
HTH,
--
khorben
$NetBSD$
--- src/configfile.cpp.orig 2005-06-21 23:16:07.000000000 +0200
+++ src/configfile.cpp
@@ -37,7 +37,7 @@ static void defaults ()
debug_mode = false;
audio_device = true;
- use_fullscreen = true;
+ use_fullscreen = false;
show_fps = false;
use_gl = false;
$NetBSD$
--- src/music_manager.cpp.orig 2005-06-21 23:16:07.000000000 +0200
+++ src/music_manager.cpp
@@ -40,7 +40,10 @@ MusicManager::load_music(const std::stri
return MusicRef(0);
if(!exists_music(file))
- st_abort("Couldn't load musicfile ", file.c_str());
+ {
+ st_warn("Couldn't load musicfile ", file.c_str());
+ return MusicRef(0);
+ }
std::map<std::string, MusicResource>::iterator i = musics.find(file);
assert(i != musics.end());
@@ -119,7 +122,7 @@ MusicManager::halt_music()
void
MusicManager::enable_music(bool enable)
{
- if(!audio_device)
+ if(!audio_device || current_music == 0)
return;
if(enable == music_enabled)
$NetBSD$
--- src/setup.cpp.orig 2005-07-08 14:19:17.000000000 +0200
+++ src/setup.cpp
@@ -889,6 +889,14 @@ void st_abort(const std::string& reason,
abort();
}
+
+/* --- WARN! --- */
+
+void st_warn(const std::string& reason, const std::string& details)
+{
+ fprintf(stderr, "\nWarning: %s\n%s\n\n", reason.c_str(), details.c_str());
+}
+
/* Set Icon (private) */
void seticon(void)
$NetBSD$
--- src/setup.h.orig 2005-06-21 23:16:07.000000000 +0200
+++ src/setup.h
@@ -42,6 +42,7 @@ void st_joystick_setup(void);
void st_shutdown(void);
void st_menu(void);
void st_abort(const std::string& reason, const std::string& details);
+void st_warn(const std::string& reason, const std::string& details);
void process_options_menu(void);
/** Return true if the gameloop() was entered, false otherwise */
----- End forwarded message -----
--
hernani
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss
Home |
Main Index |
Thread Index |
Old Index