zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cleaned up the header list in maploader.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-31 01:23:06 +01:00
parent fa3312e2a9
commit 18b8a03f05
2 changed files with 26 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/maploader/maploader.cpp
View file

@ -59,60 +59,30 @@
#include <math.h> #include <math.h>
#include "templates.h"
#include "d_player.h"
#include "m_argv.h"
#include "g_game.h"
#include "w_wad.h"
#include "p_local.h"
#include "p_effect.h"
#include "p_terrain.h"
#include "nodebuild.h"
#include "p_lnspec.h"
#include "c_console.h"
#include "p_acs.h"
#include "announcer.h"
#include "wi_stuff.h"
#include "doomerrors.h"
#include "gi.h"
#include "p_conversation.h"
#include "a_keys.h"
#include "s_sndseq.h"
#include "sbar.h"
#include "p_setup.h"
#include "r_data/r_interpolate.h"
#include "r_sky.h"
#include "cmdlib.h"
#include "md5.h"
#include "po_man.h"
#include "r_renderer.h"
#include "p_blockmap.h"
#include "r_utility.h"
#include "p_spec.h"
#include "g_levellocals.h"
#include "c_dispatch.h"
#include "a_dynlight.h"
#include "events.h"
#include "p_destructible.h"
#include "types.h"
#include "i_time.h"
#include "scripting/vm/vm.h"
#include "hwrenderer/data/flatvertices.h"
#include "fragglescript/t_fs.h"
#include "maploader.h" #include "maploader.h"
#include "c_cvars.h"
#include "actor.h"
#include "g_levellocals.h"
#include "p_lnspec.h"
#include "i_system.h"
#include "v_text.h"
#include "p_setup.h"
#include "gi.h"
#include "doomerrors.h"
#include "types.h"
#include "w_wad.h"
#include "p_conversation.h"
#include "v_video.h"
#include "i_time.h"
#include "m_argv.h"
#include "fragglescript/t_fs.h"
#include "swrenderer/r_swrenderer.h"
#include "hwrenderer/data/flatvertices.h"
enum
void PO_Init(); {
MISSING_TEXTURE_WARN_LIMIT = 20
#define MISSING_TEXTURE_WARN_LIMIT 20 };
void BloodCrypt (void *data, int key, int len);
void P_ClearUDMFKeys();
void InitRenderInfo();
EXTERN_CVAR(Bool, am_textured)
CVAR (Bool, genblockmap, false, CVAR_SERVERINFO|CVAR_GLOBALCONFIG); CVAR (Bool, genblockmap, false, CVAR_SERVERINFO|CVAR_GLOBALCONFIG);
CVAR (Bool, gennodes, false, CVAR_SERVERINFO|CVAR_GLOBALCONFIG); CVAR (Bool, gennodes, false, CVAR_SERVERINFO|CVAR_GLOBALCONFIG);
@ -203,7 +173,7 @@ void MapLoader::SetTexture (side_t *side, int position, const char *name, FMissi
{ {
if (Level->lines[i].sidedef[j] == side) if (Level->lines[i].sidedef[j] == side)
{ {
Printf(TEXTCOLOR_RED"Unknown %s texture '" Printf(TEXTCOLOR_RED "Unknown %s texture '"
TEXTCOLOR_ORANGE "%s" TEXTCOLOR_RED TEXTCOLOR_ORANGE "%s" TEXTCOLOR_RED
"' on %s side of linedef %d\n", "' on %s side of linedef %d\n",
positionnames[position], name, sidenames[j], i); positionnames[position], name, sidenames[j], i);

4
src/maploader/maploader.h
View file

@ -1,7 +1,9 @@
#pragma once #pragma once
#include "nodebuild.h" #include "nodebuild.h"
#include "p_spec.h" #include "g_levellocals.h"
class FileReader;
struct EDMapthing struct EDMapthing
{ {