SQL: Rename SQL merged in PR

TrinityCore · Jan 23, 2013 · f4de181 · f4de181
1 parent a6f587a
commit f4de181
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/dep/SFMT/SFMT.h b/dep/SFMT/SFMT.h
@@ -7,7 +7,7 @@
  * in effect in addition to the GNU General Public License.
  * Copyright (c) 2006, 2007 by Mutsuo Saito, Makoto Matsumoto and Hiroshima University.
  * Copyright (c) 2008 by Agner Fog.
- * Copyright (c) 2012 Trinity Core
+ * Copyright (c) 2008-2013 Trinity Core
  * 
  *  BSD License:
  *  Redistribution and use in source and binary forms, with or without 

diff --git a/dep/SFMT/randomc.h b/dep/SFMT/randomc.h
@@ -7,7 +7,7 @@
  * in effect in addition to the GNU General Public License.
  * Copyright (c) 2006, 2007 by Mutsuo Saito, Makoto Matsumoto and Hiroshima University.
  * Copyright (c) 2008 by Agner Fog.
- * Copyright (c) 2012 Trinity Core
+ * Copyright (c) 2008-2013 Trinity Core
  * 
  *  BSD License:
  *  Redistribution and use in source and binary forms, with or without 

diff --git a/...013_01_23_00_world_spell_script_names.sql → ...013_01_23_02_world_spell_script_names.sql b/...013_01_23_00_world_spell_script_names.sql → ...013_01_23_02_world_spell_script_names.sql
diff --git a/src/tools/mesh_extractor/Chunk.cpp b/src/tools/mesh_extractor/Chunk.cpp
@@ -17,7 +17,7 @@ int32 Chunk::FindSubChunkOffset(std::string name)
             matched = 0;
         else
             ++matched;
-            
+
         if (matched == 4)
             return ftell(stream) - 4;
     }

diff --git a/src/tools/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp
@@ -101,7 +101,7 @@ void ContinentBuilder::Build(bool debug)
     }
 
     CalculateTileBounds();
-    
+
     dtNavMeshParams params;
     params.maxPolys = 1 << STATIC_POLY_BITS;
     params.maxTiles = TileMap->TileTable.size();

diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h
@@ -20,7 +20,7 @@ class DoodadDefinition : public IDefinition
     void Read(FILE* stream)
     {
         int count = 0;
-        
+
         count += fread(&MmidIndex, sizeof(uint32), 1, stream);
         count += fread(&UniqueId, sizeof(uint32), 1, stream);
         Position = Vector3::Read(stream);

diff --git a/src/tools/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp
@@ -218,7 +218,7 @@ void Utils::SaveToDisk( FILE* stream, std::string path )
     if (fread(data, 1, size, stream) != 1)
     {
         printf("SaveToDisk: Error reading from Stream while trying to save file %s to disck.\n", path.c_str());
-        return;        
+        return;
     }
     // And write it in the file
     fwrite(data, 1, size, disk);
@@ -274,7 +274,7 @@ void MapChunkHeader::Read(FILE* stream)
     count += fread(&SizeMCLQ, sizeof(uint32), 1, stream);
     Position = Vector3::Read(stream);
     count += fread(&OffsetMCCV, sizeof(uint32), 1, stream);
-    
+
     if (count != 27)
          printf("MapChunkHeader::Read: Failed to read some data expected 27, read %d\n", count);
 }
@@ -295,7 +295,7 @@ void MHDR::Read(FILE* stream)
     count += fread(&OffsetMFBO, sizeof(uint32), 1, stream);
     count += fread(&OffsetMH2O, sizeof(uint32), 1, stream);
     count += fread(&OffsetMTFX, sizeof(uint32), 1, stream);
-    
+
     if (count != 12)
          printf("MHDR::Read: Failed to read some data expected 12, read %d\n", count);
 }
@@ -357,7 +357,7 @@ void ModelHeader::Read(FILE* stream)
     count += fread(&OffsetBoundingVertices, sizeof(uint32), 1, stream);
     count += fread(&CountBoundingNormals, sizeof(uint32), 1, stream);
     count += fread(&OffsetBoundingNormals, sizeof(uint32), 1, stream);
-    
+
     if (count != 51)
          printf("ModelHeader::Read: Failed to read some data expected 51, read %d\n", count);
 
@@ -380,7 +380,7 @@ WorldModelHeader WorldModelHeader::Read(FILE* stream)
     ret.BoundingBox[0] = Vector3::Read(stream);
     ret.BoundingBox[1] = Vector3::Read(stream);
     count += fread(&ret.LiquidTypeRelated, sizeof(uint32), 1, stream);
-    
+
     if (count != 10)
          printf("WorldModelHeader::Read: Failed to read some data expected 10, read %d\n", count);
 
@@ -400,7 +400,7 @@ DoodadInstance DoodadInstance::Read(FILE* stream)
     count += fread(&ret.QuatZ, sizeof(float), 1, stream);
     count += fread(&ret.Scale, sizeof(float), 1, stream);
     count += fread(&ret.LightColor, sizeof(uint32), 1, stream);
-    
+
     if (count != 7)
          printf("DoodadInstance::Read: Failed to read some data expected 7, read %d\n", count);