LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

removed NULL checks on render mode interface

Browse Source 
all the functions are required to exist, now
This commit is contained in:
Aaron Griffith
2011-03-21 20:46:30 -04:00
parent e9b30cf780
commit 0e85f87fa7
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/iterate.c
View File

@@ -81,12 +81,10 @@ chunk_render(PyObject *self, PyObject *args) {
/* set up the render mode */ /* set up the render mode */
RenderModeInterface *rendermode = get_render_mode(&state); RenderModeInterface *rendermode = get_render_mode(&state);
void* rm_data = malloc(rendermode->data_size); void* rm_data = malloc(rendermode->data_size);
if (rendermode->start) {
if (rendermode->start(rm_data, &state)) { if (rendermode->start(rm_data, &state)) {
free(rm_data); free(rm_data);
return Py_BuildValue("i", "-1"); return Py_BuildValue("i", "-1");
} }
}
/* get the image size */ /* get the image size */
imgsize = PyObject_GetAttrString(state.img, "size"); imgsize = PyObject_GetAttrString(state.img, "size");
@@ -143,11 +141,9 @@ chunk_render(PyObject *self, PyObject *args) {
blockid = PyInt_FromLong(state.block); blockid = PyInt_FromLong(state.block);
// check for occlusion // check for occlusion
if (rendermode->occluded) {
if (rendermode->occluded(rm_data, &state)) { if (rendermode->occluded(rm_data, &state)) {
continue; continue;
} }
}
// everything stored here will be a borrowed ref // everything stored here will be a borrowed ref
PyObject *t = NULL; PyObject *t = NULL;
@@ -185,7 +181,6 @@ chunk_render(PyObject *self, PyObject *args) {
if (mask == Py_None) if (mask == Py_None)
mask = src; mask = src;
if (rendermode->draw)
rendermode->draw(rm_data, &state, src, mask); rendermode->draw(rm_data, &state, src, mask);
} }
} }
@@ -198,7 +193,6 @@ chunk_render(PyObject *self, PyObject *args) {
} }
/* free up the rendermode info */ /* free up the rendermode info */
if (rendermode->finish)
rendermode->finish(rm_data, &state); rendermode->finish(rm_data, &state);
free(rm_data); free(rm_data);