fix warnings
This commit is contained in:
parent
77439d8b66
commit
e62c6f4bb3
|
|
@ -88,13 +88,11 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
|
||||||
|
|
||||||
class ForEachFace : public BrushVisitor
|
class ForEachFace : public BrushVisitor
|
||||||
{
|
{
|
||||||
Brush &m_brush;
|
|
||||||
public:
|
public:
|
||||||
mutable int m_contentFlagsVis;
|
mutable int m_contentFlagsVis;
|
||||||
mutable int m_surfaceFlagsVis;
|
mutable int m_surfaceFlagsVis;
|
||||||
|
|
||||||
ForEachFace( Brush& brush )
|
ForEachFace() {
|
||||||
: m_brush( brush ){
|
|
||||||
m_contentFlagsVis = -1;
|
m_contentFlagsVis = -1;
|
||||||
m_surfaceFlagsVis = -1;
|
m_surfaceFlagsVis = -1;
|
||||||
}
|
}
|
||||||
|
|
@ -136,7 +134,7 @@ BrushGetLevel( brushlist_t& brushlist, int flag, bool content, bool notset, bool
|
||||||
bool pre( const scene::Path& path, scene::Instance& instance ) const {
|
bool pre( const scene::Path& path, scene::Instance& instance ) const {
|
||||||
Brush* brush = Node_getBrush( path.top() );
|
Brush* brush = Node_getBrush( path.top() );
|
||||||
if ( brush != 0 ) {
|
if ( brush != 0 ) {
|
||||||
ForEachFace faces( *brush );
|
ForEachFace faces;
|
||||||
brush->forEachFace( faces );
|
brush->forEachFace( faces );
|
||||||
// contentflags?
|
// contentflags?
|
||||||
if ( m_content ) {
|
if ( m_content ) {
|
||||||
|
|
|
||||||
|
|
@ -28,13 +28,6 @@
|
||||||
* GTK callback functions
|
* GTK callback functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class UFOAIGtk
|
|
||||||
{
|
|
||||||
GtkWindow* m_gtk_window;
|
|
||||||
public:
|
|
||||||
UFOAIGtk( void* gtk_window ) : m_gtk_window( ( GtkWindow* )gtk_window ){
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -447,7 +447,7 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD ){
|
||||||
#endif
|
#endif
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else if ( ( p_index_LUT[triangle->index_xyz[j]].next == NULL ) ) { // Not equal to Main entry, and no LL entry
|
else if ( p_index_LUT[triangle->index_xyz[j]].next == NULL ) { // Not equal to Main entry, and no LL entry
|
||||||
// Add first entry of LL from Main
|
// Add first entry of LL from Main
|
||||||
p_index_LUT2 = (index_LUT_t *)_pico_alloc( sizeof( index_LUT_t ) );
|
p_index_LUT2 = (index_LUT_t *)_pico_alloc( sizeof( index_LUT_t ) );
|
||||||
if ( p_index_LUT2 == NULL ) {
|
if ( p_index_LUT2 == NULL ) {
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ private:
|
||||||
CopiedString m_savefilename;
|
CopiedString m_savefilename;
|
||||||
xmlDocPtr doc;
|
xmlDocPtr doc;
|
||||||
xmlXPathContextPtr context;
|
xmlXPathContextPtr context;
|
||||||
xmlNodeSetPtr nodePtr;
|
|
||||||
|
|
||||||
xmlXPathObjectPtr XpathEval( const char* queryString ){
|
xmlXPathObjectPtr XpathEval( const char* queryString ){
|
||||||
const xmlChar* expression = (const xmlChar*)queryString;
|
const xmlChar* expression = (const xmlChar*)queryString;
|
||||||
|
|
|
||||||
|
|
@ -317,9 +317,6 @@ public:
|
||||||
|
|
||||||
class BrushHollowSelectedWalker : public scene::Graph::Walker {
|
class BrushHollowSelectedWalker : public scene::Graph::Walker {
|
||||||
HollowSettings& m_settings;
|
HollowSettings& m_settings;
|
||||||
|
|
||||||
float offset;
|
|
||||||
EHollowType HollowType;
|
|
||||||
public:
|
public:
|
||||||
BrushHollowSelectedWalker( HollowSettings& settings )
|
BrushHollowSelectedWalker( HollowSettings& settings )
|
||||||
: m_settings( settings ) {
|
: m_settings( settings ) {
|
||||||
|
|
|
||||||
|
|
@ -241,7 +241,7 @@ void CGameDialog::DoGameDialog(){
|
||||||
}
|
}
|
||||||
|
|
||||||
CGameDescription* CGameDialog::GameDescriptionForComboItem(){
|
CGameDescription* CGameDialog::GameDescriptionForComboItem(){
|
||||||
return ( m_nComboSelect >= 0 && m_nComboSelect < mGames.size() )?
|
return ( m_nComboSelect >= 0 && m_nComboSelect < static_cast<int>( mGames.size() ) )?
|
||||||
*std::next( mGames.begin(), m_nComboSelect )
|
*std::next( mGames.begin(), m_nComboSelect )
|
||||||
: 0; // not found
|
: 0; // not found
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined( INCLUDEDE_SCENEGRAPH_H )
|
#if !defined( INCLUDED_SCENEGRAPH_H )
|
||||||
#define INCLUDED_SCENEGRAPH_H
|
#define INCLUDED_SCENEGRAPH_H
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,6 @@ std::size_t m_iCurrentStep;
|
||||||
char *m_sBSPName;
|
char *m_sBSPName;
|
||||||
// buffer we use in push mode to receive data directly from the network
|
// buffer we use in push mode to receive data directly from the network
|
||||||
xmlParserInputBufferPtr m_xmlInputBuffer;
|
xmlParserInputBufferPtr m_xmlInputBuffer;
|
||||||
xmlParserInputPtr m_xmlInput;
|
|
||||||
xmlParserCtxtPtr m_xmlParserCtxt;
|
xmlParserCtxtPtr m_xmlParserCtxt;
|
||||||
// call this to switch the set listening mode
|
// call this to switch the set listening mode
|
||||||
bool SetupListening();
|
bool SetupListening();
|
||||||
|
|
|
||||||
|
|
@ -201,8 +201,6 @@ Vector3 m_vOrigin;
|
||||||
View m_view;
|
View m_view;
|
||||||
static Shader* m_state_selected;
|
static Shader* m_state_selected;
|
||||||
|
|
||||||
int m_ptCursorX, m_ptCursorY;
|
|
||||||
|
|
||||||
unsigned int m_buttonstate;
|
unsigned int m_buttonstate;
|
||||||
|
|
||||||
int m_nNewBrushPressx;
|
int m_nNewBrushPressx;
|
||||||
|
|
|
||||||
|
|
@ -607,7 +607,7 @@ FILE *SafeOpenWrite (char *filename)
|
||||||
return f;
|
return f;
|
||||||
}
|
}
|
||||||
|
|
||||||
FILE *SafeOpenRead (char *filename)
|
FILE *SafeOpenRead (const char *filename)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
|
|
@ -655,7 +655,7 @@ qboolean FileExists (char *filename)
|
||||||
LoadFile
|
LoadFile
|
||||||
==============
|
==============
|
||||||
*/
|
*/
|
||||||
int LoadFile (char *filename, void **bufferptr, int offset, int length)
|
int LoadFile (const char *filename, void **bufferptr, int offset, int length)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
void *buffer;
|
void *buffer;
|
||||||
|
|
@ -1189,7 +1189,7 @@ void FS_FreeFile(void *buf)
|
||||||
|
|
||||||
int FS_ReadFileAndCache(const char *qpath, void **buffer)
|
int FS_ReadFileAndCache(const char *qpath, void **buffer)
|
||||||
{
|
{
|
||||||
return LoadFile((char *) qpath, buffer, 0, 0);
|
return LoadFile(qpath, buffer, 0, 0);
|
||||||
} //end of the function FS_ReadFileAndCache
|
} //end of the function FS_ReadFileAndCache
|
||||||
|
|
||||||
int FS_FOpenFileRead( const char *filename, FILE **file, qboolean uniqueFILE )
|
int FS_FOpenFileRead( const char *filename, FILE **file, qboolean uniqueFILE )
|
||||||
|
|
|
||||||
|
|
@ -69,11 +69,11 @@ void Warning(char *warning, ...);
|
||||||
int CheckParm (char *check);
|
int CheckParm (char *check);
|
||||||
|
|
||||||
FILE *SafeOpenWrite (char *filename);
|
FILE *SafeOpenWrite (char *filename);
|
||||||
FILE *SafeOpenRead (char *filename);
|
FILE *SafeOpenRead (const char *filename);
|
||||||
void SafeRead (FILE *f, void *buffer, int count);
|
void SafeRead (FILE *f, void *buffer, int count);
|
||||||
void SafeWrite (FILE *f, void *buffer, int count);
|
void SafeWrite (FILE *f, void *buffer, int count);
|
||||||
|
|
||||||
int LoadFile (char *filename, void **bufferptr, int offset, int length);
|
int LoadFile (const char *filename, void **bufferptr, int offset, int length);
|
||||||
int TryLoadFile (char *filename, void **bufferptr);
|
int TryLoadFile (char *filename, void **bufferptr);
|
||||||
void SaveFile (char *filename, void *buffer, int count);
|
void SaveFile (char *filename, void *buffer, int count);
|
||||||
qboolean FileExists (char *filename);
|
qboolean FileExists (char *filename);
|
||||||
|
|
|
||||||
|
|
@ -1932,7 +1932,7 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
|
||||||
return UNZ_PARAMERROR;
|
return UNZ_PARAMERROR;
|
||||||
|
|
||||||
|
|
||||||
if ((pfile_in_zip_read_info->read_buffer == NULL))
|
if (pfile_in_zip_read_info->read_buffer == NULL)
|
||||||
return UNZ_END_OF_LIST_OF_FILE;
|
return UNZ_END_OF_LIST_OF_FILE;
|
||||||
if (len==0)
|
if (len==0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
|
|
@ -134,8 +134,7 @@ void LokiInitPaths( char *argv0 ){
|
||||||
path = getenv( "PATH" );
|
path = getenv( "PATH" );
|
||||||
|
|
||||||
/* minor setup */
|
/* minor setup */
|
||||||
last[ 0 ] = path[ 0 ];
|
last = path;
|
||||||
last[ 1 ] = '\0';
|
|
||||||
found = false;
|
found = false;
|
||||||
|
|
||||||
/* go through each : segment of path */
|
/* go through each : segment of path */
|
||||||
|
|
|
||||||
|
|
@ -135,8 +135,7 @@ void LokiInitPaths( char *argv0 ){
|
||||||
path = getenv( "PATH" );
|
path = getenv( "PATH" );
|
||||||
|
|
||||||
/* minor setup */
|
/* minor setup */
|
||||||
last[ 0 ] = path[ 0 ];
|
last = path;
|
||||||
last[ 1 ] = '\0';
|
|
||||||
found = false;
|
found = false;
|
||||||
|
|
||||||
/* go through each : segment of path */
|
/* go through each : segment of path */
|
||||||
|
|
|
||||||
|
|
@ -2102,7 +2102,7 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
|
||||||
return UNZ_PARAMERROR;
|
return UNZ_PARAMERROR;
|
||||||
|
|
||||||
|
|
||||||
if ((pfile_in_zip_read_info->read_buffer == NULL))
|
if (pfile_in_zip_read_info->read_buffer == NULL)
|
||||||
return UNZ_END_OF_LIST_OF_FILE;
|
return UNZ_END_OF_LIST_OF_FILE;
|
||||||
if (len==0)
|
if (len==0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user