Changeset 302 for GtkRadiant/trunk/radiant

Timestamp:

07/25/08 02:31:37 (4 months ago)

Author:

lordhavoc

Message:

ported over the 1.5 branch version of q3map2 which is newer
made Visual Studio files work in VS2005 Express
fixed a ton of warnings in VS2005 Express
fixed some compile problems on OpenSUSE 11.0

Files:

• GtkRadiant/trunk/radiant/bp_dlg.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/brush.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/gtkdlgs.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/gtkmisc.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/gtkmisc.h (modified) (1 diff)
• GtkRadiant/trunk/radiant/missing.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/radiant.rc (modified) (1 diff)
• GtkRadiant/trunk/radiant/radiant.vcproj (modified) (5 diffs)
• GtkRadiant/trunk/radiant/selectedface.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/winding.cpp (modified) (1 diff)

GtkRadiant/trunk/radiant/bp_dlg.cpp

@@ -39 +39 @@
-
-  *loop = 0;
-(int)data
+GPOINTER_TO_INT (data)
-}
-

GtkRadiant/trunk/radiant/brush.cpp

@@ -3142 +3142 @@
-                        if (face->texdef.flags & Q2_SURF_TRANS33) {
-                                bTrans = true;
-
+f
-                        } else if (face->texdef.flags & Q2_SURF_TRANS66) {
-                                bTrans = true;
-
+f
-                        }
-                }

GtkRadiant/trunk/radiant/gtkdlgs.cpp

@@ -3159 +3159 @@
-
-    // Gef: Added toggle for optional cap func_grouping
- *
+
-  }
-

GtkRadiant/trunk/radiant/gtkmisc.cpp

@@ -860 +860 @@
-
-  *loop = 0;
-(int)data
+GPOINTER_TO_INT (data)
-}
-
@@ -1038 +1038 @@
-  success = (bool*)g_object_get_data (G_OBJECT (parent), "success");
-
-(int)data
+GPOINTER_TO_INT (data)
-    *success = true;
-

GtkRadiant/trunk/radiant/gtkmisc.h

@@ -82 +82 @@
-// NOTE: the returned filename is allocated with g_malloc and MUST be freed with g_free (both for win32 and Gtk dialogs)
-// GtkWidget *parent
-
+g
-
-/*!

GtkRadiant/trunk/radiant/missing.cpp

@@ -209 +209 @@
-
-bool radCreateDirectory( const char *directory ) {
-
+ != false
-}
-
-bool radCopyFile( const char *lpExistingFileName, const char *lpNewFileName ) {
-
+ != false
-}
-

GtkRadiant/trunk/radiant/radiant.rc

@@ -8 +8 @@
-// Generated from the TEXTINCLUDE 2 resource.
-//
-
+
+
-
-/////////////////////////////////////////////////////////////////////////////

GtkRadiant/trunk/radiant/radiant.vcproj

@@ -61 +61 @@
-                        <Tool
-                                Name="VCLinkerTool"
-l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0
+user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib intl
-                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
-                                GenerateDebugInformation="true"
@@ -135 +135 @@
-                        <Tool
-                                Name="VCLinkerTool"
-l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0
+user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib intl
-                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
-                                GenerateDebugInformation="true"
@@ -998 +998 @@
-                                </File>
-                                <File
+                                        RelativePath=".\gtkmisc.h"
+                                        >
+                                </File>
+                                <File
-                                        RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath=".\gtkmisc.h"
-                                        >
-                                </File>
@@ -2415 +2415 @@
-                        >
-                        <File
+                                RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"
+                                >
+                        </File>
+                        <File
-                                RelativePath="..\..\src\gtk+\gtk\makefile.msc"
-                                >
@@ -2424 +2428 @@
-                        <File
-                                RelativePath="..\..\src\gtk+\gdk\makefile.msc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"
-                                >
-                        </File>

GtkRadiant/trunk/radiant/selectedface.cpp

@@ -56 +56 @@
-int WINAPI QERApp_GetFaceInfo(int iface, _QERFaceData *pFaceData, winding_t *pWinding)
-{
-in
+size_
-
-  if (iface>=g_ptrSelectedFaces.GetSize())
@@ -75 +75 @@
-  pFaceData->m_bBPrimit = true;
-  memcpy( &pFaceData->brushprimit_texdef, &selFace->brushprimit_texdef, sizeof(brushprimit_texdef_t) );
-in
+size_
-  memcpy( pWinding, selFace->face_winding, size );
-  return 1;

GtkRadiant/trunk/radiant/winding.cpp

@@ -251 +251 @@
-        if (point < w->numpoints-1)
-        {
-in
+size_
-        }
-        w->numpoints--;