diff options
Diffstat (limited to 'src/engine/worldio.cpp')
| -rw-r--r-- | src/engine/worldio.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/engine/worldio.cpp b/src/engine/worldio.cpp index 61e0e8e..4d5e178 100644 --- a/src/engine/worldio.cpp +++ b/src/engine/worldio.cpp @@ -53,12 +53,7 @@ bool loadents(const char *fname, vector<entity> &ents, uint *crc) lilswap(&hdr.version, 6); if(memcmp(hdr.magic, "OCTA", 4) || hdr.worldsize <= 0|| hdr.numents < 0) { conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; } if(hdr.version>MAPVERSION) { conoutf(CON_ERROR, "map %s requires a newer version of Cube 2: Sauerbraten", ogzname); delete f; return false; } - compatheader chdr; - if(f->read(&hdr.blendmap, sizeof(hdr) - 7*sizeof(int)) != sizeof(hdr) - 7*sizeof(int)) { - conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; - } - lilswap(&hdr.blendmap, 2); lilswap(&hdr.numvslots, 1); loopi(hdr.numvars) @@ -645,7 +640,6 @@ bool save_world(const char *mname, bool nolms) loopv(ents) if(ents[i]->type!=ET_EMPTY || nolms) hdr.numents++; hdr.numpvs = 0; hdr.lightmaps = nolms ? 0 : lightmaps.length(); - hdr.blendmap = shouldsaveblendmap(); hdr.numvars = 0; hdr.numvslots = numvslots; enumerate(idents, ident, id, @@ -723,7 +717,6 @@ bool save_world(const char *mname, bool nolms) renderprogress(float(i+1)/lightmaps.length(), "saving lightmaps..."); } } - if(shouldsaveblendmap()) { renderprogress(0, "saving blendmap..."); saveblendmap(f); } delete f; conoutf("wrote map file %s", ogzname); @@ -746,10 +739,6 @@ bool load_world(const char *mname, const char *cname) // still supports all map lilswap(&hdr.version, 6); if(memcmp(hdr.magic, "OCTA", 4) || hdr.worldsize <= 0|| hdr.numents < 0) { conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; } if(hdr.version>MAPVERSION) { conoutf(CON_ERROR, "map %s requires a newer version of Cube 2: Sauerbraten", ogzname); delete f; return false; } - compatheader chdr; - if(f->read(&hdr.blendmap, sizeof(hdr) - 7*sizeof(int)) != sizeof(hdr) - 7*sizeof(int)) { - conoutf(CON_ERROR, "map %s has malformatted header", ogzname); delete f; return false; - } resetmap(); @@ -760,7 +749,6 @@ bool load_world(const char *mname, const char *cname) // still supports all map setvar("mapversion", hdr.version, true, false); - lilswap(&hdr.blendmap, 2); lilswap(&hdr.numvslots, 1); renderprogress(0, "clearing world..."); @@ -910,8 +898,6 @@ bool load_world(const char *mname, const char *cname) // still supports all map f->read(lm.data, lm.bpp * LM_PACKW * LM_PACKH); lm.finalize(); } - - if(hdr.blendmap) loadblendmap(f, hdr.blendmap); } mapcrc = f->getcrc(); |