Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 4834 → Rev 4835

/polymer/eduke32/build/src/defs.c
920,7 → 920,7
 
if (EDUKE32_PREDICT_FALSE(nextvoxid == MAXVOXELS))
{
initprintf("Maximum number of voxels already defined.\n");
initprintf("Maximum number of voxels (%d) already defined.\n", MAXVOXELS);
break;
}
 
1421,9 → 1421,21
{ "scale", T_SCALE },
};
 
if (EDUKE32_PREDICT_FALSE(scriptfile_getstring(script,&fn))) break; //voxel filename
if (EDUKE32_PREDICT_FALSE(nextvoxid == MAXVOXELS)) { initprintf("Maximum number of voxels already defined.\n"); break; }
if (EDUKE32_PREDICT_FALSE(qloadkvx(nextvoxid, fn))) { initprintf("Failure loading voxel file \"%s\"\n",fn); break; }
if (EDUKE32_PREDICT_FALSE(scriptfile_getstring(script,&fn)))
break; //voxel filename
 
if (EDUKE32_PREDICT_FALSE(nextvoxid == MAXVOXELS))
{
initprintf("Maximum number of voxels (%d) already defined.\n", MAXVOXELS);
break;
}
 
if (EDUKE32_PREDICT_FALSE(qloadkvx(nextvoxid, fn)))
{
initprintf("Failure loading voxel file \"%s\"\n",fn);
break;
}
 
lastvoxid = nextvoxid++;
 
if (scriptfile_getbraces(script,&modelend)) break;