|
 |
cf48725 |
diff -up vegastrike-source-0.5.0/src/cmd/music.cpp.foobar vegastrike-source-0.5.0/src/cmd/music.cpp
|
|
|
cf48725 |
--- vegastrike-source-0.5.0/src/cmd/music.cpp.foobar 2008-05-02 12:02:12.000000000 +0200
|
|
|
cf48725 |
+++ vegastrike-source-0.5.0/src/cmd/music.cpp 2008-05-02 12:08:50.000000000 +0200
|
|
|
cf48725 |
@@ -120,9 +120,7 @@ Music::Music (Unit *parent):random(false
|
|
|
cf48725 |
if (g_game.music_enabled&&!soundServerPipes()) {
|
|
|
03a8bd2 |
int pid=fork();
|
|
|
03a8bd2 |
if (!pid) {
|
|
|
03a8bd2 |
- string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
|
|
|
cf48725 |
- pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
|
|
|
cf48725 |
- soundserver_path = VSFileSystem::datadir+"/soundserver";
|
|
|
cf48725 |
+ string soundserver_path = "/usr/libexec/vegastrike/soundserver";
|
|
|
03a8bd2 |
pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
|
|
|
cf48725 |
g_game.music_enabled=false;
|
|
|
cf48725 |
VSFileSystem::vs_fprintf(stderr,"Unable to spawn music player server\n");
|
|
|
cf48725 |
@@ -190,24 +188,9 @@ Music::Music (Unit *parent):random(false
|
|
|
cf48725 |
}
|
|
|
cf48725 |
#else
|
|
|
cf48725 |
if (g_game.music_enabled) {
|
|
|
cf48725 |
- std::string tmp=VSFileSystem::datadir+"/bin/soundserver";
|
|
|
cf48725 |
- FILE * fp=fopen (tmp.c_str(),"rb");
|
|
|
cf48725 |
- if (!fp) {
|
|
|
cf48725 |
- tmp=VSFileSystem::datadir+"/soundserver";
|
|
|
cf48725 |
- fp = fopen(tmp.c_str(),"rb");
|
|
|
cf48725 |
- if (!fp){
|
|
|
cf48725 |
- g_game.music_enabled=false;
|
|
|
cf48725 |
- socketw=-1;
|
|
|
cf48725 |
- socketr=-1;
|
|
|
cf48725 |
- }else fclose(fp);
|
|
|
cf48725 |
- }else fclose(fp);
|
|
|
cf48725 |
- }
|
|
|
cf48725 |
- if (g_game.music_enabled) {
|
|
|
cf48725 |
int pid=fork();
|
|
|
cf48725 |
if (!pid) {
|
|
|
cf48725 |
- string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
|
|
|
cf48725 |
- pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),buffer1,buffer2,NULL);
|
|
|
cf48725 |
- soundserver_path = VSFileSystem::datadir+"/soundserver";
|
|
|
cf48725 |
+ string soundserver_path = "/usr/libexec/vegastrike/soundserver";
|
|
|
cf48725 |
pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),buffer1,buffer2,NULL);
|
|
|
cf48725 |
g_game.music_enabled=false;
|
|
|
cf48725 |
VSFileSystem::vs_fprintf(stderr,"Unable to spawn music player server\n");
|
|
|
cf48725 |
diff -up vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp.foobar vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp
|
|
|
cf48725 |
--- vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp.foobar 2008-04-26 12:00:33.000000000 +0200
|
|
|
cf48725 |
+++ vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp 2008-05-02 11:58:14.000000000 +0200
|
|
|
cf48725 |
@@ -1175,7 +1175,7 @@ void LaunchConverter(const char * input,
|
|
|
03a8bd2 |
#ifndef _WIN32
|
|
|
03a8bd2 |
int pid=fork();
|
|
|
03a8bd2 |
if (!pid) {
|
|
|
03a8bd2 |
- string soundserver_path = VSFileSystem::datadir+"/bin/mesher";
|
|
|
03a8bd2 |
+ string soundserver_path = "/usr/libexec/vegastrike/mesher";
|
|
|
03a8bd2 |
string firstarg = string("\"")+soundserver_path+string("\"");
|
|
|
03a8bd2 |
pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),input,output,args,NULL);
|
|
|
03a8bd2 |
soundserver_path = VSFileSystem::datadir+"/mesher";
|