vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NULL checks

This commit is contained in:
Alam Ed Arias 2016-06-13 10:07:10 -04:00
parent 4d6a3e3398
commit 2c8008e11e
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/blua/lvm.c
View File

@ -732,7 +732,8 @@ void luaV_execute (lua_State *L, int nexeccalls) {
luaG_runerror(L, LUA_QL("for") " limit must be a number"); luaG_runerror(L, LUA_QL("for") " limit must be a number");
else if (!tonumber(pstep, ra+2)) else if (!tonumber(pstep, ra+2))
luaG_runerror(L, LUA_QL("for") " step must be a number"); luaG_runerror(L, LUA_QL("for") " step must be a number");
setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep))); if (ra && pstep)
setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
dojump(L, pc, GETARG_sBx(i)); dojump(L, pc, GETARG_sBx(i));
continue; continue;
} }

6
src/command.c
View File

@ -966,9 +966,11 @@ void CV_RegisterVar(consvar_t *variable)
// check net variables // check net variables
if (variable->flags & CV_NETVAR) if (variable->flags & CV_NETVAR)
{ {
const consvar_t *netvar;
variable->netid = CV_ComputeNetid(variable->name); variable->netid = CV_ComputeNetid(variable->name);
if (CV_FindNetVar(variable->netid)) netvar = CV_FindNetVar(variable->netid);
I_Error("Variables %s and %s have same netid\n", variable->name, CV_FindNetVar(variable->netid)->name); if (netvar)
I_Error("Variables %s and %s have same netid\n", variable->name, netvar->name);
} }
// link the variable in // link the variable in

14
src/hardware/hw_main.c
View File

@ -4529,7 +4529,8 @@ static void HWR_SortVisSprites(void)
// Fix first and last. ds still points to the last one after the loop // Fix first and last. ds still points to the last one after the loop
dsfirst->prev = &unsorted; dsfirst->prev = &unsorted;
unsorted.next = dsfirst; unsorted.next = dsfirst;
ds->next = &unsorted; if (ds)
ds->next = &unsorted;
unsorted.prev = ds; unsorted.prev = ds;
// pull the vissprites out by scale // pull the vissprites out by scale
@ -4552,10 +4553,13 @@ static void HWR_SortVisSprites(void)
best = ds; best = ds;
} }
} }
best->next->prev = best->prev; if (best)
best->prev->next = best->next; {
best->next = &gr_vsprsortedhead; best->next->prev = best->prev;
best->prev = gr_vsprsortedhead.prev; best->prev->next = best->next;
best->next = &gr_vsprsortedhead;
best->prev = gr_vsprsortedhead.prev;
}
gr_vsprsortedhead.prev->next = best; gr_vsprsortedhead.prev->next = best;
gr_vsprsortedhead.prev = best; gr_vsprsortedhead.prev = best;
} }

2
src/hardware/r_opengl/r_opengl.c
View File

@ -1928,7 +1928,7 @@ static inline void DrawMD2Ex(INT32 *gl_cmd_buffer, md2_frame_t *frame, UINT32 du
//pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency //pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
// Remove depth mask when the model is transparent so it doesn't cut thorugh sprites // SRB2CBTODO: For all stuff too?! // Remove depth mask when the model is transparent so it doesn't cut thorugh sprites // SRB2CBTODO: For all stuff too?!
if (color[3] < 255) if (color && color[3] < 255)
{ {
pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
pglDepthMask(GL_FALSE); pglDepthMask(GL_FALSE);

3
src/r_things.c
View File

@ -1634,7 +1634,8 @@ void R_SortVisSprites(void)
// Fix first and last. ds still points to the last one after the loop // Fix first and last. ds still points to the last one after the loop
dsfirst->prev = &unsorted; dsfirst->prev = &unsorted;
unsorted.next = dsfirst; unsorted.next = dsfirst;
ds->next = &unsorted; if (ds)
ds->next = &unsorted;
unsorted.prev = ds; unsorted.prev = ds;
// pull the vissprites out by scale // pull the vissprites out by scale