nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-01 05:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

aaaand fix terrain too.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4470 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-08-27 18:09:14 +00:00
parent 7f84519ce2
commit 61ff88d970
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/gl/gl_heightmap.c
View file

@ -1496,8 +1496,8 @@ void Terr_RebuildMesh(hmsection_t *s, int x, int y)
GL_SelectVBO(s->vbo.coord.gl.vbo); GL_SelectVBO(s->vbo.coord.gl.vbo);
qglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, (sizeof(vecV_t)+sizeof(vec2_t)+sizeof(vec2_t)) * mesh->numvertexes, mesh->xyz_array); qglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, (sizeof(vecV_t)+sizeof(vec2_t)+sizeof(vec2_t)) * mesh->numvertexes, mesh->xyz_array);
if (mesh->colors4f_array) if (mesh->colors4f_array[0])
qglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, (sizeof(vecV_t)+sizeof(vec2_t)+sizeof(vec2_t)) * mesh->numvertexes, sizeof(vec4_t)*mesh->numvertexes, mesh->colors4f_array); qglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, (sizeof(vecV_t)+sizeof(vec2_t)+sizeof(vec2_t)) * mesh->numvertexes, sizeof(vec4_t)*mesh->numvertexes, mesh->colors4f_array[0]);
GL_SelectVBO(0); GL_SelectVBO(0);
s->vbo.coord.gl.addr = 0; s->vbo.coord.gl.addr = 0;
s->vbo.texcoord.gl.addr = (void*)((char*)mesh->st_array - (char*)mesh->xyz_array); s->vbo.texcoord.gl.addr = (void*)((char*)mesh->st_array - (char*)mesh->xyz_array);

16
engine/server/sv_ccmds.c
View file

@ -1011,8 +1011,8 @@ void SV_FilterList_f (void)
void SV_Unban_f (void) void SV_Unban_f (void)
{ {
qboolean all = false; qboolean all = false;
bannedips_t *nb = svs.bannedips; bannedips_t **link;
bannedips_t *nbnext; bannedips_t *nb;
netadr_t unbanadr = {0}; netadr_t unbanadr = {0};
netadr_t unbanmask = {0}; netadr_t unbanmask = {0};
char adr[MAX_ADR_SIZE]; char adr[MAX_ADR_SIZE];
@ -1031,22 +1031,22 @@ void SV_Unban_f (void)
return; return;
} }
while (nb) for (link = &svs.bannedips ; (nb = *link) ; )
{ {
nbnext = nb->next;
if (all || (NET_CompareAdr(&nb->adr, &unbanadr) && NET_CompareAdr(&nb->adrmask, &unbanmask))) if (all || (NET_CompareAdr(&nb->adr, &unbanadr) && NET_CompareAdr(&nb->adrmask, &unbanmask)))
{ {
if (!all) if (!all)
Con_Printf("unbanned %s\n", NET_AdrToStringMasked(adr, sizeof(adr), &nb->adr, &nb->adrmask)); Con_Printf("unbanned %s\n", NET_AdrToStringMasked(adr, sizeof(adr), &nb->adr, &nb->adrmask));
if (svs.bannedips == nb) *link = nb->next;
svs.bannedips = nbnext;
Z_Free(nb); Z_Free(nb);
if (!all) if (!all)
break; break;
} }
else
nb = nbnext; {
link = &(*link)->next;
}
} }
} }