Changeset 192

Timestamp:

12/24/07 18:10:45 (6 months ago)

Author:

timo

Message:

basic architecture for game configuration at runtime. writes out a .game, no sanity checks, does not copy any game pak data

Files:

• GtkRadiant/branches/ZeroRadiant/ChangeLog (added)
• GtkRadiant/branches/ZeroRadiant/TODO (added)
• GtkRadiant/branches/ZeroRadiant/config.py (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/docs/developer (deleted)
• GtkRadiant/branches/ZeroRadiant/install/games/q3.game (deleted)
• GtkRadiant/branches/ZeroRadiant/radiant/dialog.cpp (modified) (3 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/dialog.h (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/gtkmisc.cpp (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/main.cpp (modified) (13 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp (modified) (13 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.h (modified) (5 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/qe3.cpp (modified) (2 diffs)

GtkRadiant/branches/ZeroRadiant/config.py

@@ -153 +153 @@
-                if ( config == 'debug' ):
-                        env.Append( CFLAGS = [ '-g' ] )
+                        env.Append( CXXFLAGS = [ '-g' ] )
-                        env.Append( CPPDEFINES = [ '_DEBUG' ] )                         
-                else:
-                        env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations' ] )
+                        env.Append( CXXFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations' ] )
-                        #env.Append( CFLAGS = [ '-march=pentium3' ] )
-

GtkRadiant/branches/ZeroRadiant/radiant/dialog.cpp

@@ -109 +109 @@
-}
-
- (GtkObject *object, void *buf, DLG_DATA_TYPE type
+( GtkObject *object, void *buf, DLG_DATA_TYPE type 
-{
-  DLG_DATA *data;
@@ -121 +121 @@
-}
-
-
-
-
-
+
+
+
-}
-
@@ -262 +261 @@
-}
-
-
-
+
-  m_nLoop = 0;
-  m_nReturn = code;
-}
-
- 
-
- 
- (FALSE
+
+
+
+( FALSE 
-
-  PreModal();
-
- (m_pWidget
- (m_pWidget
+( m_pWidget 
+( m_pWidget 
-
-  m_nLoop = 1;
-m_nLoop)
- 
-
-
-
- (TRUE
-
- (m_pWidget
- (m_pWidget
-
- (m_nReturn
+ m_nLoop ) {
+
+
+
+if ( m_pWidget != NULL ) 
+( TRUE 
+
+( m_pWidget 
+( m_pWidget 
+
+( m_nReturn 
-
-  return m_nReturn;
-}
-

GtkRadiant/branches/ZeroRadiant/radiant/dialog.h

@@ -76 +76 @@
-  used in overloaded BuildDialog implementations to configure modal behaviour easily
-  */
- (GtkWidget *widget, int ret
+( GtkWidget *widget, int ret 
-
- private:

GtkRadiant/branches/ZeroRadiant/radiant/gtkmisc.cpp

@@ -852 +852 @@
-// Message Boxes
-
-
-
+
-  GtkWidget *parent;
-  int *loop, *ret;
-
- (widget
- (G_OBJECT (parent), "loop"
- (G_OBJECT (parent), "ret"
+( widget 
+( G_OBJECT( parent ), "loop" 
+( G_OBJECT( parent ), "ret" 
-
-  *loop = 0;

GtkRadiant/branches/ZeroRadiant/radiant/main.cpp

@@ -420 +420 @@
-}
-
-
-
-
-
+
+
+
-
-#ifdef _WIN32
@@ -443 +442 @@
-  struct passwd *pw;
-  seteuid(getuid());
-geteuid() == 0 && (loginname = getlogin()) != NULL &&
-
-  setuid(pw->pw_uid);
+ geteuid() == 0 && ( loginname = getlogin() ) != NULL && ( pw = getpwnam(loginname) ) != NULL ) {
+
+}
-#endif
-
@@ -508 +507 @@
-  g_strBitmapsPath += "bitmaps/";
-
-#if 0
-  // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=639
-  // now check if we are running from a network installation
-  // use a dummy file as the flag
-  FILE *f_netrun;
-  CString strNetrun;
-  strNetrun = g_strAppPath; strNetrun += NETRUN_FILENAME;
-  f_netrun = fopen(strNetrun.GetBuffer(), "r");
-  if (f_netrun)
-  {
-    fclose(f_netrun);
-    g_PrefsDlg.m_bUseHomePath = true;
-  }
-#endif
-  CGameDialog::UpdateNetrun(false); // read the netrun configuration
-
-
-
+
-    // we have to find a per-user g_strTempPath
-    // this behaves the same as on Linux
@@ -574 +558 @@
-  g_strAppPath = real;
-
-#if 0
-  printf("g_strAppPath: %s\n", g_strAppPath.GetBuffer());
-#endif
-
-  // radiant is installed in the parent dir of "tools/"
-  // NOTE: this is not very easy for debugging
@@ -584 +564 @@
-  g_strBitmapsPath = g_strAppPath;
-  g_strBitmapsPath += "bitmaps/";
-#if 0
-  printf("g_strBitmapsPath: %s\n", g_strBitmapsPath.GetBuffer());
-#endif
-  
-  // we will set this right after the game selection is done
@@ -608 +585 @@
-
-  FILE *pid;
-
-
-
+
+
-    fclose (pid);
-    CString msg;
@@ -652 +628 @@
-
-  // create a primary .pid for global init run
-
-
-
+
+
+
+
-  
-  // a safe check to avoid people running broken installations
@@ -662 +639 @@
-  // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=431
-#ifndef _DEBUG
-
+  //
-#endif
-#ifdef CHECK_VERSION  
@@ -729 +706 @@
-  
-  g_qeglobals.disable_ini = false;
- 
+
-
-  // close the primary
-
-
+
-    CString msg;
-    msg = "WARNING: Could not delete "; msg += g_pidGameFile;
@@ -846 +822 @@
-
-#ifndef SKIP_SPLASH
- 
+
-#endif
-
@@ -866 +842 @@
-
-  // redirect Gtk warnings to the console
- (
+( 
-                                             G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG), error_redirect, NULL);
- (
+( 
-                                             G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG), error_redirect, NULL);
-
-  // spog - creates new filters list for the first time
- //initialise to NULL
+
-  g_qeglobals.d_savedinfo.filters = FilterUpdate(g_qeglobals.d_savedinfo.filters);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-  // load up shaders now that we have the map loaded
-  // eviltypeguy
- 
+
-
-#ifndef SKIP_SPLASH
- 
- (GTK_WINDOW (splash_screen), GTK_WINDOW (g_pParentWnd->m_pWidget)
- (1000, try_destroy_splash, NULL
+
+( GTK_WINDOW( splash_screen ), GTK_WINDOW( g_pParentWnd->m_pWidget ) 
+( 1000, try_destroy_splash, NULL 
-#endif
-  
@@ -897 +874 @@
-  g_pParentWnd->DoWatchBSP();
-
- 
+
-
-  // close the log file if any
@@ -909 +886 @@
-  //   restricting it to linux build
-#ifdef __linux__
- (0
+( 0 
-#endif
-  return 0;

GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp

@@ -28 +28 @@
-#include "stdafx.h"
-#include <glib.h>
+#include <assert.h>
-#if defined (__linux__) || defined (__APPLE__)
-#include <sys/stat.h>
@@ -958 +959 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -975 +990 @@
-  GtkWidget *vbox, *text, *combo, *check;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  combo = gtk_combo_new();
-combo
- (GTK_BOX (vbox), combo, FALSE, FALSE, 0
+ combo 
+( GTK_BOX( vbox ), combo, FALSE, FALSE, 0 
-
-  // fill in with the game descriptions
-  GList *combo_list = (GList*)NULL;
-  list<CGameDescription *>::iterator iGame;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  gtk_widget_show(check);
-  gtk_box_pack_start (GTK_BOX(vbox), check, FALSE, FALSE, 0);
@@ -1017 +1032 @@
-
-#ifdef _WIN32
-"Networked install - per-user settings"
-check
- (GTK_BOX(vbox), check, FALSE, FALSE, 0
- (check, &m_bNetRun, DLG_CHECK_BOOL
+ "Networked install - per-user settings" 
+ check 
+( GTK_BOX( vbox ), check, FALSE, FALSE, 0 
+( check, &m_bNetRun, DLG_CHECK_BOOL 
-#endif
-
-"Log the console to radiant.log"
-check
- (GTK_BOX(vbox), check, FALSE, FALSE, 0
- (check, &m_bLogConsole, DLG_CHECK_BOOL
+ "Log the console to radiant.log" 
+ check 
+( GTK_BOX( vbox ), check, FALSE, FALSE, 0 
+( check, &m_bLogConsole, DLG_CHECK_BOOL 
-
-  // incref it so we can pass it around
- (GTK_WIDGET(mFrame)
+( GTK_WIDGET( mFrame ) 
-
-  return mFrame;
-}
-
-
-
+
-  if (!retrieve)
-  {
@@ -1071 +1085 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1101 +1127 @@
-  const char *path = strGamesPath.GetBuffer();
-
-
+
+
+
+
+
+
+
+
+
+
-
-  /*!
@@ -1137 +1172 @@
-      if (pDoc)
-      {
-new CGameDescription(pDoc, dirlist)
+ new CGameDescription( pDoc, dirlist ) 
-      }
-      else
@@ -1164 +1199 @@
-}
-
-/*GString* CGameDialog::InitGlobalPrefPath()
-{
-  GString* global_rc_path;
-  // configure m_global_rc_path
-#if defined (__linux__) || defined (__APPLE__)
-  global_rc_path = g_string_new (g_get_home_dir ());
-
-  if (global_rc_path->str[global_rc_path->len-1] != '/')
-    g_string_append (global_rc_path, "/");
-
-  g_string_append (global_rc_path, ".radiant/");
-  mkdir (global_rc_path->str, 0775);
-  g_string_append (global_rc_path, RADIANT_VERSION);
-  g_string_append (global_rc_path, "/");
-  mkdir (global_rc_path->str, 0775);
-#elif WIN32
-  global_rc_path = g_string_new (g_strAppPath.GetBuffer() );
-#else
-#error "WTF are you compiling under"
-#endif
-  return global_rc_path;
-}*/
-
-void CGameDialog::InitGlobalPrefPath()
-{
@@ -1209 +1221 @@
-  InitGlobalPrefPath();
-  ScanForGames();
-
-
-
+
+
+
+
+
+
-  }
-  LoadPrefs();
-
-
+
-    // search by .game name
-    list<CGameDescription *>::iterator iGame;
@@ -1227 +1241 @@
-    }
-  }
-
-
+
-    DoGameDialog();
-    // use m_nComboSelect to identify the game to run as and set the globals
-    m_pCurrentGameDescription = GameDescriptionForComboItem();
-
-
+
+
+
-  }
-  g_pGameDescription = m_pCurrentGameDescription;
@@ -1495 +1509 @@
-  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-  gtk_widget_set_usize(button, 60, -2);
- 
+
-
-  button = gtk_button_new_with_label ("Clean");
@@ -3016 +3030 @@
-    Sys_FPrintf(SYS_ERR, "Error occured while saving local prefs file '%s'\n", m_inipath->str);
-
-
-
-
-
+
+
+
+
+
-
-}
@@ -3101 +3116 @@
-    }
-}
+
+/*
+============================================================
+CGameInstall
+============================================================
+*/
+
+void CGameInstall::BuildDialog() {
+        GtkWidget *dlg, *vbox1, *button, *text, *combo, *entry;
+        
+        dlg = m_pWidget;
+        gtk_window_set_title( GTK_WINDOW( dlg ), "Configure games" );
+
+        vbox1 = gtk_vbox_new( FALSE, 0 );
+        gtk_widget_show( vbox1 );
+        gtk_container_add( GTK_CONTAINER( dlg ), vbox1 );
+
+        text = gtk_label_new( "Select the game to configure" );
+        gtk_widget_show( text );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
+
+        combo = gtk_combo_new();
+        gtk_widget_show( combo );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), combo, FALSE, FALSE, 0 );
+
+        GList *combo_list = NULL;
+        combo_list = g_list_append( combo_list, "Quake III Arena and mods" );
+        combo_list = g_list_append( combo_list, "Urban Terror standalone" );
+        combo_list = g_list_append( combo_list, "Warsaw" );
+        gtk_combo_set_popdown_strings( GTK_COMBO( combo ), combo_list );
+        g_list_free( combo_list );
+        AddDialogData( combo, &m_nComboSelect, DLG_COMBO_INT );
+
+        text = gtk_label_new( "Name:" );
+        gtk_widget_show( text );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
+        
+        entry = gtk_entry_new();
+        gtk_widget_show( entry );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), entry, FALSE, FALSE, 0 );
+        AddDialogData( entry, &m_strName, DLG_ENTRY_TEXT );
+
+        text = gtk_label_new( "Engine directory:" );
+        gtk_widget_show( text );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
+        
+        entry = gtk_entry_new();
+        gtk_widget_show( entry );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), entry, FALSE, FALSE, 0 );
+        AddDialogData( entry, &m_strEngine, DLG_ENTRY_TEXT );
+
+        // this gets done in the project stuff atm
+#if 0
+        text = gtk_label_new( "Mod subdirectory:" );
+        gtk_widget_show( text );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
+
+        entry = gtk_entry_new();
+        gtk_widget_show( entry );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), entry, FALSE, FALSE, 0 );
+        AddDialogData( entry, &m_strMod, DLG_ENTRY_TEXT );
+#endif
+
+        button = gtk_button_new_with_label( "OK" );
+        gtk_widget_show( button );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
+        AddModalButton( button, IDOK );
+
+        gtk_widget_set_usize( button, 60, -2 );
+}
+
+void CGameInstall::Run() {
+        DoModal();
+        Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() );
+
+        // write out the game file
+        Str gameFilePath = g_strAppPath.GetBuffer();
+        gameFilePath += "games/";
+        gameFilePath += m_strName.GetBuffer();
+        gameFilePath += ".game";
+        Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() );
+
+        FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
+        if ( fg == NULL ) {
+                Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
+        }
+        fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
+        fprintf( fg, "  name=\"%s\"\n", m_strName.GetBuffer() );
+        fprintf( fg, "  gametools=\"%sgames\"\n", g_strAppPath.GetBuffer() );
+        fprintf( fg, "  enginepath=\"%s\"\n", m_strEngine.GetBuffer() );
+        switch ( m_nComboSelect ) {
+        case GAME_Q3:
+                fprintf( fg, "  basegame=\"baseq3\"\n" );
+                break;
+        case GAME_URT:
+                fprintf( fg, "  basegame=\"q3ut4\"\n" );
+                break;
+        case GAME_WARSOW:
+                fprintf( fg, "  basegame=\"basewsw\"\n" );
+                break;
+        }
+        fprintf( fg, "/>\n" );
+        fclose( fg );
+}

GtkRadiant/branches/ZeroRadiant/radiant/preferences.h

@@ -195 +195 @@
-
-/*!
+select games, copy editing assets and write out configuration files
+ */
+class CGameInstall : public Dialog {
+public:
+        void Run();
+        void BuildDialog();
+
+        enum gameType_e {
+                GAME_Q3,
+                GAME_URT,
+                GAME_WARSOW
+        };
+
+protected:
+        Str m_strName;
+        Str     m_strMod;
+        Str m_strEngine;
+        int m_nComboSelect;
+};
+
+/*!
-standalone dialog for games selection, and more generally global settings
-*/
@@ -218 +239 @@
-#endif
-
+  bool m_bDoGameInstall;
+
+  CGameInstall mGameInstall;
+
-protected:
-  
@@ -259 +284 @@
-  list<CGameDescription *> mGames;
-
-
+
+
+
+
+
+
+
-  virtual ~CGameDialog(); 
-
-Str &s);  
+ Str &s );
-    
-  /*!
@@ -281 +312 @@
-
-  /*!
+        call out to the game installation dialog
+  */
+  void DoGameInstall();
+
+  /*!
-  Dialog API
-  this is only called when the dialog is built at startup for main engine select
-  */
- 
- (bool retrieve
+
+( bool retrieve 
-
-  /*!
@@ -336 +372 @@
-  */
-  CGameDescription *GameDescriptionForComboItem();
+
+  /*!
+        callback for the game install button
+  */
+  static void SInstallCallback( GtkWidget *widget, gpointer data );
-};
-

GtkRadiant/branches/ZeroRadiant/radiant/qe3.cpp

@@ -1700 +1700 @@
-#define BUFFER_SIZE 4096
-
-
-
+
-  char buf[BUFFER_SIZE];
-  
-  buf[0] = 0;
-buf, BUFFER_SIZE, text, args
+ buf, BUFFER_SIZE, text, args 
-  buf[BUFFER_SIZE-1] = 0;
-  const unsigned int length = strlen(buf);
-
-
-
+
-#ifdef _WIN32
-g_qeglobals.hLogFile, buf,length
-g_qeglobals.hLogFile
+ g_qeglobals.hLogFile, buf, length 
+ g_qeglobals.hLogFile 
-#endif
-#if defined (__linux__) || defined (__APPLE__)
-
-
-
-
-
-
+
+
+
+
+
-    // TTimo: FIXME: killed the console to avoid GDI leak fuckup
-
-
+
-      GtkTextBuffer* buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(g_qeglobals_gui.d_edit));
-      
@@ -1779 +1775 @@
-}
-
-
-
+
-  va_list args;
-
- (args, text
- (SYS_STD, text, args
- (args
+( args, text 
+( SYS_STD, text, args 
+( args 
-}
-