quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify TYPE_CONSTANT code

Browse Source
This commit is contained in:
Garux
2021-03-25 21:59:31 +03:00
parent edabdd157e
commit 5008fa278f
15 changed files with 63 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/mapq3/plugin.cpp
View File

@@ -76,8 +76,8 @@ public:
INTEGER_CONSTANT( MapVersion, 2 );
MapDoom3API( MapDoom3Dependencies& dependencies ) : m_dependencies( dependencies ){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "doom3 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "doom3 region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "doom3 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "doom3 region", "*.reg" ) );
}
MapFormat* getTable(){
return this;
@@ -110,8 +110,8 @@ public:
if ( !Tokeniser_getInteger( tokeniser, version ) ) {
return;
}
if ( version != MapVersion() ) {
globalErrorStream() << "Doom 3 map version " << MapVersion() << " supported, version is " << version << "\n";
if ( version != MapVersion ) {
globalErrorStream() << "Doom 3 map version " << MapVersion << " supported, version is " << version << "\n";
return;
}
tokeniser.nextLine();
@@ -121,7 +121,7 @@ public:
void writeGraph( scene::Node& root, GraphTraversalFunc traverse, TextOutputStream& outputStream ) const {
TokenWriter& writer = GlobalScripLibModule::getTable().m_pfnNewSimpleTokenWriter( outputStream );
writer.writeToken( "Version" );
writer.writeInteger( MapVersion() );
writer.writeInteger( MapVersion );
writer.nextLine();
Map_Write( root, traverse, writer, false );
writer.release();
@@ -147,8 +147,8 @@ public:
INTEGER_CONSTANT( MapVersion, 3 );
MapQuake4API( MapDoom3Dependencies& dependencies ) : m_dependencies( dependencies ){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake4 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake4 region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake4 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake4 region", "*.reg" ) );
}
MapFormat* getTable(){
return this;
@@ -181,8 +181,8 @@ public:
if ( !Tokeniser_getInteger( tokeniser, version ) ) {
return;
}
if ( version != MapVersion() ) {
globalErrorStream() << "Quake 4 map version " << MapVersion() << " supported, version is " << version << "\n";
if ( version != MapVersion ) {
globalErrorStream() << "Quake 4 map version " << MapVersion << " supported, version is " << version << "\n";
return;
}
tokeniser.nextLine();
@@ -192,7 +192,7 @@ public:
void writeGraph( scene::Node& root, GraphTraversalFunc traverse, TextOutputStream& outputStream ) const {
TokenWriter& writer = GlobalScripLibModule::getTable().m_pfnNewSimpleTokenWriter( outputStream );
writer.writeToken( "Version" );
writer.writeInteger( MapVersion() );
writer.writeInteger( MapVersion );
writer.nextLine();
Map_Write( root, traverse, writer, false );
writer.release();
@@ -234,9 +234,9 @@ public:
STRING_CONSTANT( Name, "mapq3" );
MapQ3API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake3 maps", "*.map", true, true, true ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake3 region", "*.reg", true, true, true ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake3 compiled maps", "*.bsp", false, true, false ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake3 maps", "*.map", true, true, true ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake3 region", "*.reg", true, true, true ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake3 compiled maps", "*.bsp", false, true, false ) );
}
MapFormat* getTable(){
return this;
@@ -316,8 +316,8 @@ public:
STRING_CONSTANT( Name, "mapq1" );
MapQ1API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake region", "*.reg" ) );
}
MapFormat* getTable(){
return this;
@@ -392,8 +392,8 @@ public:
STRING_CONSTANT( Name, "maphl" );
MapHalfLifeAPI(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "half-life maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "half-life region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "half-life maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "half-life region", "*.reg" ) );
}
MapFormat* getTable(){
return this;
@@ -436,8 +436,8 @@ public:
STRING_CONSTANT( Name, "mapq2" );
MapQ2API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake2 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "quake2 region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake2 maps", "*.map" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "quake2 region", "*.reg" ) );
}
MapFormat* getTable(){
return this;
@@ -639,8 +639,8 @@ public:
STRING_CONSTANT( Name, "mapvmf" );
MapVMFAPI(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "vmf maps", "*.vmf" ) );
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "vmf region", "*.reg" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "vmf maps", "*.vmf" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "vmf region", "*.reg" ) );
}
MapFormat* getTable(){
return this;

2
plugins/mapxml/plugin.cpp
View File

@@ -68,7 +68,7 @@ public:
STRING_CONSTANT( Name, "xmldoom3" );
MapXMLAPI(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "xml doom3 maps", "*.xmap" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "xml doom3 maps", "*.xmap" ) );
}
MapFormat* getTable(){
return this;

10
plugins/md3model/plugin.cpp
View File

@@ -70,7 +70,7 @@ public:
STRING_CONSTANT( Name, "md3" );
ModelMD3API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "md3 models", "*.md3" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "md3 models", "*.md3" ) );
}
ModelLoader* getTable(){
return &m_modelmd3;
@@ -99,7 +99,7 @@ public:
STRING_CONSTANT( Name, "md2" );
ModelMD2API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "md2 models", "*.md2" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "md2 models", "*.md2" ) );
}
ModelLoader* getTable(){
return &m_modelmd2;
@@ -126,7 +126,7 @@ public:
STRING_CONSTANT( Name, "mdl" );
ModelMDLAPI(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "mdl models", "*.mdl" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "mdl models", "*.mdl" ) );
}
ModelLoader* getTable(){
return &m_modelmdl;
@@ -153,7 +153,7 @@ public:
STRING_CONSTANT( Name, "mdc" );
ModelMDCAPI(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "mdc models", "*.mdc" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "mdc models", "*.mdc" ) );
}
ModelLoader* getTable(){
return &m_modelmdc;
@@ -205,7 +205,7 @@ public:
STRING_CONSTANT( Name, "md5mesh" );
ModelMD5API(){
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "md5 meshes", "*.md5mesh" ) );
GlobalFiletypesModule::getTable().addType( Type::Name, Name, filetype_t( "md5 meshes", "*.md5mesh" ) );
}
ModelLoader* getTable(){
return &m_modelmd5;

2
plugins/model/plugin.cpp
View File

@@ -124,7 +124,7 @@ public:
m_modelLoader( module ){
StringOutputStream filter( 128 );
filter << "*." << extension;
GlobalFiletypesModule::getTable().addType( Type::Name(), extension, filetype_t( module->displayName, filter.c_str() ) );
GlobalFiletypesModule::getTable().addType( Type::Name, extension, filetype_t( module->displayName, filter.c_str() ) );
}
ModelLoader* getTable(){
return &m_modelLoader;