Menu
▾
▴
[PlaneShift-svn] SF.net SVN: planeshift:[7609] soc/2011/combat
|
From: <la...@us...> - 2011-08-15 20:15:41
|
Revision: 7609
http://planeshift.svn.sourceforge.net/planeshift/?rev=7609&view=rev
Author: landson
Date: 2011-08-15 20:15:32 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
reverted to rev 7567, last fully working copy.
Revision Links:
--------------
http://planeshift.svn.sourceforge.net/planeshift/?rev=7567&view=rev
Modified Paths:
--------------
soc/2011/combat/data/gui/bookwriting.xml
soc/2011/combat/data/gui/charcreate.xml
soc/2011/combat/data/gui/chat.xml
soc/2011/combat/data/gui/chat_basic.xml
soc/2011/combat/data/gui/configwindow.xml
soc/2011/combat/data/gui/styles.xml
soc/2011/combat/data/help.xml
soc/2011/combat/data/races/descriptions.xml
soc/2011/combat/include/isoundmngr.h
soc/2011/combat/lang/italian/stringtable.xml
soc/2011/combat/mk/msvc10/libbulkobjects.vcxproj
soc/2011/combat/mk/msvc10/libgui.vcxproj
soc/2011/combat/mk/msvc10/plgdbmysql.vcxproj
soc/2011/combat/mk/msvc10/plgdummysndmngr.vcxproj
soc/2011/combat/mk/msvc10/plgsoundmngr.vcxproj
soc/2011/combat/mk/msvc8/libbulkobjects.vcproj
soc/2011/combat/mk/msvc8/libgui.vcproj
soc/2011/combat/mk/msvc9/libbulkobjects.vcproj
soc/2011/combat/mk/msvc9/libgui.vcproj
soc/2011/combat/src/client/Jamfile
soc/2011/combat/src/client/cmdusers.cpp
soc/2011/combat/src/client/cmdutil.cpp
soc/2011/combat/src/client/gui/Jamfile
soc/2011/combat/src/client/gui/chatwindow.cpp
soc/2011/combat/src/client/gui/chatwindow.h
soc/2011/combat/src/client/gui/pawscharbirth.h
soc/2011/combat/src/client/gui/pawsconfigchattabs.cpp
soc/2011/combat/src/client/gui/pawscontrolwindow.h
soc/2011/combat/src/client/gui/pawsgmgui.cpp
soc/2011/combat/src/client/gui/pawsgmgui.h
soc/2011/combat/src/client/gui/pawshelp.cpp
soc/2011/combat/src/client/gui/pawsilluminationwindow.cpp
soc/2011/combat/src/client/gui/pawsilluminationwindow.h
soc/2011/combat/src/client/gui/pawsloginwindow.h
soc/2011/combat/src/client/gui/pawsskillwindow.cpp
soc/2011/combat/src/client/gui/pawsskillwindow.h
soc/2011/combat/src/client/pscelclient.cpp
soc/2011/combat/src/client/pscelclient.h
soc/2011/combat/src/client/psengine.cpp
soc/2011/combat/src/common/net/npcmessages.cpp
soc/2011/combat/src/common/net/npcmessages.h
soc/2011/combat/src/common/util/psconst.h
soc/2011/combat/src/eedit/eeditpartlisttoolbox.cpp
soc/2011/combat/src/eedit/eeditpartlisttoolbox.h
soc/2011/combat/src/npcclient/networkmgr.cpp
soc/2011/combat/src/npcclient/npc.cpp
soc/2011/combat/src/npcclient/npc.h
soc/2011/combat/src/plugins/common/Jamfile
soc/2011/combat/src/plugins/common/dummysndmngr/dummysndmngr.cpp
soc/2011/combat/src/plugins/common/dummysndmngr/dummysndmngr.h
soc/2011/combat/src/plugins/common/soundmanager/handle.cpp
soc/2011/combat/src/plugins/common/soundmanager/handle.h
soc/2011/combat/src/plugins/common/soundmanager/manager.cpp
soc/2011/combat/src/plugins/common/soundmanager/manager.h
soc/2011/combat/src/plugins/common/soundmanager/psemitter.cpp
soc/2011/combat/src/plugins/common/soundmanager/psemitter.h
soc/2011/combat/src/plugins/common/soundmanager/psentity.cpp
soc/2011/combat/src/plugins/common/soundmanager/psentity.h
soc/2011/combat/src/plugins/common/soundmanager/psmusic.cpp
soc/2011/combat/src/plugins/common/soundmanager/pssoundsector.cpp
soc/2011/combat/src/plugins/common/soundmanager/pssoundsector.h
soc/2011/combat/src/plugins/common/soundmanager/soundmanager.cpp
soc/2011/combat/src/plugins/common/soundmanager/soundmanager.h
soc/2011/combat/src/plugins/common/soundmanager/system.cpp
soc/2011/combat/src/plugins/common/soundmanager/system.h
soc/2011/combat/src/server/adminmanager.cpp
soc/2011/combat/src/server/adminmanager.h
soc/2011/combat/src/server/bulkobjects/dictionary.cpp
soc/2011/combat/src/server/bulkobjects/psattack.h
soc/2011/combat/src/server/bulkobjects/psattackmelee.cpp
soc/2011/combat/src/server/bulkobjects/psattackrange.cpp
soc/2011/combat/src/server/bulkobjects/pscharacter.cpp
soc/2011/combat/src/server/bulkobjects/pscharacter.h
soc/2011/combat/src/server/bulkobjects/pscharacterloader.cpp
soc/2011/combat/src/server/bulkobjects/psitem.cpp
soc/2011/combat/src/server/bulkobjects/psitemstats.cpp
soc/2011/combat/src/server/bulkobjects/psitemstats.h
soc/2011/combat/src/server/bulkobjects/psnpcdialog.cpp
soc/2011/combat/src/server/bulkobjects/psnpcloader.cpp
soc/2011/combat/src/server/bulkobjects/psprereqops.cpp
soc/2011/combat/src/server/bulkobjects/psspell.cpp
soc/2011/combat/src/server/cachemanager.cpp
soc/2011/combat/src/server/cachemanager.h
soc/2011/combat/src/server/command.cpp
soc/2011/combat/src/server/creationmanager.cpp
soc/2011/combat/src/server/database/mysql/accounts.sql
soc/2011/combat/src/server/database/mysql/alliances.sql
soc/2011/combat/src/server/database/mysql/attack_types.sql
soc/2011/combat/src/server/database/mysql/command_access.sql
soc/2011/combat/src/server/database/mysql/gm_events.sql
soc/2011/combat/src/server/database/mysql/loot_rule_details.sql
soc/2011/combat/src/server/database/mysql/race_info.sql
soc/2011/combat/src/server/database/mysql/upgrade_schema.sql
soc/2011/combat/src/server/database/mysql/wc_accessrules.sql
soc/2011/combat/src/server/exchangemanager.cpp
soc/2011/combat/src/server/gem.cpp
soc/2011/combat/src/server/lootrandomizer.cpp
soc/2011/combat/src/server/npcmanager.cpp
soc/2011/combat/src/server/npcmanager.h
soc/2011/combat/src/server/progressionmanager.cpp
soc/2011/combat/src/server/questmanager.cpp
soc/2011/combat/src/server/scripting.cpp
soc/2011/combat/src/server/spawnmanager.cpp
soc/2011/combat/src/server/usermanager.cpp
Removed Paths:
-------------
soc/2011/combat/include/ispellchecker.h
soc/2011/combat/src/client/gui/pawsconfigspellchecker.cpp
soc/2011/combat/src/client/gui/pawsconfigspellchecker.h
soc/2011/combat/src/plugins/common/spellchecker/
soc/2011/combat/src/server/bulkobjects/pscharquestmgr.cpp
soc/2011/combat/src/server/bulkobjects/pscharquestmgr.h
soc/2011/combat/src/server/database/mysql/wc_accessrules_builder.xls
Property Changed:
----------------
soc/2011/combat/data/renderlayers/
soc/2011/combat/data/shader/
soc/2011/combat/lang/1337/
soc/2011/combat/lang/englishtemplate/
soc/2011/combat/lang/french/
soc/2011/combat/lang/italian/
soc/2011/combat/src/tools/ccheck/
Modified: soc/2011/combat/data/gui/bookwriting.xml
===================================================================
--- soc/2011/combat/data/gui/bookwriting.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/bookwriting.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -10,14 +10,12 @@
<frame x="35" y="35" width="385" height="40"/>
<font name="becker-m.ttf" r="0" g="0" b="0" size="15"/>
<text horizAdjust="CENTRE" />
- <spellChecker enable="true" r="255" g="0" b="0"/>
</widget>
<widget name="body" factory="pawsMultilineEditTextBox" style="textinput">
<frame x="35" y="90" width="385" height="380" border="no"/>
<font name="becker-m.ttf" r="0" g="0" b="0" size="12"/>
- <spellChecker enable="true" r="255" g="0" b="0"/>
</widget>
<widget name="save" factory="pawsButton" id="103" style="Standard Button">
Modified: soc/2011/combat/data/gui/charcreate.xml
===================================================================
--- soc/2011/combat/data/gui/charcreate.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/charcreate.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -6,11 +6,6 @@
<bgimage resource="login_background" />
<font name="cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" />
- <form>
- <enter name="charfirstnametext" />
- <tab name="charlastnametext" />
- </form>
-
<!-- Title -->
<widget name="label_charcreate" factory="pawsTextBox">
<frame x="200" y="40" width="400" height="35" />
@@ -107,18 +102,23 @@
<text string="Nolthrir" position="right"/>
</widget>
+ <widget name="race8" factory="pawsRadioButton" id="8">
+ <frame x="0" y="202" width="175" height="24"/>
+ <text string="Diaboli" position="right"/>
+ </widget>
+
<widget name="race7" factory="pawsRadioButton" id="7">
- <frame x="0" y="202" width="175" height="24"/>
+ <frame x="0" y="226" width="175" height="24"/>
<text string="Hammerwielder" position="right"/>
</widget>
<widget name="race4" factory="pawsRadioButton" id="4">
- <frame x="0" y="226" width="175" height="24"/>
+ <frame x="0" y="250" width="175" height="24"/>
<text string="Xacha" position="right"/>
</widget>
<widget name="race10" factory="pawsRadioButton" id="10">
- <frame x="0" y="250" width="175" height="24"/>
+ <frame x="0" y="274" width="175" height="24"/>
<text string="Lemur" position="right"/>
</widget>
Modified: soc/2011/combat/data/gui/chat.xml
===================================================================
--- soc/2011/combat/data/gui/chat.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/chat.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -7,7 +7,7 @@
<title resource="Scaling Title Bar" text="Communication" align="left" close_button="yes"/>
<bgimage resource="Scaling Widget Background" />
- <widget name="InputText" factory="pawsEditTextBox" alwaysontop="yes">
+ <widget name="InputText" factory="pawsSpellCheckedEditBox" alwaysontop="yes">
<frame x="50" y="125" width="445" height="25" border="no" />
<attachpoints>
<attach point="ATTACH_RIGHT" />
Modified: soc/2011/combat/data/gui/chat_basic.xml
===================================================================
--- soc/2011/combat/data/gui/chat_basic.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/chat_basic.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -7,7 +7,7 @@
<title resource="Scaling Title Bar" text="Communication" align="left" close_button="yes"/>
<bgimage resource="Scaling Widget Background" />
- <widget name="InputText" factory="pawsEditTextBox" alwaysontop="yes">
+ <widget name="InputText" factory="pawsSpellCheckedEditBox" alwaysontop="yes">
<frame x="50" y="125" width="445" height="25" border="no" />
<attachpoints>
<attach point="ATTACH_RIGHT" />
Modified: soc/2011/combat/data/gui/configwindow.xml
===================================================================
--- soc/2011/combat/data/gui/configwindow.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/configwindow.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -97,10 +97,6 @@
<attr name="SectionName" value="tabcompletion"/>
<attr name="factory" value="pawsConfigChatTabCompletion"/>
</widget>
- <widget factory="pawsSimpleTreeNode" label="Chat - Spellchecker">
- <attr name="SectionName" value="spellchecker"/>
- <attr name="factory" value="pawsConfigSpellChecker"/>
- </widget>
<widget factory="pawsSimpleTreeNode" label="Autoexec">
<attr name="SectionName" value="autoexec"/>
<attr name="factory" value="pawsConfigAutoexec"/>
Modified: soc/2011/combat/data/gui/styles.xml
===================================================================
--- soc/2011/combat/data/gui/styles.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/gui/styles.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -285,6 +285,7 @@
<defaultstyle widget="pawsTextBox" style="Standard TextBox"/>
<defaultstyle widget="pawsMultiLineTextBox" style="Standard MLB"/>
<defaultstyle widget="pawsEditTextBox" style="Standard EditTextBox"/>
+ <defaultstyle widget="pawsSpellCheckedEditBox" style="Standard EditTextBox"/>
<defaultstyle widget="pawsMessageTextBox" style="Standard MsgText"/>
<defaultstyle widget="pawsListBox" style="Standard ListBox"/>
<defaultstyle widget="pawsSimpleTree" style="Left Side Tree"/>
Modified: soc/2011/combat/data/help.xml
===================================================================
--- soc/2011/combat/data/help.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/help.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -469,11 +469,7 @@
Allows to test an animation. No one will be able to see it except you. Name is the name of the animation, fade in and fade out define the fade time for the animation.</topic>
<topic name="/tip">/tip
- Requests a tip from the server.</topic>
- <topic name="/version">/version
-
-Prints out the current version of the game.</topic>
-
+Requests a tip from the server.</topic>
</branch>
<branch name="GM Commands" level="1">
Commands available to game master level characters. Note that this is a full list of abilities, and not all access groups have everything listed here.
Modified: soc/2011/combat/data/races/descriptions.xml
===================================================================
--- soc/2011/combat/data/races/descriptions.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/data/races/descriptions.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -134,7 +134,24 @@
<FACEPOS x="0.05" y="1.1" z="-1.4" />
</race>
+
+ <race name="Diaboli"
+ description=
+"THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MODELS OF THE YNNWN RACE. Physical traits: The typical Diabolo has shiny oil-black skin, a thin pointed tail and little horns. Apart from that, they have almost the same body proportions as humans, and almost identical internal organs. Both male and female have gorgeous, perfectly shaped bodies.
+Abilities and fields of interest: The Diaboli developed a good resistance to many elemental spells thanks to a deep knowledge in that area of magic. On the other hand, they avoid holy places as they feel uncomfortable in them. It's quite rare to meet a Diaboli inside a temple. They diligently try to avoid sacred objects: holy weapons are devastating against them. They are famous for their ability to attract and charm people, and therefore the Diaboli have a natural talent for social relations.
+Psychology: A popular tradition tells that their homeland was a burning land that continuously erupted black smoke (this may suggest the presence of a volcano), a dark and perpetually cloudy sky and sulphuric rivers of flowing blood. Some sages believe they originated in a distant, unexplored universe, but opinions are contradictory. Nonetheless, their race is the only one who thinks of Yliakum as a real paradise, and this says a lot about their homeland. They rarely keep a single partner, preferring to have many, and that explains the large number of half-breeds in Yliakum. Diaboli are a happy, bustling, malicious race, quite unreliable. Humility is a completely foreign concept to them. Their familiarity with some of the semi-intelligent races that dwell in the Stone Labyrinths has raised suspicion with the other races.
+Rules: Nothing Special for now."
+ basetexture="1.png"
+ male="ynnwnm"
+ female="fynnwn"
+ male_available="yes"
+ female_available="yes">
+ <FirstPos x="0" y="1.81" z="0" />
+ <FACEPOS x="0" y="1.9" z="-1.0" />
+
+ </race>
+
<race name="Kran"
description=
"Physical Traits: They belong more to the mineral kingdom than to the animal one. Their organism is the only one, amongst the known races, to be based on silicon instead of carbon. They appear as humanoids made of rock. The colour of the body is mainly grey or black and slightly wrinkled, with coloured veins different from individual to individual. Some rare Kran have a different coloured skin, like white, azure or pink, which is highly appreciated by Kran. Their head is slightly lengthened at the top, without ears and nose. They are born underground and none of them has ever seen the light of the sun.
Property changes on: soc/2011/combat/data/renderlayers
___________________________________________________________________
Modified: svn:mergeinfo
- /soc/2011/gui/data/renderlayers:7434,7519-7520
/soc/2011/sound/data/renderlayers:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/data/renderlayers:7178-7567
+ /soc/2011/sound/data/renderlayers:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399
/trunk/data/renderlayers:7178-7423
Property changes on: soc/2011/combat/data/shader
___________________________________________________________________
Modified: svn:mergeinfo
- /soc/2011/gui/data/shader:7434,7519-7520
/soc/2011/sound/data/shader:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/data/shader:7178-7567
+ /soc/2011/sound/data/shader:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399
/trunk/data/shader:7178-7423
Modified: soc/2011/combat/include/isoundmngr.h
===================================================================
--- soc/2011/combat/include/isoundmngr.h 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/include/isoundmngr.h 2011-08-15 20:15:32 UTC (rev 7609)
@@ -49,7 +49,7 @@
*/
struct iSoundManager: public virtual iBase
{
- SCF_INTERFACE(iSoundManager, 1, 1, 2);
+ SCF_INTERFACE(iSoundManager, 1, 0, 0);
/**
* The sound manager initializes by default the SoundControls with the IDs
@@ -219,11 +219,10 @@
virtual int GetCombatStance() const = 0;
/**
- * Set the player's position and speed.
+ * Set the player's position.
* @param playerPosition the player's position.
- * @param playerVelocity the player's velocity.
*/
- virtual void SetPlayerMovement(csVector3 playerPosition, csVector3 playerVelocity) = 0;
+ virtual void SetPosition(csVector3 playerPosition) = 0;
/**
* Get the player's position.
@@ -262,7 +261,7 @@
* plays the start resource (if defined). If it is already playing a
* sound, it is stopped.
*
- * @param state the new state >= 0 for the entity. For negative value
+ * @param state the new state > 0 for the entity. For negative value
* the function is not defined.
* @param mesh the mesh associated to the entity.
* @param forceChange if it is false the entity does not change its
@@ -329,16 +328,15 @@
//------------//
/**
- * Play a 2D sound and return the ID of the played sound.
+ * Play a 2D sound.
* @param fileName the name of the file where the sound is stored.
* @param loop true if the sound have to loop, false otherwise.
* @param ctrl the SoundControl that handle the sound.
- * @return 0 if the sound cannot be played, its ID otherwise.
*/
- virtual uint PlaySound(const char* fileName, bool loop, iSoundControl* &ctrl) = 0;
+ virtual void PlaySound(const char* fileName, bool loop, iSoundControl* &ctrl) = 0;
/**
- * Play a 3D sound and return the ID of the played sound.
+ * Play a 3D sound.
* @param fileName the name of the file where the sound is stored.
* @param loop true if the sound have to loop, false otherwise.
* @param ctrl the SoundControl that handle the sound.
@@ -346,24 +344,23 @@
* @param dir the direction of the sound.
* @param minDist the minimum distance at which the player can hear it.
* @param maxDist the maximum distance at which the player can hear it.
- * @return 0 if the sound cannot be played, its ID otherwise.
*/
- virtual uint PlaySound(const char* fileName, bool loop, iSoundControl* &ctrl, csVector3 pos, csVector3 dir, float minDist, float maxDist) = 0;
+ virtual void PlaySound(const char* fileName, bool loop, iSoundControl* &ctrl, csVector3 pos, csVector3 dir, float minDist, float maxDist) = 0;
/**
- * Stop a sound with the given ID.
- * @param soundID the ID of the sound returned by PlaySound.
+ * Stop a sound with the given name.
+ * @param fileName the name of the file where the sound is stored.
* @return true if a sound with that name exists, false otherwise.
*/
- virtual bool StopSound(uint soundID) = 0;
+ virtual bool StopSound(const char* fileName) = 0;
/**
* Set the sound source position.
- * @param soundID the ID of the sound returned by PlaySound.
+ * @param fileName the name of the file where the sound is stored.
* @param position the new position of the sound source.
- * @return true if a sound with that ID exists, false otherwise.
+ * @return true if a sound with that name exists, false otherwise.
*/
- virtual bool SetSoundSource(uint soundID, csVector3 position) = 0;
+ virtual bool SetSoundSource(const char* fileName, csVector3 position) = 0;
//--------//
// UPDATE //
Deleted: soc/2011/combat/include/ispellchecker.h
===================================================================
--- soc/2011/combat/include/ispellchecker.h 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/include/ispellchecker.h 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1,48 +0,0 @@
-/*
-* ispellchecker.h, Author: Fabian Stock (Aiw...@go...)
-*
-* Copyright (C) 2001-2011 Atomic Blue (in...@pl..., http://www.atomicblue.org)
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation (version 2 of the License)
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*
-*/
-
-#ifndef _ISPELLCHECKER_H_
-#define _ISPELLCHECKER_H_
-
-// crystalSpace includes
-#include <csutil/scf.h>
-#include <csutil/scf_implementation.h>
-
-struct iSpellChecker : public virtual iBase
-{
- SCF_INTERFACE(iSpellChecker, 1, 0, 0);
-
- /** adds a word to the personal dictionary
- */
- virtual void addWord(csString newWord) = 0;
- /** get an array with words of the personal dictionary
- */
- virtual const csArray<csString>& getPersonalDict() = 0;
- /** clears the whole personal dictionary
- */
- virtual void clearPersonalDict() = 0;
- /** are any dictionaries loaded?
- */
- virtual bool hasDicts() = 0;
- /** is the given word in one of the dictionaries?
- */
- virtual bool correct(csString wordToCheck) = 0;
-};
-
-#endif // _ISPELLCHECKER_H_
\ No newline at end of file
Property changes on: soc/2011/combat/lang/1337
___________________________________________________________________
Modified: svn:mergeinfo
- /soc/2011/gui/lang/1337:7434,7519-7520
/soc/2011/sound/lang/1337:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/lang/1337:7178-7567
+ /soc/2011/sound/lang/1337:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421
/trunk/lang/1337:7178-7432
Property changes on: soc/2011/combat/lang/englishtemplate
___________________________________________________________________
Modified: svn:mergeinfo
- /personal/Kayden/lang/english:2590-3147
/personal/Xordan/lang/english:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613
/soc/2011/gui/lang/englishtemplate:7434,7519-7520
/soc/2011/sound/lang/englishtemplate:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/lang/englishtemplate:7178-7567
+ /personal/Kayden/lang/english:2590-3147
/personal/Xordan/lang/english:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613
/soc/2011/sound/lang/englishtemplate:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421
/trunk/lang/englishtemplate:7178-7432
Property changes on: soc/2011/combat/lang/french
___________________________________________________________________
Modified: svn:mergeinfo
- /soc/2011/gui/lang/french:7434,7519-7520
/soc/2011/sound/lang/french:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/lang/french:7178-7567
+ /soc/2011/sound/lang/french:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421
/trunk/lang/french:7178-7432
Property changes on: soc/2011/combat/lang/italian
___________________________________________________________________
Modified: svn:mergeinfo
- /soc/2011/gui/lang/italian:7434,7519-7520
/soc/2011/sound/lang/italian:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421,7425,7428-7430,7439,7442-7443,7445-7447
/trunk/lang/italian:7178-7567
+ /soc/2011/sound/lang/italian:7354,7363,7366-7367,7369,7373-7374,7376,7380,7382-7384,7386,7390,7392-7393,7396,7398-7399,7403,7410,7412,7415-7418,7420-7421
/trunk/lang/italian:7178-7432
Modified: soc/2011/combat/lang/italian/stringtable.xml
===================================================================
--- soc/2011/combat/lang/italian/stringtable.xml 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/lang/italian/stringtable.xml 2011-08-15 20:15:32 UTC (rev 7609)
@@ -43,8 +43,8 @@
<item orig="Creatures" trans="" />
<item orig="Dismiss" trans="" />
<item orig="Stack Count" trans="" />
- <item orig="Torso" trans="" />
<item orig="Examine" trans="Esamina" />
+ <item orig="Torso" trans="" />
<item orig=" unanswered petitions." trans=" petizioni non risposte." />
<item orig="Talk to people in your sector." trans="Parla alle persone nel tuo settore." />
<item orig="Right Finger" trans="" />
@@ -57,29 +57,28 @@
<item orig="Cannot connect to server!" trans="" />
<item orig="male " trans="maschio di " />
<item orig="Show Info Messages on screen" trans="" />
- <item orig="Description" trans="Descrizione" />
- <item orig="alliance text colour" trans="colore testo alleanza" />
<item orig="Active" trans="Attivo" />
+ <item orig="alliance text colour" trans="colore testo alleanza" />
+ <item orig="Description" trans="Descrizione" />
<item orig="Creatures:" trans="Creature:" />
<item orig="says" trans="dice" />
<item orig="Chose Color (c)" trans="Seleziona Colore (c)" />
<item orig="View" trans="Vedi" />
<item orig="PATHS" trans="VIE" />
<item orig="Wait" trans="" />
- <item orig="Previous Icon (PgUp)" trans="Icona Precedente (pgUp)" />
<item orig="Shadows" trans="Ombre" />
+ <item orig="Previous Icon (PgUp)" trans="Icona Precedente (pgUp)" />
<item orig="Unclaim" trans="Deassegna" />
<item orig="Server:" trans="Server:" />
- <item orig="Enable Shadows" trans="Abilita Ombre" />
<item orig="Exit PlaneShift" trans="Esci da PlaneShift" />
+ <item orig="Enable Shadows" trans="Abilita Ombre" />
<item orig="Escalation Level:" trans="" />
<item orig="Edit mode has been disabled." trans="" />
<item orig="Notify when members login/logout" trans="Notifica quando i membri entrano/escono" />
- <item orig="Talk to someone privately." trans="Parla a qualcuno privatamente." />
<item orig="P. stamina" trans="Stamina F." />
+ <item orig="Talk to someone privately." trans="Parla a qualcuno privatamente." />
<item orig="Magic Skills List:" trans="" />
<item orig="Quest" trans="" />
- <item orig="Sorry, no dictionary found. To use the spell checker get one" trans="" />
<item orig="House:" trans="Casa:" />
<item orig="System Base" trans="Sistema Base" />
<item orig="10 Tria" trans="" />
@@ -106,7 +105,6 @@
<item orig="Are you sure you want to discard the selected quest?" trans="Sei sicuro di voler cancellare la quest selezionata?" />
<item orig="PvP" trans="" />
<item orig="Enable alliance" trans="Abilita alleanza" />
- <item orig="Personal Dictionary:" trans="" />
<item orig="landscape" trans="landscape" />
<item orig="Type:" trans="Tipo:" />
<item orig="Time: " trans="Ora: " />
@@ -121,8 +119,8 @@
<item orig="each values 250 Tria" trans="" />
<item orig="npcinternal outline colour" trans="" />
<item orig="Merchant" trans="Mercante" />
- <item orig="Account User Name:" trans="Nome utente Account:" />
<item orig="Auction" trans="" />
+ <item orig="Account User Name:" trans="Nome utente Account:" />
<item orig="set invisible" trans="" />
<item orig="Please enter a first name" trans="" />
<item orig="You currently have no petitions." trans="Al momento non hai petizioni." />
@@ -136,8 +134,8 @@
<item orig="Show Result Messages on screen" trans="" />
<item orig="The server is locked!" trans="Il server è bloccato!" />
<item orig="Mount" trans="" />
- <item orig="Quest & Events Notebook" trans="" />
<item orig="Are you sure you want to upload? You have 2 CP left." trans="" />
+ <item orig="Quest & Events Notebook" trans="" />
<item orig="Remove!" trans="" />
<item orig="Enable background color" trans="" />
<item orig="You will now ignore %s." trans="Da ora ignorerai %s." />
@@ -147,8 +145,8 @@
<item orig="Tell Alignment" trans="Allineamento Tell" />
<item orig="Enable NPC" trans="Abilita NPC" />
<item orig="Change name" trans="Cambia nome" />
- <item orig="set invincible" trans="" />
<item orig="Getting Characters" trans="Caricamento Personaggi" />
+ <item orig="set invincible" trans="" />
<item orig="Introduce yourself" trans="" />
<item orig="Main tab" trans="" />
<item orig="Unknown command" trans="Comando sconosciuto" />
@@ -158,7 +156,6 @@
<item orig="Enable my" trans="Abilita my" />
<item orig="Main" trans="" />
<item orig="Change" trans="Cambia" />
- <item orig="Color of Typos" trans="" />
<item orig="Descalate" trans="" />
<item orig="Buy Skill Level" trans="" />
<item orig="Mother Name:" trans="Nome Madre:" />
@@ -187,8 +184,8 @@
<item orig="Mesh:" trans="" />
<item orig="Right Hand" trans="" />
<item orig="Resolution" trans="Risoluzione" />
- <item orig="Gender:" trans="Sesso:" />
<item orig="Refresh MOTD" trans="Aggiorna MOTD" />
+ <item orig="Gender:" trans="Sesso:" />
<item orig="Login" trans="" />
<item orig="Z:" trans="" />
<item orig="Use basic chat window (need reload)" trans="" />
@@ -197,15 +194,15 @@
<item orig="%s has invited you to join a group. Click Yes to accept or No to reject." trans="%s ti ha invitato ad aggregarti a un gruppo. Clicca Sì per accettare e No per rifiutare." />
<item orig="You must select a petition from the list in order to cancel it." trans="Devi selezionare una petizione della lista per poterla cancellare." />
<item orig="Alliance" trans="Alleanza" />
- <item orig="Are you sure you want to upload? " trans="" />
<item orig="Log Filename:" trans="" />
+ <item orig="Are you sure you want to upload? " trans="" />
<item orig="Dynamic Follow" trans="Inseguimento Dinamico" />
<item orig="NPC_my text colour" trans="Colore testo NPC_my" />
<item orig="Full Mesh" trans="Modello completo" />
<item orig="Do you really want to reset these settings to default values?" trans="" />
<item orig="NPC_narrate shadow colour" trans="" />
- <item orig="alliance outline colour" trans="" />
<item orig="I am leaving" trans="Sto andando via" />
+ <item orig="alliance outline colour" trans="" />
<item orig="Command(s) only for this character:" trans="" />
<item orig="Circles available to deposit." trans="" />
<item orig="Train" trans="" />
@@ -221,8 +218,8 @@
Vuoi veramente lasciare Yliakum?" />
<item orig="Count" trans="Conto" />
<item orig="Enter the command(s):" trans="Inserire i comandi:" />
- <item orig="Month:" trans="Mese:" />
<item orig="Chat" trans="" />
+ <item orig="Month:" trans="Mese:" />
<item orig="NPC_me outline colour" trans="" />
<item orig="Mute on focus loss" trans="" />
<item orig="Aggressive" trans="" />
@@ -233,8 +230,8 @@
<item orig="Rank" trans="Rango" />
<item orig="Spawn item" trans="Crea oggetto" />
<item orig="Enable guild" trans="Abilita gilda" />
- <item orig="Group stats" trans="" />
<item orig="o&clock" trans="in punto" />
+ <item orig="Group stats" trans="" />
<item orig="Construct" trans="" />
<item orig="Give Kill Experience" trans="" />
<item orig="Own combat stance changes" trans="" />
@@ -253,13 +250,13 @@
<item orig="Tria" trans="" />
<item orig="Group text color" trans="Colore testo Gruppo" />
<item orig="1 Tria" trans="" />
- <item orig="The number of trias that you may exchange." trans="" />
<item orig="No Petitions." trans="Nessuna petizione." />
+ <item orig="The number of trias that you may exchange." trans="" />
<item orig="Filter" trans="" />
<item orig="New" trans="Nuovo" />
<item orig="Mute sounds on focus loss" trans="" />
- <item orig="Show Error Messages on screen" trans="" />
<item orig="Firstname:" trans="" />
+ <item orig="Show Error Messages on screen" trans="" />
<item orig="Exchange all items" trans="" />
<item orig="Add Linked" trans="Aggiungi collegato" />
<item orig="keyboard" trans="Tastiera" />
@@ -271,22 +268,21 @@
<item orig="Say Alignment" trans="" />
<item orig="set viewall" trans="" />
<item orig="Combat" trans="Combattimento" />
- <item orig="Default last chat" trans="" />
<item orig="Say outline colour" trans="" />
+ <item orig="Default last chat" trans="" />
<item orig="Path" trans="Via" />
<item orig="each values 1 Tria" trans="" />
<item orig="Delete Selected Character" trans="" />
- <item orig="Chat - Spellchecker" trans="" />
<item orig="Kill Player" trans="Uccidi giocatore" />
<item orig="%s says: %s" trans="%s dice: %s" />
<item orig="Are you sure you want to upload your character?" trans="Sei sicuro di voler caricare il tuo personaggio?" />
<item orig="Enable Chat Bubbles" trans="" />
<item orig="Transfer to inventory" trans="" />
- <item orig="Get Reward" trans="Ottieni ricompensa" />
- <item orig="Magic" trans="Magia" />
<item orig="Own attacks that fail to penetrate the armor" trans="" />
- <item orig="Credits" trans="Crediti" />
+ <item orig="Magic" trans="Magia" />
+ <item orig="Get Reward" trans="Ottieni ricompensa" />
<item orig="You have " trans="" />
+ <item orig="Credits" trans="Crediti" />
<item orig="details" trans="Dettagli" />
<item orig="Buddy with the name" trans="" />
<item orig="HP" trans="" />
@@ -295,24 +291,24 @@
<item orig="%s shouts: %s" trans="%s urla: %s" />
<item orig="Quality:" trans="Qualità:" />
<item orig="No server running at the moment" trans="Non ci sono server attivi in questo momento" />
- <item orig="Chat - TabCompletion" trans="" />
<item orig="Log Bracket:" trans="" />
+ <item orig="Chat - TabCompletion" trans="" />
<item orig=" " trans="" />
<item orig="CHARACTER CREATION" trans="CREAZIONE PERSONAGGIO" />
- <item orig="Glyphs" trans="Glyph" />
<item orig="Alliance:" trans="Alleanza:" />
+ <item orig="Glyphs" trans="Glyph" />
<item orig="Various Skill description:" trans="" />
<item orig="Buddy list" trans="" />
<item orig="100%" trans="" />
<item orig="Strength on the lock" trans="" />
<item orig="Edit level" trans="Cambia livello" />
<item orig="Leave" trans="Abbandona" />
- <item orig="This race isn't implemented yet, sorry" trans="" />
<item orig="Play/Solve" trans="" />
<item orig="Capacity:" trans="Capacità" />
<item orig="Debuffs" trans="" />
<item orig="Alliance text color" trans="Colore testo Alleanza" />
<item orig="Words for tab completion:" trans="" />
+ <item orig="This race isn't implemented yet, sorry" trans="" />
<item orig="Study Item" trans="" />
<item orig="Store" trans="" />
<item orig="You have ignored the following players:" trans="Hai ignorato i seguenti giocatori:" />
@@ -561,7 +557,6 @@
<item orig="NPC Owned" trans="" />
<item orig="View item" trans="" />
<item orig="Confirmations" trans="" />
- <item orig="at "http://wiki.services.openoffice.org/wiki/Dictionaries" and" trans="" />
<item orig="Unmute Player" trans="" />
<item orig="Online only" trans="Solo online" />
<item orig="Pub notes" trans="Note publ" />
@@ -652,7 +647,6 @@
<item orig="Please enter valid names for both parents" trans="" />
<item orig="Enable execution of start-up scripts" trans="" />
<item orig="Font color" trans="" />
- <item orig="unzip it in "<PlaneShift-Installation-Directory>/data/dict"." trans="" />
<item orig="Camera" trans="" />
<item orig="Remember password" trans="Ricorda password" />
<item orig="Third Person Follow" trans="Terza persona inseguimento" />
@@ -871,7 +865,6 @@
<item orig="Left Finger" trans="" />
<item orig="Failed" trans="" />
<item orig="Welcome to" trans="" />
- <item orig="Enable spell checker in chat window" trans="" />
<item orig="Realm" trans="Reame" />
<item orig="cancelled." trans="cancellata." />
<item orig="closed." trans="chiusa." />
Modified: soc/2011/combat/mk/msvc10/libbulkobjects.vcxproj
===================================================================
--- soc/2011/combat/mk/msvc10/libbulkobjects.vcxproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc10/libbulkobjects.vcxproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1367,7 +1367,6 @@
<ClCompile Include="..\..\src\server\bulkobjects\pscharacterlist.cpp" />
<ClCompile Include="..\..\src\server\bulkobjects\pscharacterloader.cpp" />
<ClCompile Include="..\..\src\server\bulkobjects\pscharinventory.cpp" />
- <ClCompile Include="..\..\src\server\bulkobjects\pscharquestmgr.cpp" />
<ClCompile Include="..\..\src\server\bulkobjects\psglyph.cpp" />
<ClCompile Include="..\..\src\server\bulkobjects\psguildinfo.cpp" />
<ClCompile Include="..\..\src\server\bulkobjects\psinventorycachesvr.cpp" />
@@ -1403,7 +1402,6 @@
<ClInclude Include="..\..\src\server\bulkobjects\pscharacterlist.h" />
<ClInclude Include="..\..\src\server\bulkobjects\pscharacterloader.h" />
<ClInclude Include="..\..\src\server\bulkobjects\pscharinventory.h" />
- <ClInclude Include="..\..\src\server\bulkobjects\pscharquestmgr.h" />
<ClInclude Include="..\..\src\server\bulkobjects\psglyph.h" />
<ClInclude Include="..\..\src\server\bulkobjects\psguildinfo.h" />
<ClInclude Include="..\..\src\server\bulkobjects\psinventorycachesvr.h" />
Modified: soc/2011/combat/mk/msvc10/libgui.vcxproj
===================================================================
--- soc/2011/combat/mk/msvc10/libgui.vcxproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc10/libgui.vcxproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1354,7 +1354,6 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\client\gui\attacklist.cpp" />
<ClCompile Include="..\..\src\client\gui\bartender.cpp" />
<ClCompile Include="..\..\src\client\gui\chatwindow.cpp" />
<ClCompile Include="..\..\src\client\gui\inventorywindow.cpp" />
@@ -1387,7 +1386,6 @@
<ClCompile Include="..\..\src\client\gui\pawsconfigpvp.cpp" />
<ClCompile Include="..\..\src\client\gui\pawsconfigshadows.cpp" />
<ClCompile Include="..\..\src\client\gui\pawsconfigsound.cpp" />
- <ClCompile Include="..\..\src\client\gui\pawsconfigspellchecker.cpp" />
<ClCompile Include="..\..\src\client\gui\pawsconfigtooltips.cpp" />
<ClCompile Include="..\..\src\client\gui\pawsconfigwindow.cpp" />
<ClCompile Include="..\..\src\client\gui\pawscontainerdescwindow.cpp" />
@@ -1439,7 +1437,6 @@
<ClCompile Include="..\..\src\client\gui\shortcutwindow.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\client\gui\attacklist.h" />
<ClInclude Include="..\..\src\client\gui\bartender.h" />
<ClInclude Include="..\..\src\client\gui\chatwindow.h" />
<ClInclude Include="..\..\src\client\gui\inventorywindow.h" />
@@ -1472,7 +1469,6 @@
<ClInclude Include="..\..\src\client\gui\pawsconfigpvp.h" />
<ClInclude Include="..\..\src\client\gui\pawsconfigshadows.h" />
<ClInclude Include="..\..\src\client\gui\pawsconfigsound.h" />
- <ClInclude Include="..\..\src\client\gui\pawsconfigspellchecker.h" />
<ClInclude Include="..\..\src\client\gui\pawsconfigtooltips.h" />
<ClInclude Include="..\..\src\client\gui\pawsconfigwindow.h" />
<ClInclude Include="..\..\src\client\gui\pawscontainerdescwindow.h" />
Modified: soc/2011/combat/mk/msvc10/plgdbmysql.vcxproj
===================================================================
--- soc/2011/combat/mk/msvc10/plgdbmysql.vcxproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc10/plgdbmysql.vcxproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -286,7 +286,8 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">..\..\out\debug10-x64\build\plgdbmysql\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">dbmysql</TargetName>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">true</IgnoreImportLibrary>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugWithDlls|Win32'">c:\mysql\lib;c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugWithDlls|Win32'">c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|Win32'">c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithStaticLibs|Win32'">
<ClCompile>
@@ -849,7 +850,7 @@
<DelayLoadDLLs>;%(DelayLoadDLLs)</DelayLoadDLLs>
<ImportLibrary>..\..\out\debug10\build\plgdbmysql\Win32\plgdbmysql.lib</ImportLibrary>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;libmysql.lib;libpsutil_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\CS\out\release10\libs;..\..\..\CS\winlibs\x86\lib;..\..\..\CS\win32libs\lib;$(CRYSTAL)\out\release10\libs;$(CRYSTAL)\winlibs\x86\lib;$(CRYSTAL)\win32libs\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TargetMachine>MachineX86</TargetMachine>
Modified: soc/2011/combat/mk/msvc10/plgdummysndmngr.vcxproj
===================================================================
--- soc/2011/combat/mk/msvc10/plgdummysndmngr.vcxproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc10/plgdummysndmngr.vcxproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -286,6 +286,7 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">..\..\out\debug10-x64\build\plgdummysndmngr\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">dummysndmngr</TargetName>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">true</IgnoreImportLibrary>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|Win32'">c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithStaticLibs|Win32'">
<ClCompile>
@@ -848,7 +849,7 @@
<DelayLoadDLLs>;%(DelayLoadDLLs)</DelayLoadDLLs>
<ImportLibrary>..\..\out\debug10\build\plgdummysndmngr\Win32\plgdummysndmngr.lib</ImportLibrary>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;libpsutil_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\CS\out\release10\libs;..\..\..\CS\winlibs\x86\lib;..\..\..\CS\win32libs\lib;$(CRYSTAL)\out\release10\libs;$(CRYSTAL)\winlibs\x86\lib;$(CRYSTAL)\win32libs\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TargetMachine>MachineX86</TargetMachine>
Modified: soc/2011/combat/mk/msvc10/plgsoundmngr.vcxproj
===================================================================
--- soc/2011/combat/mk/msvc10/plgsoundmngr.vcxproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc10/plgsoundmngr.vcxproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -287,6 +287,7 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">soundmngr</TargetName>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|x64'">true</IgnoreImportLibrary>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugWithDlls|Win32'">c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='DebugPSReleaseCSCELWithDlls|Win32'">c:\development\PlaneShift\out\debug10\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithStaticLibs|Win32'">
<ClCompile>
@@ -849,7 +850,7 @@
<DelayLoadDLLs>;%(DelayLoadDLLs)</DelayLoadDLLs>
<ImportLibrary>..\..\out\debug10\build\plgsoundmngr\Win32\plgsoundmngr.lib</ImportLibrary>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>delayimp.lib;libcrystalspace.lib;ws2_32.lib;zlib.lib;libpsutil_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\CS\out\release10\libs;..\..\..\CS\winlibs\x86\lib;..\..\..\CS\win32libs\lib;$(CRYSTAL)\out\release10\libs;$(CRYSTAL)\winlibs\x86\lib;$(CRYSTAL)\win32libs\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TargetMachine>MachineX86</TargetMachine>
Modified: soc/2011/combat/mk/msvc8/libbulkobjects.vcproj
===================================================================
--- soc/2011/combat/mk/msvc8/libbulkobjects.vcproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc8/libbulkobjects.vcproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1744,18 +1744,9 @@
RelativePath="..\..\src\server\bulkobjects\psattack.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psAttackDefault.cpp">
- </File>
- <File
- RelativePath="..\..\src\server\bulkobjects\psattackmelee.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psattackqueue.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psattackrange.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\pscharacter.cpp">
</File>
<File
@@ -1768,9 +1759,6 @@
RelativePath="..\..\src\server\bulkobjects\pscharinventory.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\pscharquestmgr.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psglyph.cpp">
</File>
<File
@@ -1850,18 +1838,9 @@
RelativePath="..\..\src\server\bulkobjects\psattack.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psAttackDefault.h">
- </File>
- <File
- RelativePath="..\..\src\server\bulkobjects\psattackmelee.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psattackqueue.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psattackrange.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\pscharacter.h">
</File>
<File
@@ -1874,9 +1853,6 @@
RelativePath="..\..\src\server\bulkobjects\pscharinventory.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\pscharquestmgr.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psglyph.h">
</File>
<File
Modified: soc/2011/combat/mk/msvc8/libgui.vcproj
===================================================================
--- soc/2011/combat/mk/msvc8/libgui.vcproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc8/libgui.vcproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1729,9 +1729,6 @@
Name="Source Files"
Filter="">
<File
- RelativePath="..\..\src\client\gui\attacklist.cpp">
- </File>
- <File
RelativePath="..\..\src\client\gui\bartender.cpp">
</File>
<File
@@ -1828,9 +1825,6 @@
RelativePath="..\..\src\client\gui\pawsconfigsound.cpp">
</File>
<File
- RelativePath="..\..\src\client\gui\pawsconfigspellchecker.cpp">
- </File>
- <File
RelativePath="..\..\src\client\gui\pawsconfigtooltips.cpp">
</File>
<File
@@ -1982,9 +1976,6 @@
Name="Header Files"
Filter="">
<File
- RelativePath="..\..\src\client\gui\attacklist.h">
- </File>
- <File
RelativePath="..\..\src\client\gui\bartender.h">
</File>
<File
@@ -2081,9 +2072,6 @@
RelativePath="..\..\src\client\gui\pawsconfigsound.h">
</File>
<File
- RelativePath="..\..\src\client\gui\pawsconfigspellchecker.h">
- </File>
- <File
RelativePath="..\..\src\client\gui\pawsconfigtooltips.h">
</File>
<File
Modified: soc/2011/combat/mk/msvc9/libbulkobjects.vcproj
===================================================================
--- soc/2011/combat/mk/msvc9/libbulkobjects.vcproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc9/libbulkobjects.vcproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1744,18 +1744,9 @@
RelativePath="..\..\src\server\bulkobjects\psattack.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psAttackDefault.cpp">
- </File>
- <File
- RelativePath="..\..\src\server\bulkobjects\psattackmelee.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psattackqueue.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psattackrange.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\pscharacter.cpp">
</File>
<File
@@ -1768,9 +1759,6 @@
RelativePath="..\..\src\server\bulkobjects\pscharinventory.cpp">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\pscharquestmgr.cpp">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psglyph.cpp">
</File>
<File
@@ -1850,18 +1838,9 @@
RelativePath="..\..\src\server\bulkobjects\psattack.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psAttackDefault.h">
- </File>
- <File
- RelativePath="..\..\src\server\bulkobjects\psattackmelee.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psattackqueue.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\psattackrange.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\pscharacter.h">
</File>
<File
@@ -1874,9 +1853,6 @@
RelativePath="..\..\src\server\bulkobjects\pscharinventory.h">
</File>
<File
- RelativePath="..\..\src\server\bulkobjects\pscharquestmgr.h">
- </File>
- <File
RelativePath="..\..\src\server\bulkobjects\psglyph.h">
</File>
<File
Modified: soc/2011/combat/mk/msvc9/libgui.vcproj
===================================================================
--- soc/2011/combat/mk/msvc9/libgui.vcproj 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/mk/msvc9/libgui.vcproj 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1729,9 +1729,6 @@
Name="Source Files"
Filter="">
<File
- RelativePath="..\..\src\client\gui\attacklist.cpp">
- </File>
- <File
RelativePath="..\..\src\client\gui\bartender.cpp">
</File>
<File
@@ -1828,9 +1825,6 @@
RelativePath="..\..\src\client\gui\pawsconfigsound.cpp">
</File>
<File
- RelativePath="..\..\src\client\gui\pawsconfigspellchecker.cpp">
- </File>
- <File
RelativePath="..\..\src\client\gui\pawsconfigtooltips.cpp">
</File>
<File
@@ -1982,9 +1976,6 @@
Name="Header Files"
Filter="">
<File
- RelativePath="..\..\src\client\gui\attacklist.h">
- </File>
- <File
RelativePath="..\..\src\client\gui\bartender.h">
</File>
<File
@@ -2081,9 +2072,6 @@
RelativePath="..\..\src\client\gui\pawsconfigsound.h">
</File>
<File
- RelativePath="..\..\src\client\gui\pawsconfigspellchecker.h">
- </File>
- <File
RelativePath="..\..\src\client\gui\pawsconfigtooltips.h">
</File>
<File
Modified: soc/2011/combat/src/client/Jamfile
===================================================================
--- soc/2011/combat/src/client/Jamfile 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/src/client/Jamfile 2011-08-15 20:15:32 UTC (rev 7609)
@@ -8,10 +8,17 @@
case * : # Posix, Unix, GNU/Linux, etc.
}
+if $(HUNSPELL.AVAILABLE) = "yes"
+{
+HUNSPELLDEF = HUNSPELL ;
+}
+
+
ApplicationIcon win32 : psclient : [ ConcatDirs $(TOP) support icons icon1.ico ] ;
ApplicationIcon macosx : psclient : [ ConcatDirs $(TOP) support icons icon1.icns ] ;
Application psclient : [ Wildcard *.cpp *.h ] ;
-ExternalLibs psclient : CRYSTAL CAL3D BREAKPAD ;
+CFlags psclient : [ FDefines $(HUNSPELLDEF) ] ;
+ExternalLibs psclient : CRYSTAL CAL3D BREAKPAD $(HUNSPELLDEF) ;
CompileGroups psclient : client ;
COMMONLIBS = gui psnet psengine psrpgrules psutil paws effects fparser ;
LinkWith psclient : gui psnet psengine psrpgrules psutil paws effects fparser ;
@@ -30,7 +37,7 @@
ApplicationIcon win32 : psclient_static : [ ConcatDirs $(TOP) support icons icon1.ico ] ;
ApplicationIcon macosx : psclient_static : [ ConcatDirs $(TOP) support icons icon1.icns ] ;
Application psclient_static : [ Wildcard *.cpp *.h ] $(extrafiles) : independent noinstall nohelp ;
-CFlags psclient_static : [ FDefines CS_STATIC_LINKED ] ;
+CFlags psclient_static : [ FDefines CS_STATIC_LINKED $(HUNSPELLDEF) ] ;
LFlags psclient_static : -lcrystalspace_staticplugins-$(CRYSTAL.VERSION) ;
MsvcDefine psclient_static : CS_STATIC_LINKED ;
LinkWith psclient_static : planeshift_staticplugins $(COMMONLIBS) ;
@@ -135,7 +142,7 @@
dummysndmngr
;
-ExternalLibs psclient_static : CRYSTAL CAL3D BREAKPAD ;
+ExternalLibs psclient_static : CRYSTAL CAL3D BREAKPAD $(HUNSPELLDEF) ;
CompileGroups psclient_static : client_static ;
SubVariant ;
Modified: soc/2011/combat/src/client/cmdusers.cpp
===================================================================
--- soc/2011/combat/src/client/cmdusers.cpp 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/src/client/cmdusers.cpp 2011-08-15 20:15:32 UTC (rev 7609)
@@ -135,6 +135,7 @@
cmdsource->Subscribe("/yield", this);
cmdsource->Subscribe("/takeall", this); // Take all items from a container
cmdsource->Subscribe("/takestackall", this); // Take all items from a container and stack not precisely
+ cmdsource->Subscribe("/attacklist", this); //temp
}
psUserCommands::~psUserCommands()
@@ -209,6 +210,7 @@
cmdsource->Unsubscribe("/yield", this);
cmdsource->Unsubscribe("/takeall", this);
cmdsource->Unsubscribe("/takestackall", this);
+ cmdsource->Unsubscribe("/attacklist", this); //temp
// Unsubscribe emotes.
Modified: soc/2011/combat/src/client/cmdutil.cpp
===================================================================
--- soc/2011/combat/src/client/cmdutil.cpp 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/src/client/cmdutil.cpp 2011-08-15 20:15:32 UTC (rev 7609)
@@ -38,7 +38,6 @@
#include "net/clientmsghandler.h"
#include "util/strutil.h"
-#include "util/pscssetup.h"
#include "gui/psmainwidget.h"
#include "gui/chatwindow.h"
@@ -74,7 +73,6 @@
cmdsource->Subscribe("/repaintlabels",this);
//cmdsource->Subscribe("/dumpmovements",this);
cmdsource->Subscribe("/testanim",this);
- cmdsource->Subscribe("/version", this);
}
psUtilityCommands::~psUtilityCommands()
@@ -90,7 +88,6 @@
cmdsource->Unsubscribe("/repaintlabels",this);
//cmdsource->Unsubscribe("/dumpmovements",this);
cmdsource->Unsubscribe("/testanim",this);
- cmdsource->Unsubscribe("/version", this);
}
const char *psUtilityCommands::HandleCommand(const char *cmd)
@@ -207,10 +204,7 @@
}
return "try /reload sound";
}
- else if (words[0] == "/version" )
- {
- return APPNAME;
- }
+
return "Unimplemented command received by psUtilityCommands.";
}
Modified: soc/2011/combat/src/client/gui/Jamfile
===================================================================
--- soc/2011/combat/src/client/gui/Jamfile 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/src/client/gui/Jamfile 2011-08-15 20:15:32 UTC (rev 7609)
@@ -1,8 +1,15 @@
SubDir TOP src client gui ;
+if $(HUNSPELL.AVAILABLE) = "yes"
+{
+HUNSPELLDEF = HUNSPELL ;
+}
+
Library gui
: [ Wildcard *.cpp *.h ]
: noinstall
;
-ExternalLibs gui : CRYSTAL ;
+CFlags gui : [ FDefines $(HUNSPELLDEF) ] ;
+
+ExternalLibs gui : CRYSTAL $(HUNSPELLDEF) ;
Modified: soc/2011/combat/src/client/gui/chatwindow.cpp
===================================================================
--- soc/2011/combat/src/client/gui/chatwindow.cpp 2011-08-15 11:03:37 UTC (rev 7608)
+++ soc/2011/combat/src/client/gui/chatwindow.cpp 2011-08-15 20:15:32 UTC (rev 7609)
@@ -39,7 +39,6 @@
#include <iutil/databuff.h>
#include <iutil/virtclk.h>
#include <iutil/stringarray.h>
-#include <iutil/plugin.h>
//=============================================================================
// Project Includes
@@ -51,7 +50,6 @@
#include "paws/pawsbutton.h"
#include "paws/pawsborder.h"
#include "paws/pawstabwindow.h"
-#include "paws/pawsmainwidget.h"
#include "gui/pawscontrolwindow.h"
@@ -113,7 +111,7 @@
replyCount = 0;
- chatHistory = new pawsChatHistory();
+ chatHistory = new pawsChatHistory();
awayText.Clear();
settings.meFilters = 0;
@@ -155,7 +153,6 @@
//set the autocompletion arraylist
autoCompleteLists.Push(&autoCompleteNames);
autoCompleteLists.Push(&settings.comple...
[truncated message content] |