ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-22 11:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixed warnings

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@278 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn 2008-06-26 11:40:59 +00:00
parent 6d10428141
commit 99b8049c8c
12 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/entity/light.cpp
View file

@ -243,7 +243,7 @@ static void DrawLightSphere(entity_t * e, int nGLState, int pref)
const char *target = ValueForKey(e, "target");
bool bIsSpotLight = !!target[0];
//!\todo Write an API for modules to register preference settings, and make this preference module-specific.
int nPasses = pref == 1 ? 3 : 2;
// int nPasses = pref == 1 ? 3 : 2;
g_QglTable.m_pfn_qglPushAttrib(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
g_QglTable.m_pfn_qglDepthMask(GL_FALSE);
@ -287,7 +287,7 @@ unsigned short indices[24] = { 0, 2, 3, 0, 3, 4, 0, 4, 5, 0, 5, 2,
void DrawLight(entity_t* e, int nGLState, int pref, int nViewType)
{
int i;
// int i;
// top, bottom, tleft, tright, bright, bleft
vec3_t points[6];
vec3_t vMid, vMin, vMax;
@ -479,7 +479,7 @@ void DrawLight(entity_t* e, int nGLState, int pref, int nViewType)
g_QglTable.m_pfn_qglLineStipple(8, 0xAAAA);
g_QglTable.m_pfn_qglEnable(GL_LINE_STIPPLE);
float* envelope = (pref == 1) ? e->fLightEnvelope1 : e->fLightEnvelope2;
float* envelope = (pref == 1) ? e->fLightEnvelope1 : e->fLightEnvelope2;
for (int iPass = 0; iPass < nPasses; iPass++)
{
float fRadius = envelope[iPass];

6
plugins/imagem8/m32.cpp
View file

@ -26,17 +26,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
void LoadM32(const char *name, unsigned char **pic, int *width, int *height)
{
FILE *f;
// FILE *f;
m32_header_t *m32_header;
//rgb_t *palette;
int i, num_pixels, size;
char text_buf[255];
// char text_buf[255];
unsigned int length;
unsigned char *palette_ent, *buf_temp;
unsigned char *buffer, *m32_file_buffer;
// open file
if ( length = vfsLoadFile ((char *) name, (void **) &m32_file_buffer, 0) == (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;

6
plugins/imagem8/m8.cpp
View file

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
void LoadM8(const char *name, unsigned char **pic, int *width, int *height)
{
FILE *f;
// FILE *f;
m8_header_t *m8_header;
rgb_t *palette;
int i, num_pixels, size;
@ -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, 0) == (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--)
@ -62,7 +62,7 @@ void LoadM8(const char *name, unsigned char **pic, int *width, int *height)
return;
}
}
m8_header = (m8_header_t *)m8_file_buffer;
// make sure we have a valid M8 file

8
plugins/imagewal/wal.cpp
View file

@ -30,17 +30,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
void LoadWAL(const char *name, unsigned char **pic, int *width, int *height)
{
FILE *f;
// FILE *f;
miptex_t *wal_header;
rgb_t *palette;
// rgb_t *palette;
int i, num_pixels, size;
char text_buf[255];
// char text_buf[255];
unsigned int length;
unsigned char *palette_ent, *buf_temp;
unsigned char *buffer, *wal_file_buffer;
// open file
if ( length = vfsLoadFile ((char *) name, (void **) &wal_file_buffer, 0) == (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/map/parse.cpp
View file

@ -569,7 +569,7 @@ bool Primitive_Parse(brush_t *pBrush)
void Entity_Parse(entity_t *pEntity)
{
brush_t *pBrush;
CPtrArray *brushes = NULL;
// CPtrArray *brushes = NULL;
char temptoken[1024];
char *token = Token();

4
plugins/map/write.cpp
View file

@ -52,7 +52,7 @@ void Patch_Write(patchMesh_t *pPatch, IDataStream *out)
if(!strncmp(str, "textures/", 9)) str+=9;
out->printf("patchDef2\n{\n%s\n( %i %i 0 0 0 )\n",
str, pPatch->width, pPatch->height);
// write matrix
out->printf("(\n");
for(i=0; i<pPatch->width; i++)
@ -117,7 +117,7 @@ void Face_Write (face_t *face, IDataStream *out, bool bAlternateTexdef = false)
if (g_MapVersion == MAPVERSION_HL)
{
char *pos;
while ( pos = (char*)strchr( str, '/' ) ) {
while ( (pos = (char*)strchr( str, '/' )) != NULL ) {
str = pos+1; // to speed optimize, change the "while" to an "if"
}
}

40
plugins/shaders/plugin.cpp
View file

@ -2,30 +2,30 @@
Copyright (c) 2001, Loki software, inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
Neither the name of Loki software nor the names of its contributors may be used
to endorse or promote products derived from this software without specific prior
written permission.
Neither the name of Loki software nor the names of its contributors may be used
to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
//
@ -46,7 +46,7 @@ _QERFileSystemTable g_VFSTable;
_QERScripLibTable g_ScripLibTable;
_QERBrushTable g_BrushTable;
static bool g_bInterfaceInitDone = false;
// static bool g_bInterfaceInitDone = false;
// =============================================================================
// SYNAPSE
@ -54,8 +54,8 @@ static bool g_bInterfaceInitDone = false;
CSynapseServer* g_pSynapseServer = NULL;
CSynapseClientShaders g_SynapseClient;
static const XMLConfigEntry_t entries[] =
{
static const XMLConfigEntry_t entries[] =
{
{ SHADERS_MAJOR, SYN_PROVIDE, sizeof(_QERShadersTable), NULL },
{ VFS_MAJOR, SYN_REQUIRE, sizeof(g_VFSTable), &g_VFSTable },
{ NULL, SYN_UNKNOWN, 0, NULL } };
@ -75,11 +75,11 @@ extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( const
g_pSynapseServer = pServer;
g_pSynapseServer->IncRef();
Set_Syn_Printf(g_pSynapseServer->Get_Syn_Printf());
if ( !g_SynapseClient.ConfigXML( pServer, NULL, entries ) ) {
return NULL;
}
g_SynapseClient.AddAPI(RADIANT_MAJOR, NULL, sizeof(_QERFuncTable_1), SYN_REQUIRE, &g_FuncTable);
g_SynapseClient.AddAPI(DATA_MAJOR, NULL, sizeof(_QERAppDataTable), SYN_REQUIRE, &g_DataTable);
g_SynapseClient.AddAPI(QGL_MAJOR, NULL, sizeof(_QERQglTable), SYN_REQUIRE, &g_QglTable);

10
plugins/surface/surfacedialog.cpp
View file

@ -219,7 +219,7 @@ void IsFaceConflicting()
{
texdef_t* tmp_texdef;
texdef_to_face_t* temp_texdef_face_list;
char buf[12];
// char buf[12];
char texture_name[128];
if (texdef_face_list_empty())
@ -257,7 +257,7 @@ void IsFaceConflicting()
{
temp_texdef_face_list = get_texdef_face_list()->next;
for (temp_texdef_face_list; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
for (; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
{
tmp_texdef = &temp_texdef_face_list->texdef;
if ( texdef_SI_values.shift[0] != tmp_texdef->shift[0] )
@ -315,7 +315,7 @@ static void PopulateTextureComboList()
texdef_to_face_t* temp_texdef_face_list;
char blank[1];
GList *items = NULL;
GList *tmp_item;
// GList *tmp_item;
int num_of_list_items = 0;
blank[0] = 0;
@ -381,7 +381,7 @@ static void GetTexdefInfo_from_Radiant()
if (!texdef_face_list_empty())
{
texdef_to_face_t* p = get_texdef_face_list();
// texdef_to_face_t* p = get_texdef_face_list();
GetSelFacesTexdef( get_texdef_face_list() );
}
@ -1862,7 +1862,7 @@ static void on_fit_button_clicked (GtkButton *button, gpointer user_data)
static void on_axial_button_clicked (GtkButton *button, gpointer user_data)
{
texdef_t* tmp_texdef;
texdef_t* tmp_orig_texdef;
// texdef_t* tmp_orig_texdef;
texdef_to_face_t* temp_texdef_face_list;
if (!texdef_face_list_empty() && g_bListenChanged)

2
plugins/surface_heretic2/surfacedialog.cpp
View file

@ -262,7 +262,7 @@ void IsFaceConflicting()
{
temp_texdef_face_list = get_texdef_face_list()->next;
for (temp_texdef_face_list; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
for (; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
{
tmp_texdef = &temp_texdef_face_list->texdef;
if ( texdef_SI_values.shift[0] != tmp_texdef->shift[0] )

10
plugins/surface_quake2/surfacedialog.cpp
View file

@ -224,7 +224,7 @@ void IsFaceConflicting()
{
texdef_t* tmp_texdef;
texdef_to_face_t* temp_texdef_face_list;
char buf[12];
// char buf[12];
char texture_name[128];
if (texdef_face_list_empty())
@ -262,7 +262,7 @@ void IsFaceConflicting()
{
temp_texdef_face_list = get_texdef_face_list()->next;
for (temp_texdef_face_list; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
for (; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
{
tmp_texdef = &temp_texdef_face_list->texdef;
if ( texdef_SI_values.shift[0] != tmp_texdef->shift[0] )
@ -320,7 +320,7 @@ static void PopulateTextureComboList()
texdef_to_face_t* temp_texdef_face_list;
char blank[1];
GList *items = NULL;
GList *tmp_item;
// GList *tmp_item;
int num_of_list_items = 0;
blank[0] = 0;
@ -386,7 +386,7 @@ static void GetTexdefInfo_from_Radiant()
if (!texdef_face_list_empty())
{
texdef_to_face_t* p = get_texdef_face_list();
// texdef_to_face_t* p = get_texdef_face_list();
GetSelFacesTexdef( get_texdef_face_list() );
}
@ -1875,7 +1875,7 @@ static void on_fit_button_clicked (GtkButton *button, gpointer user_data)
static void on_axial_button_clicked (GtkButton *button, gpointer user_data)
{
texdef_t* tmp_texdef;
texdef_t* tmp_orig_texdef;
// texdef_t* tmp_orig_texdef;
texdef_to_face_t* temp_texdef_face_list;
if (!texdef_face_list_empty() && g_bListenChanged)

2
plugins/surface_ufoai/surfacedialog.cpp
View file

@ -262,7 +262,7 @@ void IsFaceConflicting()
{
temp_texdef_face_list = get_texdef_face_list()->next;
for (temp_texdef_face_list; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
for (; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
{
tmp_texdef = &temp_texdef_face_list->texdef;
if ( texdef_SI_values.shift[0] != tmp_texdef->shift[0] )

2
radiant/texwindow.cpp
View file

@ -264,6 +264,8 @@ void Texture_SetMode(int iMenu)
iMode = -1;
texturing = false;
break;
default:
return;
}
g_qeglobals.d_savedinfo.iTexMenu = iMenu;