[TOUS] Résolution d'une série de bugs.

Dahevos · May 8, 2012 · d9c7048 · d9c7048
1 parent 7e4d0f1
commit d9c7048
Show file tree

Hide file tree

Showing 15 changed files with 643 additions and 549 deletions.
diff --git a/Client/Client.vbw b/Client/Client.vbw
@@ -1,10 +1,10 @@
 modText = 54, 87, 626, 573, 
 modTypes = 299, 133, 871, 614, 
 frmMainMenu = 44, 151, 616, 637, , 99, 67, 782, 553, C
-modClientTCP = 86, 108, 1012, 724, Z
+modClientTCP = 86, 108, 1012, 720, Z
 frmNewChar = 35, 103, 607, 589, , 105, 186, 677, 672, C
 modDirectX = 10, 36, 943, 505, 
-modDatabase = 22, 29, 804, 645, 
+modDatabase = 22, 29, 804, 641, 
 modSound = 72, 173, 593, 641, 
 frmTrade = -16, 325, 996, 830, , 7, 150, 579, 636, C
 frmadmin = 76, 191, 648, 677, , 110, 145, 682, 631, C
@@ -18,13 +18,13 @@ frmMapReport = 198, 225, 719, 693, C, 44, 58, 616, 544, C
 frmPlayerHelp = 176, 200, 697, 668, , 62, 222, 634, 708, C
 frmServerChooser = 30, 179, 1029, 602, , 176, 208, 719, 692, C
 frmbank = 63, 144, 635, 630, , 61, 135, 633, 621, C
-frmMirage = 129, 165, 970, 653, , 64, 45, 977, 661, C
+frmMirage = 129, 165, 970, 653, , 64, 45, 977, 657, C
 modGameLogic = 17, 30, 759, 624, 
 frmCarte = 66, 75, 587, 543, , 276, 168, 848, 654, C
-transparence = 153, 148, 1193, 616, 
+transparence = 153, 148, 1189, 616, 
 fullscreen = 509, 211, 1025, 682, 
 ModPNG = 132, 150, 653, 618, 
 frmsplash = 78, 202, 599, 670, , 140, 169, 712, 655, C
 frmFixItem = 10, 73, 558, 557, , 118, 98, 666, 582, C
-frmcraft = 0, 0, 787, 616, , 148, 146, 935, 762, C
+frmcraft = 0, 0, 787, 612, , 148, 146, 935, 758, C
 modXp = 52, 52, 634, 378, 
diff --git a/Client/Forms Sources/frmMirage.frm b/Client/Forms Sources/frmMirage.frm
@@ -1993,7 +1993,7 @@ Begin VB.Form frmMirage
             BorderStyle     =   0  'None
             ForeColor       =   &H80000008&
             Height          =   2535
-            Left            =   480
+            Left            =   120
             ScaleHeight     =   169
             ScaleMode       =   3  'Pixel
             ScaleWidth      =   161

diff --git a/Client/Modules Sources/modTypes.bas b/Client/Modules Sources/modTypes.bas
@@ -185,7 +185,7 @@ Public Const NPC_BEHAVIOR_GUARD As Byte = 4
 Public Const NPC_BEHAVIOR_QUETEUR As Byte = 5
 
 ' Speach bubble constants
-Public DISPLAY_BUBBLE_TIME ' In milliseconds.
+Public DISPLAY_BUBBLE_TIME As Long ' In milliseconds.
 Public DISPLAY_BUBBLE_WIDTH As Byte
 Public Const MAX_BUBBLE_WIDTH As Byte = 16 ' In tiles. Includes corners.
 Public Const MAX_LINE_LENGTH As Byte = 20 ' In characters.

diff --git a/Editeur/Editeur.vbw b/Editeur/Editeur.vbw
@@ -37,12 +37,12 @@ frmEmoticonEditor = 26, 26, 608, 352, , 52, 52, 634, 378, C
 frmEditArrows = 52, 52, 634, 378, , 78, 78, 660, 404, C
 frmPlayerHelp = 78, 78, 660, 404, , 104, 104, 686, 430, C
 frmbank = 130, 130, 738, 395, , 156, 156, 738, 482, C
-frmMirage = 130, 130, 712, 456, Z, 0, 0, 582, 326, C
+frmMirage = 130, 130, 712, 456, , 0, 0, 582, 326, C
 modGameLogic = 52, 52, 634, 378, 
 frmoptions = 130, 130, 712, 456, , 26, 26, 608, 352, C
 frmenvoier = 156, 156, 738, 482, , 52, 52, 634, 378, C
 modloadPNG = 156, 156, 738, 482, 
-frmclasseseditor = 0, 0, 582, 326, , 78, 78, 660, 404, C
+frmclasseseditor = 0, 0, 582, 326, Z, 78, 78, 660, 404, C
 frmportecode = 26, 26, 608, 352, , 104, 104, 686, 430, C
 frmcoffre = 52, 52, 634, 378, , 130, 130, 712, 456, C
 frmBniv = 78, 78, 660, 404, , 156, 156, 738, 482, C

diff --git a/Editeur/Forms Sources/frmEmoticonEditor.frm b/Editeur/Forms Sources/frmEmoticonEditor.frm
@@ -1,5 +1,5 @@
 VERSION 5.00
-Object = "{BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0"; "TABCTL32.OCX"
+Object = "{BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0"; "TABCTL3N.OCX"
 Begin VB.Form frmEmoticonEditor 
    BorderStyle     =   1  'Fixed Single
    Caption         =   "Éditer un Emoticone"