ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-25 05:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc fixes

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@200 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo 2008-03-02 23:36:20 +00:00
parent 58bb028e46
commit f33fed31ce
9 changed files with 18 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConscript.q3map2
View file

@ -14,6 +14,6 @@ env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
objects = lib_objects objects = lib_objects
objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ] 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' ) Return( 'q3map2' )

2
config.py
View file

@ -161,7 +161,7 @@ class Config:
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' ) Export( 'lib_objects' )
q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) ) q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) )
self.InstallAs( 'install/q3map2.bin', q3map2 ) self.InstallAs( 'install/q3map2', q3map2 )
def emit( self ): def emit( self ):

4
include/version.h
View file

@ -1,4 +1,4 @@
// generated header, see makeversion.py // generated header, see makeversion.py
#define RADIANT_VERSION "1.4.0" #define RADIANT_VERSION "1.6.0"
#define RADIANT_MINOR_VERSION "0" #define RADIANT_MINOR_VERSION "0"
#define RADIANT_MAJOR_VERSION "4" #define RADIANT_MAJOR_VERSION "6"

62
install/games/default_project.proj
View file

@ -1,62 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "dtds/project.dtd">
<!--
project template
the $* strings will be expanded following these rules:
$TEMPLATEapppath: path to the Radiant .. C:\Program Files\Gtkradiant
$TEMPLATEenginepath: path to the engine .. C:\quake3\ C:\Program Files\Quake III Arena\ /usr/local/games/quake3/
$TEMPLATEtoolspath: path to the tools directory (enginepath)radiant
(NOTE: on win32 tools directory is usually where the editor is .. but it's not true on linux)
$TEMPLATEuserhomepath: on linux, the directory with write permissions for saving maps etc.
on win32, == $TEMPLATEenginepath
$TEMPLATEbasedir: base game dir
Note : Default project settings are for single player... this can be changed throught the projects select in the File Menu
-->
<project>
<key name="version" value="2"/>
<key name="basepath" value="$TEMPLATEenginepath$TEMPLATEbasedir/"/>
<key name="rshcmd" value=""/>
<key name="remotebasepath" value="$TEMPLATEenginepath$TEMPLATEbasedir/"/>
<key name="entitypath" value="$TEMPLATEtoolspath$TEMPLATEbasedir/scripts/entities.def"/>
<key name="texturepath" value="$TEMPLATEenginepath$TEMPLATEbasedir/textures/"/>
<key name="autosave" value="$TEMPLATEuserhomepath$TEMPLATEbasedir/maps/autosave.map"/>
<key name="mapspath" value="$TEMPLATEuserhomepath$TEMPLATEbasedir/maps/"/>
<key name="bsp_Q3Map2: (single) BSP -meta" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $"/>
<key name="bsp_Q3Map2: (single) -vis" value="! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis $" />
<key name="bsp_Q3Map2: (single test) -vis -fast" value="! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -fast $" />
<key name="bsp_Q3Map2: (single test) -light -faster" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -faster $" />
<key name="bsp_Q3Map2: (single test) -light -fast" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast $" />
<key name="bsp_Q3Map2: (single) -light -super 2" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -super 2 $" />
<key name="bsp_Q3Map2: (single) -light -fast -super 2" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -super 2 $" />
<key name="bsp_Q3Map2: (single) -light -fast -super 2 -filter" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -super 2 -filter $" />
<key name="bsp_Q3Map2: (single) -light -super 2 -filter -bounce 8" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -super 2 -filter -bounce 8 $" />
<key name="bsp_Q3Map2: (single) -light -super 2 -filter -bounce 1" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -super 2 -filter -bounce 1 $" />
<key name="bsp_Q3Map2: (single) -light -fast -super 2 -filter -bounce 8" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -super 2 -filter -bounce 8 $" />
<key name="bsp_Q3Map2: (test) BSP -meta, -vis, -light -fast -filter" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -filter $" />
<key name="bsp_Q3Map2: (test) BSP -meta, -vis -fast, -light -fast -super 2 -filter" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt -fast $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -super 2 -filter $" />
<key name="bsp_Q3Map2: (final) BSP -meta, -vis, -light -fast -filter -super 2" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -filter -super 2 $" />
<key name="bsp_Q3Map2: (final) BSP -meta, -vis, -light -fast -filter -super 2" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -filter -super 2 $" />
<key name="bsp_Q3Map2: (final) BSP -meta, -vis, -light -fast -filter -super 2 -bounce 8" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -fast -super 2 -filter -bounce 8 $" />
<key name="bsp_Q3Map2: (simulate old style -light -extra) BSP -meta, -vis, -light -super 2" value="! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -meta $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -vis -saveprt $ &amp;&amp; ! &quot;$TEMPLATEapppathq3map2&quot; -v # -game quake3 -fs_basepath &quot;$TEMPLATEenginepath&quot; -light -super 2 $" />
<key name="bsp_AAS: compile AAS" value="! &quot;$TEMPLATEapppathbspc&quot; -optimize -threads 2 -forcesidesvisible -bsp2aas $" />
</project>

2
radiant/gtkdlgs.cpp
View file

@ -1291,8 +1291,6 @@ void DoProjectSettings ()
SetKeyValue(g_qeglobals.d_project_entity, "brush_primit", (g_qeglobals.m_bBrushPrimitMode ? "1" : "0" )); SetKeyValue(g_qeglobals.d_project_entity, "brush_primit", (g_qeglobals.m_bBrushPrimitMode ? "1" : "0" ));
// QE_CheckProjectEntity();
QE_SaveProject( g_PrefsDlg.m_strLastProject.GetBuffer() ); QE_SaveProject( g_PrefsDlg.m_strLastProject.GetBuffer() );
} }

