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

Merge remote-tracking branch 'ttimo/master'

Browse Source 
Conflicts:
	config.py
	libs/missing.h
	plugins/model/cpicosurface.cpp
	plugins/vfspk3/unzip.cpp
	radiant/main.cpp
	radiant/mainframe.cpp
	radiant/mainframe.h
	radiant/missing.cpp
	radiant/pluginmanager.cpp
	radiant/preferences.cpp
	radiant/preferences.h
	tools/quake3/common/cmdlib.c
	tools/quake3/common/unzip.c
	tools/quake3/q3map2/image.c
This commit is contained in:
Rudolf Polzer 2012-05-07 12:32:21 +02:00
parent 0bbb58dd9c 9b5ba1fe10
commit 7fc621fc78
4 changed files with 2676 additions and 2810 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/quake3/common/cmdlib.c
View File

@ -244,9 +244,6 @@ char *ExpandArg( const char *path ){
char *ExpandPath( const char *path ){
static char full[1024];
if ( !qdir ) {
Error( "ExpandPath called without qdir set" );
}
if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
strcpy( full, path );
return full;
@ -255,33 +252,6 @@ char *ExpandPath( const char *path ){
return full;
}
char *ExpandGamePath( const char *path ){
static char full[1024];
if ( !gamedir[0] ) {
Error( "ExpandGamePath called without gamedir set" );
}
if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
strcpy( full, path );
return full;
}
sprintf( full, "%s%s", gamedir, path );
return full;
}
char *ExpandPathAndArchive( const char *path ){
char *expanded;
char archivename[1024];
expanded = ExpandPath( path );
if ( archive ) {
sprintf( archivename, "%s/%s", archivedir, path );
QCopyFile( expanded, archivename );
}
return expanded;
}
char *copystring( const char *s ){
char *b;
b = safe_malloc( strlen( s ) + 1 );

2
tools/quake3/common/cmdlib.h
View File

@ -92,8 +92,6 @@ extern char *moddirparam;
void SetQdirFromPath( const char *path );
char *ExpandArg( const char *path ); // from cmd line
char *ExpandPath( const char *path ); // from scripts
char *ExpandGamePath( const char *path );
char *ExpandPathAndArchive( const char *path );
void ExpandWildcards( int *argc, char ***argv );

1101
tools/quake3/common/unzip.c
View File

File diff suppressed because it is too large Load Diff

3
tools/quake3/q3map2/image.c
View File

@ -98,8 +98,7 @@ typedef struct pngBuffer_s
{
byte *buffer;
png_size_t size, offset;
}
pngBuffer_t;
} pngBuffer_t;
void PNGReadData( png_struct *png, png_byte *buffer, png_size_t size ){
pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png );