[1961] Fix provided version information · scriptdev2/scriptdev2-tbc@1f51cb6 · GitHub

scriptdev2 / scriptdev2-tbc Public

• Notifications You must be signed in to change notification settings
• Fork 26
• Star 28

• Code
• Issues 11
• Pull requests 1
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 1f51cb6

Browse filesBrowse the repository at this point in the historyBrowse files

Schmoozerd

committed

[1961] Fix provided version information

Fix provided version information git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1961 5f9c896b-1e26-0410-94da-f77f675e2462

1 parent 4cdf9d8 commit 1f51cb6
Copy full SHA for 1f51cb6

3 files changed

+12-14Lines changed: 12 additions & 14 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• ScriptMgr.cpp
• system
  • system.cpp
  • system.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎ScriptMgr.cpp‎

Copy file name to clipboardExpand all lines: ScriptMgr.cpp

+1-7Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -226,13 +226,7 @@ void Script::RegisterSelf(bool bReportError)
226	226	MANGOS_DLL_EXPORT
227	227	char const* GetScriptLibraryVersion()
228	228	{
229		- if (!strSD2Version.empty())
230		- {
231		- strSD2Version.append(_FULLVERSION);
232		- return strSD2Version.c_str();
233		- }
234		-
235		- return _FULLVERSION;
	229	+ return strSD2Version.c_str();
236	230	}
237	231
238	232	MANGOS_DLL_EXPORT

Collapse file

‎system/system.cpp‎

Copy file name to clipboardExpand all lines: system/system.cpp

+10-6Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -4,6 +4,7 @@
4	4
5	5	#include "precompiled.h"
6	6	#include "system.h"
	7	+ #include "../config.h"
7	8	#include "ProgressBar.h"
8	9	#include "ObjectMgr.h"
9	10	#include "Database/DatabaseEnv.h"
@@ -32,16 +33,19 @@ void SystemMgr::LoadVersion()
32	33
33	34	strSD2Version = pFields[0].GetCppString();
34	35
35		- outstring_log("Loading %s", strSD2Version.c_str());
36		- outstring_log("");
37		-
38	36	delete pResult;
39	37	}
40	38	else
41		- {
42	39	error_log("SD2: Missing `sd2_db_version` information.");
43		- outstring_log("");
44		- }
	40	+
	41	+ // Setup version info and display it
	42	+ if (strSD2Version.empty())
	43	+ strSD2Version.append("ScriptDev2 ");
	44	+
	45	+ strSD2Version.append(_FULLVERSION);
	46	+
	47	+ outstring_log("Loading %s", strSD2Version.c_str());
	48	+ outstring_log("");
45	49	}
46	50
47	51	void SystemMgr::LoadScriptTexts()

Collapse file

‎system/system.h‎

Copy file name to clipboardExpand all lines: system/system.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6	#define SC_SYSTEM_H
7	7
8	8	extern DatabaseType SD2Database;
9		- extern std::string strSD2Version; //version info from database
	9	+ extern std::string strSD2Version; //version info: database entry and revision
10	10
11	11	#define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available
12	12

0 commit comments

Comments

0 (0)