From a41eeb41e528989752633730858d1a2cd560158d Mon Sep 17 00:00:00 2001 From: "False.Genesis" Date: Thu, 17 May 2007 21:10:49 +0000 Subject: [PATCH] * added conf/ScriptConfig.conf * some script cleanups * forgot to include winmm.lib in release mode * ==> Alpha 13.1 finished! --- bin/conf/PseuWoW.conf.default | 5 ----- bin/conf/ScriptConfig.conf.default | 28 ++++++++++++++++++++++++++++ bin/scripts/_enterworld.def | 4 ---- bin/scripts/autobroadcast.def | 25 ++++++------------------- bin/scripts/config.def | 1 + src/Client/PseuWoW.cpp | 4 ++-- src/shared.vcproj | 3 ++- 7 files changed, 39 insertions(+), 31 deletions(-) create mode 100644 bin/conf/ScriptConfig.conf.default diff --git a/bin/conf/PseuWoW.conf.default b/bin/conf/PseuWoW.conf.default index c76957f..e1e21a6 100644 --- a/bin/conf/PseuWoW.conf.default +++ b/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 diff --git a/bin/conf/ScriptConfig.conf.default b/bin/conf/ScriptConfig.conf.default new file mode 100644 index 0000000..2be3bf5 --- /dev/null +++ b/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! + + diff --git a/bin/scripts/_enterworld.def b/bin/scripts/_enterworld.def index 90b319d..18bebdb 100644 --- a/bin/scripts/_enterworld.def +++ b/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 // ... diff --git a/bin/scripts/autobroadcast.def b/bin/scripts/autobroadcast.def index 525cba4..8eaa602 100644 --- a/bin/scripts/autobroadcast.def +++ b/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 --- - - // your command you use to broadcast (without trailing "." or whatever!) - set,cmd announce - - // 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 -- + // check if this script should be loaded. + if ?{or,?{not ?{isset enable}} ?{not ${enable}}} + log ** AutoBroadcast: skipped loading. + return + endif // convert secs into msecs set,timer ${secs} diff --git a/bin/scripts/config.def b/bin/scripts/config.def index 8c4d21b..f5246ae 100644 --- a/bin/scripts/config.def +++ b/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 diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp index 85a19a2..5241dca 100644 --- a/src/Client/PseuWoW.cpp +++ b/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_short="A13" DEBUG_APPENDIX; + _ver="PseuWoW Alpha Build 13.1" DEBUG_APPENDIX; + _ver_short="A13.1" DEBUG_APPENDIX; _wsession=NULL; _rsession=NULL; _scp=NULL; diff --git a/src/shared.vcproj b/src/shared.vcproj index 269e924..cbfe6da 100644 --- a/src/shared.vcproj +++ b/src/shared.vcproj @@ -93,7 +93,8 @@ + Name="VCLibrarianTool" + AdditionalDependencies="winmm.lib"/>