Permalink
Browse files

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


git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@302 8a3a26a2-13c4-0310-b231-cf6edde360e5
  • Loading branch information...
1 parent ed8a176 commit 13421e7baa9cb7ded6b190b7018ba6954ce1d4a6 lordhavoc committed Jul 25, 2008
Showing with 6,892 additions and 3,776 deletions.
  1. +1 −1 SConscript.q3map2
  2. +1 −1 contrib/bkgrnd2d/dialog.cpp
  3. +248 −89 contrib/camera/camera.vcproj
  4. +3 −0 contrib/camera/dialogs.cpp
  5. +1 −1 contrib/camera/dialogs_common.cpp
  6. +2 −2 contrib/camera/funchandlers.cpp
  7. +1 −1 contrib/gtkgensurf/gendlgs.cpp
  8. +2 −2 contrib/gtkgensurf/gensurf.cpp
  9. +1 −1 include/qerplugin.h
  10. +3 −3 libs/ddslib/ddslib.c
  11. +1 −1 libs/picomodel/lwo/lwob.c
  12. +2 −2 libs/picomodel/lwo/pntspols.c
  13. +1 −1 plugins/entity/light.cpp
  14. +1 −1 plugins/surface/surfacedialog.cpp
  15. +1 −1 radiant/bp_dlg.cpp
  16. +2 −2 radiant/brush.cpp
  17. +1 −1 radiant/gtkdlgs.cpp
  18. +2 −2 radiant/gtkmisc.cpp
  19. +1 −1 radiant/gtkmisc.h
  20. +2 −2 radiant/missing.cpp
  21. +2 −1 radiant/radiant.rc
  22. +2,460 −2,460 radiant/radiant.vcproj
  23. +2 −2 radiant/selectedface.cpp
  24. +1 −1 radiant/winding.cpp
  25. +7 −7 tools/quake2/common/cmdlib.c
  26. +2 −2 tools/quake2/common/cmdlib.h
  27. +2 −2 tools/quake2/common/inout.c
  28. +5 −1 tools/quake2/common/path_init.c
  29. +1 −1 tools/quake2/common/qfiles.h
  30. +1 −1 tools/quake2/common/threads.c
  31. +1 −1 tools/quake2/q2map/q2map.h
  32. +1 −1 tools/quake2/q2map/qbsp.h
  33. +2 −2 tools/quake2/q2map/qrad.h
  34. +1 −1 tools/quake2/q2map/qvis.h
  35. +21 −7 tools/quake2/q2map/writebsp.c
  36. +21 −0 tools/quake2/qdata/images.c
  37. +20 −0 tools/quake2/qdata/models.c
  38. +27 −0 tools/quake2/qdata/qdata.c
  39. +20 −2 tools/quake2/qdata/qdata.h
  40. +20 −0 tools/quake2/qdata/sprites.c
  41. +21 −0 tools/quake2/qdata/tables.c
  42. +21 −0 tools/quake2/qdata/video.c
  43. +2 −1 tools/quake2/qdata_heretic2/anorms.h
  44. +4 −4 tools/quake2/qdata_heretic2/common/cmdlib.c
  45. +2 −2 tools/quake2/qdata_heretic2/common/inout.c
  46. +298 −0 tools/quake2/qdata_heretic2/common/md4.c
  47. +2 −1 tools/quake2/qdata_heretic2/common/path_init.c
  48. +1 −1 tools/quake2/qdata_heretic2/common/threads.c
  49. +6 −0 tools/quake2/qdata_heretic2/qdata.c
  50. +3 −3 tools/quake3/common/cmdlib.c
  51. +206 −196 tools/quake3/common/imagelib.c
  52. +5 −4 tools/quake3/common/imagelib.h
  53. +11 −3 tools/quake3/common/inout.c
  54. +1 −0 tools/quake3/common/inout.h
  55. +1 −1 tools/quake3/common/mutex.c
  56. +6 −3 tools/quake3/common/polylib.c
  57. +2 −0 tools/quake3/common/surfaceflags.h
  58. +1 −2 tools/quake3/common/threads.c
  59. +1 −1 tools/quake3/common/vfs.c
  60. +21 −0 tools/quake3/q3data/3dslib.c
  61. +21 −0 tools/quake3/q3data/3dslib.h
  62. +21 −0 tools/quake3/q3data/compress.c
  63. +21 −0 tools/quake3/q3data/images.c
  64. +22 −1 tools/quake3/q3data/md3lib.c
  65. +21 −0 tools/quake3/q3data/md3lib.h
  66. +21 −0 tools/quake3/q3data/models.c
  67. +21 −0 tools/quake3/q3data/oldstuff.c
  68. +22 −1 tools/quake3/q3data/p3dlib.c
  69. +21 −0 tools/quake3/q3data/p3dlib.h
  70. +21 −0 tools/quake3/q3data/polyset.c
  71. +24 −1 tools/quake3/q3data/q3data.c
  72. +21 −0 tools/quake3/q3data/q3data.h
  73. +21 −0 tools/quake3/q3data/stripper.c
  74. +21 −0 tools/quake3/q3data/video.c
  75. +13 −25 tools/quake3/q3map2/brush.c
  76. +2 −1 tools/quake3/q3map2/brush_primit.c
  77. +11 −6 tools/quake3/q3map2/bsp.c
  78. +3 −2 tools/quake3/q3map2/bspfile_abstract.c
  79. +2 −1 tools/quake3/q3map2/bspfile_ibsp.c
  80. +2 −1 tools/quake3/q3map2/bspfile_rbsp.c
  81. +371 −371 tools/quake3/q3map2/changelog.q3map1
  82. +102 −0 tools/quake3/q3map2/changelog.q3map2.txt
  83. +2 −1 tools/quake3/q3map2/convert_ase.c
  84. +2 −1 tools/quake3/q3map2/convert_map.c
  85. +3 −6 tools/quake3/q3map2/decals.c
  86. +3 −2 tools/quake3/q3map2/facebsp.c
  87. +2 −3 tools/quake3/q3map2/fog.c
  88. +10 −2 tools/quake3/q3map2/game_ef.h
  89. +264 −0 tools/quake3/q3map2/game_etut.h
  90. +10 −2 tools/quake3/q3map2/game_ja.h
  91. +10 −2 tools/quake3/q3map2/game_jk2.h
  92. +195 −0 tools/quake3/q3map2/game_qfusion.h
  93. +10 −2 tools/quake3/q3map2/game_quake3.h
  94. +10 −2 tools/quake3/q3map2/game_sof2.h
  95. +10 −2 tools/quake3/q3map2/game_tenebrae.h
  96. +160 −0 tools/quake3/q3map2/game_tremulous.h
  97. +10 −2 tools/quake3/q3map2/game_wolf.h
  98. +10 −2 tools/quake3/q3map2/game_wolfet.h
  99. +3 −2 tools/quake3/q3map2/image.c
  100. +2 −1 tools/quake3/q3map2/leakfile.c
  101. +211 −88 tools/quake3/q3map2/light.c
  102. +11 −9 tools/quake3/q3map2/light_bounce.c
  103. +28 −22 tools/quake3/q3map2/light_trace.c
  104. +500 −36 tools/quake3/q3map2/light_ydnar.c
  105. +195 −56 tools/quake3/q3map2/lightmaps_ydnar.c
  106. +293 −4 tools/quake3/q3map2/main.c
  107. +31 −6 tools/quake3/q3map2/map.c
  108. +10 −7 tools/quake3/q3map2/mesh.c
  109. +6 −6 tools/quake3/q3map2/model.c
  110. +2 −1 tools/quake3/q3map2/patch.c
  111. +15 −9 tools/quake3/q3map2/path_init.c
  112. +2 −1 tools/quake3/q3map2/portals.c
  113. +2 −1 tools/quake3/q3map2/prtfile.c
  114. +136 −89 tools/quake3/q3map2/q3map2.h
  115. +6 −6 tools/quake3/q3map2/q3map2.vcproj
  116. +220 −85 tools/quake3/q3map2/shaders.c
  117. +99 −30 tools/quake3/q3map2/surface.c
  118. +2 −1 tools/quake3/q3map2/surface_extra.c
  119. +2 −1 tools/quake3/q3map2/surface_foliage.c
  120. +2 −1 tools/quake3/q3map2/surface_fur.c
  121. +67 −31 tools/quake3/q3map2/surface_meta.c
  122. +2 −1 tools/quake3/q3map2/tjunction.c
  123. +2 −1 tools/quake3/q3map2/tree.c
  124. +11 −3 tools/quake3/q3map2/vis.c
  125. +3 −2 tools/quake3/q3map2/visflow.c
  126. +4 −8 tools/quake3/q3map2/writebsp.c
