quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Run Engine After Compile arguments passing (was eating 1st)

Browse Source
This commit is contained in:
Garux 2024-02-02 20:20:59 +06:00
parent 8683d43b7a
commit d33140daf4
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
radiant/watchbsp.cpp
View File

@ -726,33 +726,27 @@ void CWatchBSP::RoutineProcessing(){
// launch the engine .. OMG // launch the engine .. OMG
if ( g_WatchBSP_RunQuake ) { if ( g_WatchBSP_RunQuake ) {
globalOutputStream() << "Running engine...\n"; globalOutputStream() << "Running engine...\n";
auto cmd = StringStream( EnginePath_get() );
auto cmdline = StringOutputStream( 256 );
const auto buildArgs = [&]( const char *str ){
const char *map = strstr( str, "%mapname%" );
if( map != nullptr )
cmdline << StringRange( str, map ) << m_sBSPName << ( map + strlen( "%mapname%" ) );
else
cmdline << str;
};
// this is game dependant // this is game dependant
if ( string_equal( gamemode_get(), "mp" ) && !g_engineExecutableMP.string().empty() ) { const auto [exe, args] = [&](){
cmd << g_engineExecutableMP.string(); if( string_equal( gamemode_get(), "mp" ) ){
buildArgs( g_engineArgsMP.string().c_str() ); if( const auto exe = g_engineExecutableMP.string(); !exe.empty() )
} return std::pair( std::move( exe ), g_engineArgsMP.string() );
else }
{ return std::pair( g_engineExecutable.string(), g_engineArgs.string() );
cmd << g_engineExecutable.string(); }();
buildArgs( g_engineArgs.string().c_str() );
}
globalOutputStream() << cmd << ' ' << cmdline << '\n'; auto cmd = StringStream( '"', EnginePath_get(), exe, '"', ' ' );
if( const char *map = strstr( args.c_str(), "%mapname%" ) )
cmd << StringRange( args.c_str(), map ) << m_sBSPName << ( map + strlen( "%mapname%" ) );
else
cmd << args;
globalOutputStream() << cmd << '\n';
// execute now // execute now
if ( !Q_Exec( cmd, cmdline.c_str(), EnginePath_get(), false, false ) ) { if ( !Q_Exec( nullptr, cmd.c_str(), EnginePath_get(), false, false ) ) {
const auto msg = StringStream( "Failed to execute the following command: ", cmd, cmdline ); const auto msg = StringStream( "Failed to execute the following command: ", cmd, '\n' );
globalOutputStream() << msg; globalOutputStream() << msg;
qt_MessageBox( MainFrame_getWindow(), msg, "Build monitoring", EMessageBoxType::Error ); qt_MessageBox( MainFrame_getWindow(), msg, "Build monitoring", EMessageBoxType::Error );
} }