Skip to content

Commit

Permalink
[11066] Remove tail whitespaces.
Browse files Browse the repository at this point in the history
Signed-off-by: VladimirMangos <[email protected]>
  • Loading branch information
Skirnir authored and VladimirMangos committed Jan 24, 2011
1 parent d172057 commit 378b3d6
Show file tree
Hide file tree
Showing 58 changed files with 170 additions and 170 deletions.
6 changes: 3 additions & 3 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ MaNGOS 0.16 (2 July 2010)

==== Server Features ====

* Added: Implemented SOAP in MaNGOS
* Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking.
* Added: Implemented SOAP in MaNGOS
* Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking.
* Added: New table character_stats for external tools.
* Added: More user friendly output at DB version check fail.
* Improved: Update used utf8 cpp library version up to 2.2.4
* Improved: Character `data` field values finally replaced by normal table fields.
* Improved: Increase reserved stack size for mangosd up to 4Mb at Windows
* Improved: Increase reserved stack size for mangosd up to 4Mb at Windows
* Improved: Rewritten realmd and mangosd RA code use ACE network classes and drop Sockets lib.
* Improved: OpenSSL lib upgrade to OpenSSL 1.0.0.
* Improved: Use ACE config library instead dropped dotconfpp.
Expand Down
4 changes: 2 additions & 2 deletions contrib/dbcEditer/SearchFrm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ __fastcall TFrmSearch::TFrmSearch(TComponent* Owner)
//---------------------------------------------------------------------------
void __fastcall TFrmSearch::btOkClick(TObject *Sender)
{
ModalResult = mrOk;
ModalResult = mrOk;
}
//---------------------------------------------------------------------------
void __fastcall TFrmSearch::btCancelClick(TObject *Sender)
{
ModalResult = mrCancel;
ModalResult = mrCancel;
}
//---------------------------------------------------------------------------
22 changes: 11 additions & 11 deletions contrib/dbcEditer/bin/update.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
1.4�����
1.�����˳�ʱ��ʱ�˲�����bug
2.����ɲ��ҵĹ���
3.�������л����ͺ�����ˢ��
4.������Ե�ǰ��Ԫ��д����ļ��Ĺ���
5.����ÿһ�еĿ��ȿɵ���
6.����֧���ı���ʾ���������޸ģ��ı��޸ĺ󲻻����
1.41��
1.���Թ̶���ȡ����һ�У��Է���鿴Spell ID
2.�����д棬�д棬���壬���壬���ü�����
1.4�����
1.�����˳�ʱ��ʱ�˲�����bug
2.����ɲ��ҵĹ���
3.�������л����ͺ�����ˢ��
4.������Ե�ǰ��Ԫ��д����ļ��Ĺ���
5.����ÿһ�еĿ��ȿɵ���
6.����֧���ı���ʾ���������޸ģ��ı��޸ĺ󲻻����

1.41��
1.���Թ̶���ȡ����һ�У��Է���鿴Spell ID
2.�����д棬�д棬���壬���壬���ü�����
6 changes: 3 additions & 3 deletions contrib/dbcEditer/dbcedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
char szFileName[255];
FILE *stream;




fnsplit(pszFileName, 0, 0, szFileName, 0);
Expand Down Expand Up @@ -132,7 +132,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
}
FileClose(iFileHandle);
fclose(stream);