View
@@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment()
settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
-env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
+env.Append( LIBS = [ 'pthread', 'png', 'jpeg', 'mhash' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
objects = lib_objects
objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ]
@@ -147,7 +147,7 @@ void CBackgroundDialogPage::Browse()
//TODO bug/patch for comments
//TODO patern gets fucked up sometimes if empty
newfile = g_FuncTable.m_pfnFileDialog(pDialogWnd,TRUE,
- _("Load Background Image"),browsedir,FILETYPE_KEY);
+ _("Load Background Image"),browsedir,FILETYPE_KEY, NULL);
if(!newfile) {
Syn_Printf(MSG_PREFIX "newfile = NULL\n");
return;
@@ -1,89 +1,248 @@
-<?xml version="1.0" ?><VisualStudioProject Name="camera" ProjectGUID="{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}" ProjectType="Visual C++" RootNamespace="camera" Version="8.00">
- <Platforms>
- <Platform Name="Win32"/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration CharacterSet="2" ConfigurationType="2" IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool AdditionalDependencies="synapse.lib splines.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib" AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;" GenerateDebugInformation="true" ModuleDefinitionFile="camera.def" Name="VCLinkerTool" TargetMachine="1"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- <Configuration CharacterSet="2" ConfigurationType="2" IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool AdditionalDependencies="synapse.lib splines.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib" AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;" EnableCOMDATFolding="2" GenerateDebugInformation="true" ModuleDefinitionFile="camera.def" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCManifestTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCAppVerifierTool"/>
- <Tool Name="VCWebDeploymentTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
- <File RelativePath=".\camera.cpp">
- </File>
- <File RelativePath=".\camera.def">
- </File>
- <File RelativePath=".\dialogs.cpp">
- </File>
- <File RelativePath=".\dialogs_common.cpp">
- </File>
- <File RelativePath=".\funchandlers.cpp">
- </File>
- <File RelativePath=".\listener.cpp">
- </File>
- <File RelativePath=".\misc.cpp">
- </File>
- <File RelativePath=".\renderer.cpp">
- </File>
- </Filter>
- <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
- <File RelativePath=".\camera.h">
- </File>
- <File RelativePath=".\dialogs.h">
- </File>
- <File RelativePath=".\funchandlers.h">
- </File>
- <File RelativePath=".\listener.h">
- </File>
- <File RelativePath=".\misc.h">
- </File>
- <File RelativePath=".\renderer.h">
- </File>
- </Filter>
- <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="camera"
+ ProjectGUID="{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}"
+ RootNamespace="camera"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)\install\modules"
+ IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4996;4244;4267"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="synapse.lib splines.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib intl.lib"
+ AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
+ ModuleDefinitionFile="camera.def"
+ GenerateDebugInformation="true"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)\install\modules"
+ IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996;4244;4267"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="synapse.lib splines.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib intl.lib"
+ AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
+ ModuleDefinitionFile="camera.def"
+ GenerateDebugInformation="true"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath=".\camera.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\camera.def"
+ >
+ </File>
+ <File
+ RelativePath=".\dialogs.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\dialogs_common.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\funchandlers.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\listener.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\misc.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\renderer.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath=".\camera.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dialogs.h"
+ >
+ </File>
+ <File
+ RelativePath=".\funchandlers.h"
+ >
+ </File>
+ <File
+ RelativePath=".\listener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\misc.h"
+ >
+ </File>
+ <File
+ RelativePath=".\renderer.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
@@ -26,6 +26,9 @@ Copyright (C) 2002 Splash Damage Ltd.
#include "camera.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+
static GSList *g_pEditTypeRadio = NULL;
static GtkWidget *g_pEditModeEditRadioButton = NULL;
GtkWidget *g_pEditModeAddRadioButton = NULL;
@@ -36,7 +36,7 @@ void dialog_button_callback (GtkWidget *widget, gpointer data)
ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
*loop = 0;
- *ret = (int)data;
+ *ret = GPOINTER_TO_INT (data);
}
gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
@@ -106,7 +106,7 @@ void DoLoadCamera()
else
strcpy( basepath, g_FuncTable.m_pfnGetGamePath() );
- const gchar *filename = g_FuncTable.m_pfnFileDialog( (GtkWidget *)g_pRadiantWnd, TRUE, "Open Camera File", basepath, "camera");
+ const gchar *filename = g_FuncTable.m_pfnFileDialog( (GtkWidget *)g_pRadiantWnd, TRUE, "Open Camera File", basepath, "camera", NULL);
if( filename )
{
@@ -161,7 +161,7 @@ void DoSaveCamera() {
else
strcpy( basepath, g_FuncTable.m_pfnGetGamePath() );
- const gchar *filename = g_FuncTable.m_pfnFileDialog( (void *)g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera");
+ const gchar *filename = g_FuncTable.m_pfnFileDialog( (void *)g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera", NULL);
if( filename ) {
char fullpathtofile[PATH_MAX + 8];
Oops, something went wrong.

0 comments on commit 13421e7

Please sign in to comment.