aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-23 20:29:40 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-23 20:29:40 +0100
commitf4de181db00bf323793e2121aac496588c3b9b33 (patch)
treed32c98dcebadf6ee1c4e70f73be48edd435d87ef
parenta6f587a3b104426bcba195523f40a3b82591c390 (diff)
SQL: Rename SQL merged in PR
-rw-r--r--dep/SFMT/SFMT.h2
-rw-r--r--dep/SFMT/randomc.h2
-rw-r--r--sql/updates/world/2013_01_23_02_world_spell_script_names.sql (renamed from sql/updates/world/2013_01_23_00_world_spell_script_names.sql)0
-rw-r--r--src/tools/mesh_extractor/Chunk.cpp2
-rw-r--r--src/tools/mesh_extractor/ContinentBuilder.cpp2
-rw-r--r--src/tools/mesh_extractor/DoodadHandler.h2
-rw-r--r--src/tools/mesh_extractor/Utils.cpp12
7 files changed, 11 insertions, 11 deletions
diff --git a/dep/SFMT/SFMT.h b/dep/SFMT/SFMT.h
index 08966e1831c..4004ae1db6e 100644
--- 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
index ee5ad9aa43b..eed2c81a205 100644
--- 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/sql/updates/world/2013_01_23_00_world_spell_script_names.sql b/sql/updates/world/2013_01_23_02_world_spell_script_names.sql
index dd8b35ae420..dd8b35ae420 100644
--- a/sql/updates/world/2013_01_23_00_world_spell_script_names.sql
+++ b/sql/updates/world/2013_01_23_02_world_spell_script_names.sql
diff --git a/src/tools/mesh_extractor/Chunk.cpp b/src/tools/mesh_extractor/Chunk.cpp
index 9f2898a46e0..4605ae0f0dd 100644
--- 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
index 9b5c9f9c77b..d6125bdd8e2 100644
--- 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
index 981834ec7ac..96aecbcce27 100644
--- a/src/tools/mesh_extractor/DoodadHandler.h
+++ b/src/tools/mesh_extractor/DoodadHandler.h
@@ -20,7 +20,7 @@ public:
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
index 119ac94f94f..acb1ed38e27 100644
--- 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);