quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply patch from Martin Gerhardy - more quake2 related modules compiled and misc fixes

Browse Source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@195 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo
2008-02-18 20:54:58 +00:00
parent 7a51df0e11
commit a06f65b042
32 changed files with 115 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/imagehl/lbmlib.cpp
View File

@@ -143,7 +143,7 @@ static void LoadIDSP (const char *name, byte ** pic, int *width, int *height)
//
// load the file
//
length = vfsLoadFile ((char *) name, (void **) &buffer);
length = vfsLoadFile ((char *) name, (void **) &buffer, 0);
if (length == (unsigned int) -1)
return;
@@ -329,7 +329,7 @@ static void LoadHLW (const char *name, byte ** pic, int *width, int *height)
//
// load the file
//
length = vfsLoadFile ((char *) name, (void **) &buffer);
length = vfsLoadFile ((char *) name, (void **) &buffer, 0);
if (length == (unsigned int) -1)
return;
@@ -514,7 +514,7 @@ static void LoadMIP (const char *name, byte ** pic, int *width, int *height)
//
// load the file
//
length = vfsLoadFile ((char *) name, (void **) &buffer);
length = vfsLoadFile ((char *) name, (void **) &buffer, 0);
if (length == (unsigned int) -1)
return;
@@ -522,7 +522,7 @@ static void LoadMIP (const char *name, byte ** pic, int *width, int *height)
mipdatasize = GET_MIP_DATA_SIZE(lpMip->width,lpMip->height);
palettelength = vfsLoadFile ("textures/palette.lmp", (void **) &loadedpalette);
palettelength = vfsLoadFile ("textures/palette.lmp", (void **) &loadedpalette, 0);
if (palettelength == 768)
palette = loadedpalette;
else

2
plugins/imagem8/m32.cpp
View File

@@ -36,7 +36,7 @@ void LoadM32(const char *name, unsigned char **pic, int *width, int *height)
unsigned char *buffer, *m32_file_buffer;
// open file
if ( length = vfsLoadFile ((char *) name, (void **) &m32_file_buffer) == (unsigned int) -1)
if ( length = vfsLoadFile ((char *) name, (void **) &m32_file_buffer, 0) == (unsigned int) -1)
{
Sys_Printf("Unable to open file %s\n",name);
return;

4
plugins/imagem8/m8.cpp
View File

@@ -44,7 +44,7 @@ void LoadM8(const char *name, unsigned char **pic, int *width, int *height)
strcat(text_buf, ".pcx.m8");
// open file
if ( length = vfsLoadFile ((char *) text_buf, (void **) &m8_file_buffer) == (unsigned int) -1)
if ( length = vfsLoadFile ((char *) text_buf, (void **) &m8_file_buffer, 0) == (unsigned int) -1)
{
strcpy(text_buf, name);
for(i=(strlen(text_buf)-1); i>0; i--)
@@ -56,7 +56,7 @@ void LoadM8(const char *name, unsigned char **pic, int *width, int *height)
}
}
strcat(text_buf, ".m8");
if ( length = vfsLoadFile ((char *) text_buf, (void **) &m8_file_buffer) == (unsigned int) -1)
if ( length = vfsLoadFile ((char *) text_buf, (void **) &m8_file_buffer, 0) == (unsigned int) -1)
{
Sys_Printf("Unable to open file %s\n",name);
return;

2
plugins/imagewal/wal.cpp
View File

@@ -40,7 +40,7 @@ void LoadWAL(const char *name, unsigned char **pic, int *width, int *height)
unsigned char *buffer, *wal_file_buffer;
// open file
if ( length = vfsLoadFile ((char *) name, (void **) &wal_file_buffer) == (unsigned int) -1)
if ( length = vfsLoadFile ((char *) name, (void **) &wal_file_buffer, 0) == (unsigned int) -1)
{
Sys_Printf("Unable to open file %s\n",name);
return;

2
plugins/surface_heretic2/surfacedialog.cpp
View File

@@ -644,7 +644,7 @@ void GetTexMods(bool b_SetUndoPoint)
{
g_bListenUpdate=FALSE;
SetChangeInFlags_Face_Heretic2 ( get_texdef_face_list() );
SetTexdef_FaceList( get_texdef_face_list(), b_SetUndoPoint );
SetTexdef_FaceList( get_texdef_face_list(), b_SetUndoPoint, false );
g_bListenUpdate=TRUE;
if (b_SetUndoPoint)

2
plugins/surface_quake2/surfacedialog.cpp
View File

@@ -643,7 +643,7 @@ void GetTexMods(bool b_SetUndoPoint)
{
g_bListenUpdate=FALSE;
SetChangeInFlags_Face_Quake2 ( get_texdef_face_list() );
SetTexdef_FaceList( get_texdef_face_list(), b_SetUndoPoint );
SetTexdef_FaceList( get_texdef_face_list(), b_SetUndoPoint, false );
g_bListenUpdate=TRUE;
if (b_SetUndoPoint)

2
plugins/textool/StdAfx.cpp
View File

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// stdafx.cpp : source file that includes just the standard includes
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
#include "StdAfx.h"
// TODO: reference any additional headers you need in STDAFX.H
// and not in this file