From 5ec786eef74220e91cd89dd081289f02179ff880 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 8 Jan 2017 11:52:35 +0100 Subject: [PATCH] - removed the 'dumpmap' CCMD because it was mostly broken anyway and would require a complete rewrite in UDMF to get back on track. --- src/CMakeLists.txt | 1 - src/p_writemap.cpp | 226 --------------------------------------------- 2 files changed, 227 deletions(-) delete mode 100644 src/p_writemap.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d5d52c0f..f06687988 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1123,7 +1123,6 @@ set (PCH_SOURCES p_udmf.cpp p_usdf.cpp p_user.cpp - p_writemap.cpp p_xlat.cpp parsecontext.cpp po_man.cpp diff --git a/src/p_writemap.cpp b/src/p_writemap.cpp deleted file mode 100644 index cdf5a19d1..000000000 --- a/src/p_writemap.cpp +++ /dev/null @@ -1,226 +0,0 @@ -#include "p_local.h" -#include "c_dispatch.h" -#include "gi.h" -#include "w_wad.h" -#include "r_defs.h" -#include "m_swap.h" -#include "doomstat.h" -#include "d_player.h" -#include "p_spec.h" - -static int WriteTHINGS (FILE *file); -static int WriteLINEDEFS (FILE *file); -static int WriteSIDEDEFS (FILE *file); -static int WriteVERTEXES (FILE *file); -static int WriteSEGS (FILE *file); -static int WriteSSECTORS (FILE *file); -static int WriteNODES (FILE *file); -static int WriteSECTORS (FILE *file); -static int WriteREJECT (FILE *file); -static int WriteBLOCKMAP (FILE *file); -static int WriteBEHAVIOR (FILE *file); - -#define APPEND(pos,name) \ - lumps[pos].FilePos = LittleLong((int)ftell (file)); \ - lumps[pos].Size = LittleLong(Write##name (file)); \ - memcpy (lumps[pos].Name, #name, sizeof(#name)-1); - -CCMD (dumpmap) -{ - const char *mapname; - FILE *file; - - if (argv.argc() < 2) - { - Printf ("Usage: dumpmap [mapname]\n"); - return; - } - - if (gamestate != GS_LEVEL) - { - Printf ("You can only dump a map when inside a level.\n"); - return; - } - - if (argv.argc() < 3) - { - if (gameinfo.flags & GI_MAPxx) - { - mapname = "MAP01"; - } - else - { - mapname = "E1M1"; - } - } - else - { - mapname = argv[2]; - } - - file = fopen (argv[1], "wb"); - if (file == NULL) - { - Printf ("Cannot write %s\n", argv[1]); - return; - } - - wadinfo_t header = { PWAD_ID, 12, 0 }; - wadlump_t lumps[12] = { {0, 0, {0}} }; - - fseek (file, 12, SEEK_SET); - - lumps[0].FilePos = LittleLong(12); - lumps[0].Size = 0; - uppercopy (lumps[0].Name, mapname); - - APPEND(1, THINGS); - APPEND(2, LINEDEFS); - APPEND(3, SIDEDEFS); - APPEND(4, VERTEXES); - APPEND(5, SEGS); - APPEND(6, SSECTORS); - APPEND(7, NODES); - APPEND(8, SECTORS); - APPEND(9, REJECT); - APPEND(10, BLOCKMAP); - APPEND(11, BEHAVIOR); - - header.InfoTableOfs = ftell (file); - - fwrite (lumps, 16, 12, file); - fseek (file, 0, SEEK_SET); - fwrite (&header, 12, 1, file); - - fclose (file); -} - -static int WriteTHINGS (FILE *file) -{ - mapthinghexen_t mt = { 0, 0, 0, 0, 0, 0, 0, 0, {0} }; - AActor *mo = players[consoleplayer].mo; - - mt.x = LittleShort(short(mo->X())); - mt.y = LittleShort(short(mo->Y())); - mt.angle = LittleShort(short(mo->Angles.Yaw.Degrees)); - mt.type = LittleShort((short)1); - mt.flags = LittleShort((short)(7|224|MTF_SINGLE)); - fwrite (&mt, sizeof(mt), 1, file); - return sizeof (mt); -} - -static int WriteLINEDEFS (FILE *file) -{ - maplinedef2_t mld; - - for (int i = 0; i < numlines; ++i) - { - mld.v1 = LittleShort(short(lines[i].v1 - vertexes)); - mld.v2 = LittleShort(short(lines[i].v2 - vertexes)); - mld.flags = LittleShort(short(lines[i].flags)); - mld.special = lines[i].special; - for (int j = 0; j < 5; ++j) - { - mld.args[j] = (BYTE)lines[i].args[j]; - } - mld.sidenum[0] = LittleShort(WORD(lines[i].sidedef[0] - sides)); - mld.sidenum[1] = LittleShort(WORD(lines[i].sidedef[1] - sides)); - fwrite (&mld, sizeof(mld), 1, file); - } - return numlines * sizeof(mld); -} - -static const char *GetTextureName (FTextureID texnum) -{ - FTexture *tex = TexMan[texnum]; - - if (tex != NULL) - { - return tex->Name; - } - else - { - return "-"; - } -} - -static int WriteSIDEDEFS (FILE *file) -{ - mapsidedef_t msd; - - for (int i = 0; i < numsides; ++i) - { - msd.textureoffset = LittleShort(short(sides[i].GetTextureXOffset(side_t::mid))); - msd.rowoffset = LittleShort(short(sides[i].GetTextureYOffset(side_t::mid))); - msd.sector = LittleShort(short(sides[i].sector - &level.sectors[0])); - uppercopy (msd.toptexture, GetTextureName (sides[i].GetTexture(side_t::top))); - uppercopy (msd.bottomtexture, GetTextureName (sides[i].GetTexture(side_t::bottom))); - uppercopy (msd.midtexture, GetTextureName (sides[i].GetTexture(side_t::mid))); - fwrite (&msd, sizeof(msd), 1, file); - } - return numsides * sizeof(msd); -} - -static int WriteVERTEXES (FILE *file) -{ - mapvertex_t mv; - - for (int i = 0; i < numvertexes; ++i) - { - mv.x = LittleShort(short(vertexes[i].fixX() >> FRACBITS)); - mv.y = LittleShort(short(vertexes[i].fixY() >> FRACBITS)); - fwrite (&mv, sizeof(mv), 1, file); - } - return numvertexes * sizeof(mv); -} - - -static int WriteSEGS (FILE *file) -{ - return 0; -} - -static int WriteSSECTORS (FILE *file) -{ - return 0; -} - -static int WriteNODES (FILE *file) -{ - return 0; -} - -static int WriteSECTORS (FILE *file) -{ - mapsector_t ms; - - for (unsigned i = 0; i < level.sectors.Size(); ++i) - { - ms.floorheight = LittleShort(short(level.sectors[i].GetPlaneTexZ(sector_t::floor))); - ms.ceilingheight = LittleShort(short(level.sectors[i].GetPlaneTexZ(sector_t::ceiling))); - uppercopy (ms.floorpic, GetTextureName (level.sectors[i].GetTexture(sector_t::floor))); - uppercopy (ms.ceilingpic, GetTextureName (level.sectors[i].GetTexture(sector_t::ceiling))); - ms.lightlevel = LittleShort((short)level.sectors[i].lightlevel); - ms.special = LittleShort(level.sectors[i].special); - ms.tag = LittleShort(tagManager.GetFirstSectorTag(&level.sectors[i])); - fwrite (&ms, sizeof(ms), 1, file); - } - return level.sectors.Size() * sizeof(ms); -} - -static int WriteREJECT (FILE *file) -{ - return 0; -} - -static int WriteBLOCKMAP (FILE *file) -{ - return 0; -} - -static int WriteBEHAVIOR (FILE *file) -{ - static const BYTE dummy[16] = { 'A', 'C', 'S', 0, 8 }; - fwrite (dummy, 16, 1, file); - return 16; -}