diff options
| author | xolatile | 2025-08-07 00:32:29 +0200 |
|---|---|---|
| committer | xolatile | 2025-08-07 00:32:29 +0200 |
| commit | 4c8dfb375b4b30dbb6079f9d68024980d81ffa20 (patch) | |
| tree | d7a8164758e9d5cfc5d5c239bccbe45ad19c9da6 /src/engine/worldio.cpp | |
| parent | 0a1172b75f571685c264a8b9d8ee224bbf11381f (diff) | |
| download | xolatile-badassbug-4c8dfb375b4b30dbb6079f9d68024980d81ffa20.tar.xz xolatile-badassbug-4c8dfb375b4b30dbb6079f9d68024980d81ffa20.tar.zst | |
More cleanups...
Diffstat (limited to 'src/engine/worldio.cpp')
| -rw-r--r-- | src/engine/worldio.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/engine/worldio.cpp b/src/engine/worldio.cpp index 898b2bb..e64e0da 100644 --- a/src/engine/worldio.cpp +++ b/src/engine/worldio.cpp @@ -556,11 +556,8 @@ bool save_world(const char *mname, bool nolms) { break; } }); - f->putchar((int)strlen(game::gameident())); - f->write(game::gameident(), (int)strlen(game::gameident())+1); f->putlil<ushort>(entities::extraentinfosize()); vector<char> extras; - game::writegamedata(extras); f->putlil<ushort>(extras.length()); f->write(extras.getbuf(), extras.length()); f->putlil<ushort>(texmru.length()); @@ -615,7 +612,6 @@ bool load_world(const char *mname, const char *cname) { // still supports all m resetmap(); Texture *mapshot = textureload(picname, 3, true, false); renderbackground("loading...", mapshot, mname, game::getmapinfo()); - game::loadingmap(cname ? cname : mname); setvar("mapversion", hdr.version, true, false); lilswap(&hdr.numvslots, 1); renderprogress(0, "clearing world..."); @@ -663,7 +659,6 @@ bool load_world(const char *mname, const char *cname) { // still supports all m int extrasize = f->getlil<ushort>(); vector<char> extras; f->read(extras.pad(extrasize), extrasize); - game::readgamedata(extras); texmru.shrink(0); ushort nummru = f->getlil<ushort>(); loopi(nummru) texmru.add(f->getlil<ushort>()); @@ -679,9 +674,7 @@ bool load_world(const char *mname, const char *cname) { // still supports all m lilswap(&e.attr1, 5); if(einfosize > 0) f->read(ebuf, einfosize); if(!insideworld(e.o)) { - if(e.type != ET_LIGHT && e.type != ET_SPOTLIGHT) { - conoutf(CON_WARN, "warning: ent outside of world: enttype[%s] index %d (%f, %f, %f)", entities::entname(e.type), i, e.o.x, e.o.y, e.o.z); - } + conoutf(CON_WARN, "warning: ent outside of world: enttype[%s] index %d (%f, %f, %f)", entities::entname(e.type), i, e.o.x, e.o.y, e.o.z); } } if(ebuf) delete[] ebuf; @@ -727,7 +720,6 @@ bool load_world(const char *mname, const char *cname) { // still supports all m flushpreloadedmodels(); preloadmapsounds(); entitiesinoctanodes(); - attachentities(); initlights(); allchanged(true); renderbackground("loading...", mapshot, mname, game::getmapinfo()); |