4
radiant/mainframe.cpp
View file

@ -995,8 +995,10 @@ void MainFrame::create_main_menu (GtkWidget *window, GtkWidget *vbox)
gtk_widget_hide (item); gtk_widget_hide (item);
MRU_AddWidget (item, 3); MRU_AddWidget (item, 3);
menu_separator (menu); 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); 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", create_menu_item_with_mnemonic (menu, "E_xit",
GTK_SIGNAL_FUNC (HandleCommand), ID_FILE_EXIT); GTK_SIGNAL_FUNC (HandleCommand), ID_FILE_EXIT);

1
radiant/preferences.cpp
View file

@ -3222,6 +3222,7 @@ void CGameInstall::Run() {
fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() ); fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() );
fprintf( fg, " gametools=\"%sgames\"\n", g_strAppPath.GetBuffer() ); fprintf( fg, " gametools=\"%sgames\"\n", g_strAppPath.GetBuffer() );
fprintf( fg, " enginepath=\"%s\"\n", m_strEngine.GetBuffer() ); fprintf( fg, " enginepath=\"%s\"\n", m_strEngine.GetBuffer() );
fprintf( fg, " prefix=\".q3a\"\n" );
switch ( m_availGames[ m_nComboSelect ] ) { switch ( m_availGames[ m_nComboSelect ] ) {
case GAME_Q3: { case GAME_Q3: {
Str source = g_strAppPath.GetBuffer(); Str source = g_strAppPath.GetBuffer();

2
radiant/qe3.cpp
View file

@ -1667,7 +1667,7 @@ void Sys_LogFile (void)
time_t localtime; time_t localtime;
time(&localtime); time(&localtime);
Sys_Printf( "Today is: %s", ctime(&localtime)); Sys_Printf( "Today is: %s", ctime(&localtime));
Sys_Printf("This is GtkRadiant '" RADIANT_VERSION "' compiled " __DATE__ "\n"); Sys_Printf( "This is radiant '" RADIANT_VERSION "' compiled " __DATE__ "\n");
Sys_Printf( RADIANT_ABOUTMSG "\n"); Sys_Printf( RADIANT_ABOUTMSG "\n");
} }
else else

16
tools/quake2/q2map/writebsp.c
View file

@ -495,27 +495,13 @@ void BeginBSPFile (void)
EndBSPFile EndBSPFile
============ ============
*/ */
void EndBSPFile (void) void EndBSPFile( void ) {
{
char path[1024]; char path[1024];
#if 0
int len;
byte *buf;
#endif
EmitBrushes(); EmitBrushes();
EmitPlanes(); EmitPlanes();
UnparseEntities(); 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
// write the map // write the map
sprintf( path, "%s.bsp", source ); sprintf( path, "%s.bsp", source );
Sys_Printf( "Writing %s\n", path ); Sys_Printf( "Writing %s\n", path );