TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

check more aggressively for embedded .mf extension

Browse Source
This commit is contained in:
David Rose 2007-02-28 18:23:50 +00:00
parent 7c03edea01
commit 01136dc823
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/express/patchfile.cxx
View File

@ -29,6 +29,7 @@
#include "hashVal.h" #include "hashVal.h"
#include <stdio.h> // for tempnam #include <stdio.h> // for tempnam
#include <string.h> // for strstr
#ifdef WIN32_VC #ifdef WIN32_VC
#define tempnam _tempnam #define tempnam _tempnam
@ -1328,7 +1329,8 @@ build(Filename file_orig, Filename file_new, Filename patch_name) {
// Check whether our input files are Panda multifiles. // Check whether our input files are Panda multifiles.
bool is_multifile = false; bool is_multifile = false;
if (_allow_multifile) { if (_allow_multifile) {
if (file_orig.get_extension() == "mf" || file_new.get_extension() == "mf") { if (strstr(file_orig.get_basename().c_str(), ".mf") != NULL ||
strstr(file_new.get_basename().c_str(), ".mf") != NULL) {
// Read the first n bytes of both files for the Multifile magic // Read the first n bytes of both files for the Multifile magic
// number. // number.
string magic_number = Multifile::get_magic_number(); string magic_number = Multifile::get_magic_number();