From d33d4c6952a6609720ad3f1f21c63b871fb4a356 Mon Sep 17 00:00:00 2001 From: timo Date: Sun, 2 Mar 2008 23:36:20 +0000 Subject: [PATCH] misc fixes git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/ZeroRadiant@200 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- SConscript.q3map2 | 2 +- config.py | 2 +- include/version.h | 4 +- install/games/default_project.proj | 62 ------------------------------ radiant/gtkdlgs.cpp | 2 - radiant/mainframe.cpp | 4 +- radiant/preferences.cpp | 1 + radiant/qe3.cpp | 6 +-- tools/quake2/q2map/writebsp.c | 28 ++++---------- 9 files changed, 18 insertions(+), 93 deletions(-) delete mode 100644 install/games/default_project.proj diff --git a/SConscript.q3map2 b/SConscript.q3map2 index 24e0523d..30ba5cbe 100644 --- a/SConscript.q3map2 +++ b/SConscript.q3map2 @@ -14,6 +14,6 @@ env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) ) objects = lib_objects objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ] -q3map2 = env.Program( 'q3map2.bin', objects ) +q3map2 = env.Program( 'q3map2', objects ) Return( 'q3map2' ) diff --git a/config.py b/config.py index cdf869db..731daec4 100644 --- a/config.py +++ b/config.py @@ -161,7 +161,7 @@ class Config: lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) Export( 'lib_objects' ) q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) ) - self.InstallAs( 'install/q3map2.bin', q3map2 ) + self.InstallAs( 'install/q3map2', q3map2 ) def emit( self ): diff --git a/include/version.h b/include/version.h index 2ef2606b..91f5e433 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ // generated header, see makeversion.py -#define RADIANT_VERSION "1.4.0" +#define RADIANT_VERSION "1.6.0" #define RADIANT_MINOR_VERSION "0" -#define RADIANT_MAJOR_VERSION "4" +#define RADIANT_MAJOR_VERSION "6" diff --git a/install/games/default_project.proj b/install/games/default_project.proj deleted file mode 100644 index 9738c418..00000000 --- a/install/games/default_project.proj +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index f97682fe..58006414 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -1291,8 +1291,6 @@ void DoProjectSettings () SetKeyValue(g_qeglobals.d_project_entity, "brush_primit", (g_qeglobals.m_bBrushPrimitMode ? "1" : "0" )); -// QE_CheckProjectEntity(); - QE_SaveProject( g_PrefsDlg.m_strLastProject.GetBuffer() ); } diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index c1010f9f..aa6ef5e7 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -995,8 +995,10 @@ void MainFrame::create_main_menu (GtkWidget *window, GtkWidget *vbox) gtk_widget_hide (item); MRU_AddWidget (item, 3); menu_separator (menu); - create_menu_item_with_mnemonic (menu, "Check for GtkRadiant update (web)", + item = create_menu_item_with_mnemonic (menu, "Check for GtkRadiant update (web)", GTK_SIGNAL_FUNC (HandleCommand), ID_FILE_CHECKUPDATE); + // disable, the functionality is no longer available + gtk_widget_set_sensitive( item, FALSE ); create_menu_item_with_mnemonic (menu, "E_xit", GTK_SIGNAL_FUNC (HandleCommand), ID_FILE_EXIT); diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 2e59e0f9..3090695e 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -3222,6 +3222,7 @@ void CGameInstall::Run() { fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() ); fprintf( fg, " gametools=\"%sgames\"\n", g_strAppPath.GetBuffer() ); fprintf( fg, " enginepath=\"%s\"\n", m_strEngine.GetBuffer() ); + fprintf( fg, " prefix=\".q3a\"\n" ); switch ( m_availGames[ m_nComboSelect ] ) { case GAME_Q3: { Str source = g_strAppPath.GetBuffer(); diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp index a6584564..71bb374b 100644 --- a/radiant/qe3.cpp +++ b/radiant/qe3.cpp @@ -1666,9 +1666,9 @@ void Sys_LogFile (void) Sys_Printf("Started logging to %s\n", name.GetBuffer()); time_t localtime; time(&localtime); - Sys_Printf("Today is: %s", ctime(&localtime)); - Sys_Printf("This is GtkRadiant '" RADIANT_VERSION "' compiled " __DATE__ "\n"); - Sys_Printf(RADIANT_ABOUTMSG "\n"); + Sys_Printf( "Today is: %s", ctime(&localtime)); + Sys_Printf( "This is radiant '" RADIANT_VERSION "' compiled " __DATE__ "\n"); + Sys_Printf( RADIANT_ABOUTMSG "\n"); } else gtk_MessageBox (NULL, "Failed to create log file, check write permissions in Radiant directory.\n", diff --git a/tools/quake2/q2map/writebsp.c b/tools/quake2/q2map/writebsp.c index 8c45d530..7ab613fd 100644 --- a/tools/quake2/q2map/writebsp.c +++ b/tools/quake2/q2map/writebsp.c @@ -495,31 +495,17 @@ void BeginBSPFile (void) EndBSPFile ============ */ -void EndBSPFile (void) -{ +void EndBSPFile( void ) { char path[1024]; -#if 0 - int len; - byte *buf; -#endif - - EmitBrushes (); - EmitPlanes (); - UnparseEntities (); - - // load the pop -#if 0 - sprintf (path, "%s/pics/pop.lmp", gamedir); - len = LoadFile (path, &buf); - memcpy (dpop, buf, sizeof(dpop)); - free (buf); -#endif + EmitBrushes(); + EmitPlanes(); + UnparseEntities(); // write the map - sprintf (path, "%s.bsp", source); - Sys_Printf ("Writing %s\n", path); - WriteBSPFile (path); + sprintf( path, "%s.bsp", source ); + Sys_Printf( "Writing %s\n", path ); + WriteBSPFile( path ); } -- 2.39.2