Changeset 200

Show
Ignore:
Timestamp:
03/02/08 17:36:20 (4 months ago)
Author:
timo
Message:

misc fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GtkRadiant/branches/ZeroRadiant/SConscript.q3map2

    r199 r200  
    1515objects = lib_objects 
    1616objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ] 
    17 q3map2 = env.Program( 'q3map2.bin', objects ) 
     17q3map2 = env.Program( 'q3map2', objects ) 
    1818 
    1919Return( 'q3map2' ) 

  • GtkRadiant/branches/ZeroRadiant/config.py

    r197 r200  
    162162                        Export( 'lib_objects' ) 
    163163                        q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) ) 
    164                         self.InstallAs( 'install/q3map2.bin', q3map2 ) 
     164                        self.InstallAs( 'install/q3map2', q3map2 ) 
    165165                                         
    166166 

  • GtkRadiant/branches/ZeroRadiant/include/version.h

    r183 r200  
    11// generated header, see makeversion.py 
    2 #define RADIANT_VERSION "1.4.0" 
     2#define RADIANT_VERSION "1.6.0" 
    33#define RADIANT_MINOR_VERSION "0" 
    4 #define RADIANT_MAJOR_VERSION "4" 
     4#define RADIANT_MAJOR_VERSION "6" 

  • GtkRadiant/branches/ZeroRadiant/radiant/gtkdlgs.cpp

    r185 r200  
    12911291 
    12921292    SetKeyValue(g_qeglobals.d_project_entity, "brush_primit", (g_qeglobals.m_bBrushPrimitMode ? "1" : "0" )); 
    1293  
    1294 //    QE_CheckProjectEntity(); 
    12951293 
    12961294    QE_SaveProject( g_PrefsDlg.m_strLastProject.GetBuffer() ); 

  • GtkRadiant/branches/ZeroRadiant/radiant/mainframe.cpp

    r185 r200  
    996996  MRU_AddWidget (item, 3); 
    997997  menu_separator (menu); 
    998   create_menu_item_with_mnemonic (menu, "Check for GtkRadiant update (web)", 
     998  item = create_menu_item_with_mnemonic (menu, "Check for GtkRadiant update (web)", 
    999999    GTK_SIGNAL_FUNC (HandleCommand), ID_FILE_CHECKUPDATE); 
     1000  // disable, the functionality is no longer available 
     1001  gtk_widget_set_sensitive( item, FALSE ); 
    10001002   
    10011003  create_menu_item_with_mnemonic (menu, "E_xit", 

  • GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp

    r197 r200  
    32233223        fprintf( fg, "  gametools=\"%sgames\"\n", g_strAppPath.GetBuffer() ); 
    32243224        fprintf( fg, "  enginepath=\"%s\"\n", m_strEngine.GetBuffer() ); 
     3225        fprintf( fg, "  prefix=\".q3a\"\n" );  
    32253226        switch ( m_availGames[ m_nComboSelect ] ) { 
    32263227        case GAME_Q3: { 

  • GtkRadiant/branches/ZeroRadiant/radiant/qe3.cpp

    r192 r200  
    16671667      time_t localtime; 
    16681668      time(&localtime); 
    1669       Sys_Printf("Today is: %s", ctime(&localtime)); 
    1670       Sys_Printf("This is GtkRadiant '" RADIANT_VERSION "' compiled " __DATE__ "\n"); 
    1671       Sys_Printf(RADIANT_ABOUTMSG "\n"); 
     1669      Sys_Printf( "Today is: %s", ctime(&localtime)); 
     1670      Sys_Printf( "This is radiant '" RADIANT_VERSION "' compiled " __DATE__ "\n"); 
     1671      Sys_Printf( RADIANT_ABOUTMSG "\n"); 
    16721672    } 
    16731673    else 

  • GtkRadiant/branches/ZeroRadiant/tools/quake2/q2map/writebsp.c

    r183 r200  
    496496============ 
    497497*/ 
    498 void EndBSPFile (void) 
    499 { 
     498void EndBSPFile( void ) { 
    500499        char    path[1024]; 
    501500 
    502 #if 0 
    503         int             len; 
    504         byte    *buf; 
    505 #endif 
    506  
    507         EmitBrushes (); 
    508         EmitPlanes (); 
    509         UnparseEntities (); 
    510  
    511         // load the pop 
    512 #if 0 
    513         sprintf (path, "%s/pics/pop.lmp", gamedir); 
    514         len = LoadFile (path, &buf); 
    515         memcpy (dpop, buf, sizeof(dpop)); 
    516         free (buf); 
    517 #endif 
     501        EmitBrushes(); 
     502        EmitPlanes(); 
     503        UnparseEntities(); 
    518504 
    519505        // write the map 
    520         sprintf (path, "%s.bsp", source); 
    521         Sys_Printf ("Writing %s\n", path); 
    522         WriteBSPFile (path); 
     506        sprintf( path, "%s.bsp", source ); 
     507        Sys_Printf( "Writing %s\n", path ); 
     508        WriteBSPFile( path ); 
    523509} 
    524510