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

Updates for Quake2World -> Quetoo project renaming.

Browse source
This commit is contained in:
Jay Dolan 2015-03-08 09:55:36 -04:00
parent bca10b6337
commit 6a5412d95c
5 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.project
View file

@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers> <triggers>clean,full,incremental,</triggers>
@ -23,6 +28,7 @@
<nature>org.eclipse.cdt.core.ccnature</nature> <nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures> </natures>
<filteredResources> <filteredResources>
<filter> <filter>

4
.pydevproject
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?> <?eclipse-pydev version="1.0"?><pydev_project>
<pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project> </pydev_project>

2
config.py
View file

@ -27,7 +27,7 @@ class Config:
# platforms for which to assemble a setup # platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup # paks to assemble in the setup
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'Q2WPack', 'JAPack', 'STVEFPack', 'WolfPack' ] self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack' ]
def __repr__( self ): def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )

26
radiant/preferences.cpp
View file

@ -3341,7 +3341,7 @@ void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
i->UpdateData( FALSE ); i->UpdateData( FALSE );
int game_id = i->m_availGames[ i->m_nComboSelect ]; int game_id = i->m_availGames[ i->m_nComboSelect ];
if ( game_id == GAME_Q2 || game_id == GAME_Q2W ) { if ( game_id == GAME_Q2 || game_id == GAME_QUETOO ) {
gtk_widget_show( i->m_executablesVBox ); gtk_widget_show( i->m_executablesVBox );
} else { } else {
gtk_widget_hide( i->m_executablesVBox ); gtk_widget_hide( i->m_executablesVBox );
@ -3387,8 +3387,8 @@ void CGameInstall::BuildDialog() {
case GAME_UFOAI: case GAME_UFOAI:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "UFO: Alien Invasion" ) ); gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "UFO: Alien Invasion" ) );
break; break;
case GAME_Q2W: case GAME_QUETOO:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quake2World" ) ); gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quetoo" ) );
break; break;
case GAME_WARSOW: case GAME_WARSOW:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Warsow" ) ); gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Warsow" ) );
@ -3523,9 +3523,9 @@ void CGameInstall::Run() {
gamePack = UFOAI_PACK; gamePack = UFOAI_PACK;
gameFilePath += UFOAI_GAME; gameFilePath += UFOAI_GAME;
break; break;
case GAME_Q2W: case GAME_QUETOO:
gamePack = Q2W_PACK; gamePack = QUETOO_PACK;
gameFilePath += Q2W_GAME; gameFilePath += QUETOO_GAME;
break; break;
case GAME_WARSOW: case GAME_WARSOW:
gameFilePath += WARSOW_GAME; gameFilePath += WARSOW_GAME;
@ -3630,13 +3630,13 @@ void CGameInstall::Run() {
fprintf( fg, " no_patch=\"true\"\n" ); fprintf( fg, " no_patch=\"true\"\n" );
break; break;
} }
case GAME_Q2W: { case GAME_QUETOO: {
#if defined( __APPLE__ ) || defined( __linux__ ) #if defined( __APPLE__ ) || defined( __linux__ )
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world\"\n" ); fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quetoo\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quake2world\"\n" ); fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quetoo\"\n" );
#elif _WIN32 #elif _WIN32
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world.exe\"\n" ); fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quetoo.exe\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\"Quake2World\"\n" ); fprintf( fg, " " PREFIX_ATTRIBUTE "=\"Quetoo\"\n" );
#endif #endif
fprintf( fg, " idtech2=\"true\"\n" ); fprintf( fg, " idtech2=\"true\"\n" );
fprintf( fg, " basegame=\"default\"\n" ); fprintf( fg, " basegame=\"default\"\n" );
@ -3769,8 +3769,8 @@ void CGameInstall::ScanGames() {
if ( stricmp( dirname, UFOAI_PACK ) == 0 ) { if ( stricmp( dirname, UFOAI_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_UFOAI; m_availGames[ iGame++ ] = GAME_UFOAI;
} }
if ( stricmp( dirname, Q2W_PACK ) == 0 ) { if ( stricmp( dirname, QUETOO_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_Q2W; m_availGames[ iGame++ ] = GAME_QUETOO;
} }
if ( stricmp( dirname, WARSOW_PACK ) == 0 ) { if ( stricmp( dirname, WARSOW_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_WARSOW; m_availGames[ iGame++ ] = GAME_WARSOW;

6
radiant/preferences.h
View file

@ -205,7 +205,7 @@ void Dump();
#define Q3_GAME "q3.game" #define Q3_GAME "q3.game"
#define URT_GAME "urt.game" #define URT_GAME "urt.game"
#define UFOAI_GAME "ufoai.game" #define UFOAI_GAME "ufoai.game"
#define Q2W_GAME "q2w.game" #define QUETOO_GAME "quetoo.game"
#define WARSOW_GAME "warsow.game" #define WARSOW_GAME "warsow.game"
#define NEXUIZ_GAME "nexuiz.game" #define NEXUIZ_GAME "nexuiz.game"
#define Q2_GAME "q2.game" #define Q2_GAME "q2.game"
@ -220,7 +220,7 @@ void Dump();
#define Q3_PACK "Q3Pack" #define Q3_PACK "Q3Pack"
#define URT_PACK "UrTPack" #define URT_PACK "UrTPack"
#define UFOAI_PACK "UFOAIPack" #define UFOAI_PACK "UFOAIPack"
#define Q2W_PACK "Q2WPack" #define QUETOO_PACK "QuetooPack"
#define WARSOW_PACK "WarsowPack" #define WARSOW_PACK "WarsowPack"
#define NEXUIZ_PACK "NexuizPack" #define NEXUIZ_PACK "NexuizPack"
#define Q2_PACK "Q2Pack" #define Q2_PACK "Q2Pack"
@ -248,7 +248,7 @@ public:
GAME_Q3 = 1, GAME_Q3 = 1,
GAME_URT, GAME_URT,
GAME_UFOAI, GAME_UFOAI,
GAME_Q2W, GAME_QUETOO,
GAME_WARSOW, GAME_WARSOW,
GAME_NEXUIZ, GAME_NEXUIZ,
GAME_Q2, GAME_Q2,