diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt index 1d178215..d3d207f0 100644 --- a/qbsp/CMakeLists.txt +++ b/qbsp/CMakeLists.txt @@ -15,7 +15,6 @@ set(QBSP_INCLUDES set(QBSP_SOURCES ${CMAKE_SOURCE_DIR}/qbsp/brush.cc ${CMAKE_SOURCE_DIR}/qbsp/csg4.cc - ${CMAKE_SOURCE_DIR}/qbsp/globals.cc ${CMAKE_SOURCE_DIR}/qbsp/map.cc ${CMAKE_SOURCE_DIR}/qbsp/merge.cc ${CMAKE_SOURCE_DIR}/qbsp/outside.cc diff --git a/qbsp/globals.cc b/qbsp/globals.cc deleted file mode 100644 index d8f040a5..00000000 --- a/qbsp/globals.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1997 Greg Lewis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - See file, 'COPYING', for details. -*/ -// globals.c - -#include -#include - -/* ------------------------------------------------------------------------ */ - -mapdata_t map; - -// Useful shortcuts -mapentity_t *mapdata_t::world_entity() -{ - return &entities.at(0); -} - -void mapdata_t::reset() { - *this = mapdata_t {}; -} diff --git a/qbsp/map.cc b/qbsp/map.cc index cabd1f52..9f02afb4 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -42,6 +42,20 @@ #include #include +mapdata_t map; + +// Useful shortcuts +mapentity_t *mapdata_t::world_entity() +{ + return &entities.at(0); +} + +void mapdata_t::reset() +{ + *this = mapdata_t{}; +} + + #define info_player_start 1 #define info_player_deathmatch 2 #define info_player_coop 4