From af54cb8a295f225e43f14578e57aa4ee2df72900 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 20 Oct 2016 17:04:37 +0200 Subject: [PATCH] Q3BSP: fix license dates. --- code/Q3BSPFileData.h | 2 +- code/Q3BSPFileImporter.cpp | 12 ++---------- code/Q3BSPFileImporter.h | 2 +- code/Q3BSPFileParser.cpp | 2 +- code/Q3BSPFileParser.h | 2 +- code/Q3BSPZipArchive.cpp | 2 +- code/Q3BSPZipArchive.h | 2 +- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/code/Q3BSPFileData.h b/code/Q3BSPFileData.h index 42e2bf148..ab46db24f 100644 --- a/code/Q3BSPFileData.h +++ b/code/Q3BSPFileData.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 0f5ac4429..1433dda9c 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, @@ -75,14 +75,6 @@ static const aiImporterDesc desc = { namespace Assimp { -/* -static void getSupportedExtensions(std::vector &supportedExtensions) { - supportedExtensions.push_back( ".jpg" ); - supportedExtensions.push_back( ".png" ); - supportedExtensions.push_back( ".tga" ); -} -*/ - using namespace Q3BSP; // ------------------------------------------------------------------------------------------------ @@ -174,7 +166,7 @@ Q3BSPFileImporter::~Q3BSPFileImporter() { bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* /*pIOHandler*/, bool checkSig ) const { if(!checkSig) { - return SimpleExtensionCheck( rFile, "pk3" ); + return SimpleExtensionCheck( rFile, "pk3", "bsp" ); } // TODO perhaps add keyword based detection return false; diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h index c995f82ab..ee8991bea 100644 --- a/code/Q3BSPFileImporter.h +++ b/code/Q3BSPFileImporter.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp index db2247b8a..0dabaf87d 100644 --- a/code/Q3BSPFileParser.cpp +++ b/code/Q3BSPFileParser.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/Q3BSPFileParser.h b/code/Q3BSPFileParser.h index 55de25491..8363d31c0 100644 --- a/code/Q3BSPFileParser.h +++ b/code/Q3BSPFileParser.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp index 59e437836..80b3e9c6b 100644 --- a/code/Q3BSPZipArchive.cpp +++ b/code/Q3BSPZipArchive.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h index e46a11b4c..12ec154dd 100644 --- a/code/Q3BSPZipArchive.h +++ b/code/Q3BSPZipArchive.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2008, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. Redistribution and use of this software in source and binary forms,