[2162] Fix compile for MaNGOS Rev 11590

Xfurry · Schmoozerd · commit 91de730a443e · 2011-06-03T12:00:03.000+02:00
Signed-off-by: Schmoozerd &lt;schmoozerd@scriptdev2.com&gt;
diff --git a/ScriptMgr.cpp b/ScriptMgr.cpp
@@ -103,7 +103,7 @@ void InitScriptLibrary()
     LoadDatabase();
 
     outstring_log("SD2: Loading C++ scripts");
-    barGoLink bar(1);
+    BarGoLink bar(1);
     bar.step();
     outstring_log("");
 
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2161"
+ #define SD2_REVISION_NR "2162"
 #endif // __SD2_REVISION_NR_H__
diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 11576+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 11590+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.
diff --git a/sql/updates/r2162_scriptdev2.sql b/sql/updates/r2162_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for MaNGOS 11590+) ';
diff --git a/system/system.cpp b/system/system.cpp
@@ -59,7 +59,7 @@ void SystemMgr::LoadScriptTexts()
 
     if (pResult)
     {
-        barGoLink bar(pResult->GetRowCount());
+        BarGoLink bar(pResult->GetRowCount());
         uint32 uiCount = 0;
 
         do
@@ -103,7 +103,7 @@ void SystemMgr::LoadScriptTexts()
     }
     else
     {
-        barGoLink bar(1);
+        BarGoLink bar(1);
         bar.step();
         outstring_log("");
         outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
@@ -121,7 +121,7 @@ void SystemMgr::LoadScriptTextsCustom()
 
     if (pResult)
     {
-        barGoLink bar(pResult->GetRowCount());
+        BarGoLink bar(pResult->GetRowCount());
         uint32 uiCount = 0;
 
         do
@@ -165,7 +165,7 @@ void SystemMgr::LoadScriptTextsCustom()
     }
     else
     {
-        barGoLink bar(1);
+        BarGoLink bar(1);
         bar.step();
         outstring_log("");
         outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
@@ -199,7 +199,7 @@ void SystemMgr::LoadScriptWaypoints()
 
     if (pResult)
     {
-        barGoLink bar(pResult->GetRowCount());
+        BarGoLink bar(pResult->GetRowCount());
         uint32 uiNodeCount = 0;
 
         do
@@ -238,7 +238,7 @@ void SystemMgr::LoadScriptWaypoints()
     }
     else
     {
-        barGoLink bar(1);
+        BarGoLink bar(1);
         bar.step();
         outstring_log("");
         outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+UPDATE sd2_db_version SET version='ScriptDev2 (for MaNGOS 11590+) ';`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void SystemMgr::LoadScriptTexts()`
`59`	`59`
`60`	`60`	`if (pResult)`
`61`	`61`	`{`
`62`		`- barGoLink bar(pResult->GetRowCount());`
	`62`	`+ BarGoLink bar(pResult->GetRowCount());`
`63`	`63`	`uint32 uiCount = 0;`
`64`	`64`
`65`	`65`	`do`
`@@ -103,7 +103,7 @@ void SystemMgr::LoadScriptTexts()`
`103`	`103`	`}`
`104`	`104`	`else`
`105`	`105`	`{`
`106`		`- barGoLink bar(1);`
	`106`	`+ BarGoLink bar(1);`
`107`	`107`	`bar.step();`
`108`	`108`	`outstring_log("");`
`109`	`109`	outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
`@@ -121,7 +121,7 @@ void SystemMgr::LoadScriptTextsCustom()`
`121`	`121`
`122`	`122`	`if (pResult)`
`123`	`123`	`{`
`124`		`- barGoLink bar(pResult->GetRowCount());`
	`124`	`+ BarGoLink bar(pResult->GetRowCount());`
`125`	`125`	`uint32 uiCount = 0;`
`126`	`126`
`127`	`127`	`do`
`@@ -165,7 +165,7 @@ void SystemMgr::LoadScriptTextsCustom()`
`165`	`165`	`}`
`166`	`166`	`else`
`167`	`167`	`{`
`168`		`- barGoLink bar(1);`
	`168`	`+ BarGoLink bar(1);`
`169`	`169`	`bar.step();`
`170`	`170`	`outstring_log("");`
`171`	`171`	outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
`@@ -199,7 +199,7 @@ void SystemMgr::LoadScriptWaypoints()`
`199`	`199`
`200`	`200`	`if (pResult)`
`201`	`201`	`{`
`202`		`- barGoLink bar(pResult->GetRowCount());`
	`202`	`+ BarGoLink bar(pResult->GetRowCount());`
`203`	`203`	`uint32 uiNodeCount = 0;`
`204`	`204`
`205`	`205`	`do`
`@@ -238,7 +238,7 @@ void SystemMgr::LoadScriptWaypoints()`
`238`	`238`	`}`
`239`	`239`	`else`
`240`	`240`	`{`
`241`		`- barGoLink bar(1);`
	`241`	`+ BarGoLink bar(1);`
`242`	`242`	`bar.step();`
`243`	`243`	`outstring_log("");`
`244`	`244`	outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");