ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/TTimo/GtkRadiant into hideLines

Browse source
This commit is contained in:
Pan 2018-01-21 14:04:28 +01:00
commit 478bcf18fe
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/splines/q_shared.h
View file

@ -113,11 +113,10 @@
#define PATH_SEP '\\'
#endif
//======================= MAC OS X SERVER DEFINES =====================
#if defined( __MACH__ ) && defined( __APPLE__ )
#elif defined( __MACH__ ) && defined( __APPLE__ )
#define MAC_STATIC
@ -166,9 +165,8 @@ void osxFreeMemory( void *pointer );
void Sys_PumpEvents( void );
#endif
#ifdef __MRC__
#elif defined( __MRC__ )
#define MAC_STATIC

8
libs/splines/util_str.cpp
View file

@ -480,7 +480,7 @@ void TestStringClass
idStr b; // b.len == 0, b.data == "\0"
idStr c( "test" ); // c.len == 4, c.data == "test\0"
idStr d( c ); // d.len == 4, d.data == "test\0"
idStr e( reinterpret_cast<const char *>( NULL ) );
idStr e( static_cast<const char *>( NULL ) );
// e.len == 0, e.data == "\0" ASSERT!
int i; // i == ?
@ -499,14 +499,14 @@ void TestStringClass
a = NULL; // a.len == 0, a.data == "\0" ASSERT!
a = c + d; // a.len == 8, a.data == "testtest\0"
a = c + "wow"; // a.len == 7, a.data == "testwow\0"
a = c + reinterpret_cast<const char *>( NULL );
a = c + static_cast<const char *>( NULL );
// a.len == 4, a.data == "test\0" ASSERT!
a = "this" + d; // a.len == 8, a.data == "thistest\0"
a = reinterpret_cast<const char *>( NULL ) + d;
a = static_cast<const char *>( NULL ) + d;
// a.len == 4, a.data == "test\0" ASSERT!
a += c; // a.len == 8, a.data == "testtest\0"
a += "wow"; // a.len == 11, a.data == "testtestwow\0"
a += reinterpret_cast<const char *>( NULL );
a += static_cast<const char *>( NULL );
// a.len == 11, a.data == "testtestwow\0" ASSERT!
a = "test"; // a.len == 4, a.data == "test\0"

13
tools/quake3/common/scriplib.c
View file

@ -58,6 +58,7 @@ qboolean tokenready; // only qtrue if UnGetToken was just ca
*/
void AddScriptToStack( const char *filename, int index ){
int size;
void* buffer;
script++;
if ( script == &scriptstack[MAX_INCLUDES] ) {
@ -65,10 +66,11 @@ void AddScriptToStack( const char *filename, int index ){
}
strcpy( script->filename, ExpandPath( filename ) );
size = vfsLoadFile( script->filename, (void **)&script->buffer, index );
size = vfsLoadFile( script->filename, &buffer, index );
if ( size == -1 ) {
Sys_Printf( "Script file %s was not found\n", script->filename );
script--;
}
else
{
@ -78,11 +80,12 @@ void AddScriptToStack( const char *filename, int index ){
else{
Sys_Printf( "entering %s\n", script->filename );
}
}
script->line = 1;
script->script_p = script->buffer;
script->end_p = script->buffer + size;
script->buffer = buffer;
script->line = 1;
script->script_p = script->buffer;
script->end_p = script->buffer + size;
}
}

2
tools/quake3/q3map2/map.c
View file

@ -1086,7 +1086,7 @@ static void ParseRawBrush( qboolean onlyLights ){
side->planenum = planenum;
/* bp: get the texture mapping for this texturedef / plane combination */
if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES ) {
if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES && planenum != -1 ) {
QuakeTextureVecs( &mapplanes[ planenum ], shift, rotate, scale, side->vecs );
}
}