delete ini;
ShowMessage("Save To File:"+NewFileName);
}
Expand Down Expand Up @@ -445,7 +445,7 @@ void __fastcall TFrmMain::Timer1Timer(TObject *Sender)
void __fastcall TFrmMain::N4Click(TObject *Sender)
{
if(!thOpen) return;

int iFileHandle; //文件句柄
char buf[4];
int iVal;
Expand Down
4 changes: 2 additions & 2 deletions contrib/dbcEditer/dbcedit.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ class TFrmMain : public TForm


thOpenFile *thOpen;
bool Term;
bool Term;

public: // User declarations
bool OpenOk;

AnsiString CurrentOpenFile;
__fastcall TFrmMain(TComponent* Owner);
void SaveToFile(const char * pszFileName);
Expand Down
6 changes: 3 additions & 3 deletions contrib/dbcEditer/thOpenSource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
__fastcall thOpenFile::thOpenFile(bool CreateSuspended)
: TThread(CreateSuspended)
{

}
//---------------------------------------------------------------------------
void __fastcall thOpenFile::Execute()
Expand Down Expand Up @@ -57,7 +57,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
char szNewFileName[MAX_PATH];
DWORD w;
TIniFile *ini;


TypePtr p(pBuff);
if('WDBC' != TAG(*p.dw))
Expand Down Expand Up @@ -95,7 +95,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
delete ini;

//int *ColType = new int[dwCols];

DWORD dwTextStartPos = dwRows*dwRowLen+20;
char* pTextPtr = pBuff + dwTextStartPos;
char pszTemp[MAX_PATH];
Expand Down
4 changes: 2 additions & 2 deletions contrib/dbcEditer/thOpenSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#include <Classes.hpp>
//---------------------------------------------------------------------------
class thOpenFile : public TThread
{
{
private:
protected:
void __fastcall Execute();
void __fastcall RunOpen();
public:
bool thEnd;
int ColType[10000];

__fastcall thOpenFile(bool CreateSuspended);
void LoadAndModify(const char * pszFileName);
void ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* pszFileName);
Expand Down
70 changes: 35 additions & 35 deletions contrib/dbcformat/dbc.desc
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,25 @@ ENDENTRY

ENTRY SpellEntry

INDEX Id
INDEX Id
UINT School
UNKNOWN [2]
UINT Category
UNKNOWN
UINT Attributes
UINT AttributesEx
UNKNOWN [3]
UINT Targets
UINT TargetCreatureType
UINT RequiresSpellFocus
UINT Targets
UINT TargetCreatureType
UINT RequiresSpellFocus
UNKNOWN
UINT CasterAuraState
UINT CastingTimeIndex
UINT CasterAuraState
UINT CastingTimeIndex
UINT RecoveryTime
UINT CategoryRecoveryTime
UINT InterruptFlags
UINT AuraInterruptFlags
UINT ChannelInterruptFlags
UINT ChannelInterruptFlags
UINT procFlags
UINT procChance
UINT procCharges
Expand All @@ -71,41 +71,41 @@ ENTRY SpellEntry
UINT DurationIndex
UINT powerType
UINT manaCost
UINT manaCostPerlevel
UINT manaCostPerlevel
UINT manaPerSecond
UINT manaPerSecondPerLevel
UINT rangeIndex
FLOAT speed
UINT modalNextSpell
UNKNOWN
UINT Totem[2]
UINT Reagent[8]
UINT ReagentCount[8]
UINT EquippedItemClass
UINT EquippedItemSubClass
UINT Effect[3] // 59 - 61
UINT EffectDieSides[3]
UINT EffectBaseDice[3]
FLOAT EffectDicePerLevel[3]
FLOAT EffectRealPointsPerLevel[3]
UNKNOWN
UINT Totem[2]
UINT Reagent[8]
UINT ReagentCount[8]
UINT EquippedItemClass
UINT EquippedItemSubClass
UINT Effect[3] // 59 - 61
UINT EffectDieSides[3]
UINT EffectBaseDice[3]
FLOAT EffectDicePerLevel[3]
FLOAT EffectRealPointsPerLevel[3]
INT EffectBasePoints[3] // 74 - 76
UNKNOWN [3]
UINT EffectImplicitTargetA[3] // 80 - 82
UINT EffectImplicitTargetB[3] // 83 - 85
UINT EffectRadiusIndex[3]
UINT EffectApplyAuraName[3] // 89 - 91
UINT EffectAmplitude[3]
UINT Effectunknown[3]
UINT EffectChainTarget[3]
UINT EffectItemType[3]
UINT EffectMiscValue[3] // 104 - 106
UINT EffectTriggerSpell[3]
FLOAT EffectPointsPerComboPoint[3]
UINT SpellVisual
UNKNOWN
UINT SpellIconID
UINT EffectRadiusIndex[3]
UINT EffectApplyAuraName[3] // 89 - 91
UINT EffectAmplitude[3]
UINT Effectunknown[3]
UINT EffectChainTarget[3]
UINT EffectItemType[3]
UINT EffectMiscValue[3] // 104 - 106
UINT EffectTriggerSpell[3]
FLOAT EffectPointsPerComboPoint[3]
UINT SpellVisual
UNKNOWN
UINT SpellIconID
UINT activeIconID
UINT spellPriority
UINT spellPriority
UNUSED STR Name
UNUSED STR NameAlt1
UNUSED STR NameAlt2
Expand Down Expand Up @@ -198,7 +198,7 @@ ENTRY FactionEntry

UNKNOWN[7]
UINT something1
UINT something2
UINT something2
UINT something3
UINT something4
UINT something5
Expand All @@ -208,7 +208,7 @@ ENTRY FactionEntry
UINT something9
UINT faction

UNUSED STR name
UNUSED STR name
UNKNOWN[17]

ENDENTRY
Expand Down Expand Up @@ -236,6 +236,6 @@ ENTRY ItemDisplayTemplateEntry
UNKNOWN[5]
UINT seed
UNKNOWN [10]
UINT randomPropertyID
UINT randomPropertyID

ENDENTRY
8 changes: 4 additions & 4 deletions contrib/extractor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ project (MANGOS_MAP_EXTRACTOR)
add_subdirectory (libmpq)
add_subdirectory (loadlib)

include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)

link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)

add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)

Expand Down
4 changes: 2 additions & 2 deletions contrib/extractor/libmpq/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ int libmpq_decrypt_blocktable(mpq_archive *mpq_a, unsigned char *pbKey) {
ch = toupper(*pbKey++);
seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
}
}

/* Decrypt it */
seed2 = 0xEEEEEEEE;
Expand Down Expand Up @@ -704,7 +704,7 @@ int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int file
unsigned int loaded = mpq_a->blocksize;

/* Check if data are loaded in the cache */
if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {

/* Load one MPQ block into archive buffer */
loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize);
Expand Down
2 changes: 1 addition & 1 deletion contrib/extractor/libmpq/explode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static unsigned short pkzip_code_asc[] = {
0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
};

/* Local variables */
Expand Down
2 changes: 1 addition & 1 deletion contrib/extractor/libmpq/huffman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static void libmpq_huff_build_tree(struct huffman_tree *ht, unsigned int cmp_typ
/* Loop while pointer has a negative value. */
while (PTR_INT(ht->last) > 0) { /* ESI - Last entry */
struct huffman_tree_item *temp; /* EAX */

if (ht->last->next != NULL) { /* ESI->next */
libmpq_huff_remove_item(ht->last);
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/extractor/libmpq/mpq.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, un

if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
// Free buffer for block positions

free(mpq_f->blockpos);
}
/* freeing the file structure */
Expand Down
4 changes: 2 additions & 2 deletions contrib/extractor/libmpq/wave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
static unsigned long wave_table_1503f120[] = {
0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
};

static unsigned long wave_table_1503f1a0[] = {
Expand Down
2 changes: 1 addition & 1 deletion contrib/extractor/libmpq/wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* 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 _WAVE_H
#define _WAVE_H
Expand Down
Loading

0 comments on commit 378b3d6

Please sign in to comment.