ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-13 00:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #47 from mrwonko/MapLoading

Browse source 
Ability to open .map files with Radiant
This commit is contained in:
Timothee "TTimo" Besset 2012-05-06 11:21:44 -07:00
commit fd89b34bbb
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
radiant/main.cpp
View file

@ -894,7 +894,11 @@ int main( int argc, char* argv[] ) {
g_pParentWnd = new MainFrame(); g_pParentWnd = new MainFrame();
if ( g_PrefsDlg.m_bLoadLastMap && g_PrefsDlg.m_strLastMap.GetLength() > 0 ) { // If the first parameter is a .map, load that.
if( g_argc > 1 && IsMap( g_argv[1] ) ){
Map_LoadFile( g_argv[1] );
}
else if ( g_PrefsDlg.m_bLoadLastMap && g_PrefsDlg.m_strLastMap.GetLength() > 0 ) {
Map_LoadFile( g_PrefsDlg.m_strLastMap.GetBuffer() ); Map_LoadFile( g_PrefsDlg.m_strLastMap.GetBuffer() );
} }
else { else {

9
radiant/mainframe.cpp
View file

@ -3621,9 +3621,14 @@ void MainFrame::ShowMenuItemKeyBindings( GtkWidget* window ){
} }
} }
// Checks whether a given filename ends in .map
const bool IsMap(const char* filename){
return strlen(filename) >= 4 && strcmp(filename + strlen(filename) - 4, ".map") == 0;
}
void MainFrame::CreateQEChildren(){ void MainFrame::CreateQEChildren(){
// load the project file // load the project file, if it is a project file. (Or at least no .map)
if ( g_argc > 1 ) { if ( g_argc > 1 && !IsMap( g_argv[1] ) ) {
Sys_Printf( "loading project file from the command line: %s\n", g_argv[1] ); Sys_Printf( "loading project file from the command line: %s\n", g_argv[1] );
if ( !QE_LoadProject( g_argv[1] ) ) { if ( !QE_LoadProject( g_argv[1] ) ) {
Error( "Unable to load project file %s\n", g_argv[1] ); Error( "Unable to load project file %s\n", g_argv[1] );

3
radiant/mainframe.h
View file

@ -908,4 +908,7 @@ int gdk_offset_y;
// some C API to the mainframe functions // some C API to the mainframe functions
void WINAPI QERApp_Sleep(); void WINAPI QERApp_Sleep();
// Checks whether a given filename ends in .map
const bool IsMap(const char* filename);
#endif // _MAINFRAME_H_ #endif // _MAINFRAME_H_