* added conf/ScriptConfig.conf

* some script cleanups
* forgot to include winmm.lib in release mode
* ==> Alpha 13.1 finished!

bin/conf/PseuWoW.conf.default

@@ -96,11 +96,6 @@ disablespellcheck=0
 // to use the default language for your race (defined in race.scp)
 defaultlang=0
 
-// special char that is used to trigger server commands (for example ".goname Player")
-// (WoWEmu="." MaNGOS="." or "!")
-// other servers might be different 
-cmdchar=.
-
 // set this to 1 if you want to have a 3D-window showing stuff
 // NOTE: this is only to activate the window for now, 3D-stuff will come later!!
 // until some frame-limiter is implemented, it will always use 100% CPU usage when

bin/conf/ScriptConfig.conf.default

@@ -0,0 +1,28 @@
+
+// this config file has no effect on the core.
+// store variable definitions for scripts only!
+
+
+// options common for all scripts:
+[#uppercase]
+[#noprefix]
+// special char that is used to trigger server commands (for example ".goname Player")
+// (WoWEmu="." MaNGOS="." or "!")
+// other servers might be different 
+cmdchar=.
+
+
+[autobroadcast]
+enable=0
+// 20 mins by default
+secs=1200
+// the command the server uses to broadcast (.broadcast, .announce, .bc or whatever)
+// do NOT put a trailing "." or "!" , only the plain command name!
+cmd=announce
+// configure your texts here
+textcount=3
+text1=This is PseuWoW autobroadcast #1
+text2=And another one! Autobroadcast #2
+text3=The world is round, and so am I!
+
+

bin/scripts/_enterworld.def

@@ -29,10 +29,6 @@ JOINCHANNEL tradee
 // Spell 836 = LoginEffect
 CASTSPELL 836
 
-// uncomment the following line to enable the autobroadcast script (first broadcast will happen after the timer (check the script) has expired)
-// LOADDEF autobroadcast
-
-
 // add your own stuff here
 // ...
 

bin/scripts/autobroadcast.def

@@ -1,29 +1,16 @@
+// -- using conf/ScriptConfig.conf
 
-// load this file to register an autobroadcast
 // run this file to broadcast immediately (the timer will not change if you do!)
 
 #permission=255
 
 #onload
 
-    // --- CONFIG ---
+	// check if this script should be loaded.
-    
+	if ?{or,?{not ?{isset enable}} ?{not ${enable}}}
-    // your command you use to broadcast (without trailing "." or whatever!)
+		log ** AutoBroadcast: skipped loading.	
-    set,cmd announce
+		return
-    
+	endif
-    // set the broadcast interval (in seconds!)
-    // here we set it to 20 mins
-    set,secs 1200
-    
-    // configure the amount of texts we have
-    set,textcount 3
-    // configure the texts to broadcast (must begin with text1)
-    set,text1 This is PseuWoW autobroadcast #1
-    set,text2 And another one! Autobroadcast #2
-    set,text3 The world is round, and so am I!
-    //... Add more texts here...
-    
-    // --- END CONFIG --
     
     // convert secs into msecs
     set,timer ${secs}

bin/scripts/config.def

@@ -2,6 +2,7 @@
 // Load required conf files.
 LOADCONF PseuWoW.conf
 LOADCONF users.conf
+LOADCONF ScriptConfig.conf
 
 // Apply the configuration
 APPLYCONF

src/Client/PseuWoW.cpp

@@ -46,8 +46,8 @@ void PseuInstanceRunnable::sleep(uint32 msecs)
 PseuInstance::PseuInstance(PseuInstanceRunnable *run)
 {
     _runnable=run;
-    _ver="PseuWoW Alpha Build 13" DEBUG_APPENDIX;
+    _ver="PseuWoW Alpha Build 13.1" DEBUG_APPENDIX;
-    _ver_short="A13" DEBUG_APPENDIX;
+    _ver_short="A13.1" DEBUG_APPENDIX;
     _wsession=NULL;
     _rsession=NULL;
     _scp=NULL;

src/shared.vcproj

@@ -93,7 +93,8 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"/>
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Release/PseuWoW_Controller.tlb"