systax errors and GUI fix

stonedDiscord · Apr 1, 2017 · dbe32a2 · dbe32a2
1 parent 98a6193
commit dbe32a2
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 45 deletions.
diff --git a/AOprivateServer.pbp b/AOprivateServer.pbp
@@ -7,28 +7,28 @@
   <section name="data">
     <explorer view="" pattern="8"/>
     <log show="1"/>
-    <lastopen date="2017-02-07 18:01" user="Sven" host="SPC"/>
+    <lastopen date="2017-04-01 18:30" user="Sven" host="SPC"/>
   </section>
   <section name="files">
     <file name="Common.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="b79d97149705f3c5b882718e146533d1"/>
+      <fingerprint md5="002dd300145d152be964badbd167bf54"/>
     </file>
     <file name="gui.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
       <fingerprint md5="00a1fec2370fe0dab6aa4bcfac2410ab"/>
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="9a30e6412343653f196209041bcc6d80"/>
+      <fingerprint md5="7a0203ba5d1600ff2859fc8df50ebf3e"/>
     </file>
     <file name="server_shared.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="91f4c39125ccd122a835887b731774fe"/>
+      <fingerprint md5="439986b522e598dd663b73a4da1a26e9"/>
     </file>
     <file name="shared_headers.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="09d32caa4e823c57864c18ecc116224b"/>
+      <fingerprint md5="3cb0a916ab5eb82cca683c18d41cb101"/>
     </file>
   </section>
   <section name="targets">
@@ -41,8 +41,8 @@
       <icon enable="1">sD.ico</icon>
       <format exe="default" cpu="2"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1342"/>
-      <buildcount enable="1" value="148"/>
+      <compilecount enable="1" value="1339"/>
+      <buildcount enable="1" value="151"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2.%COMPILECOUNT.%BUILDCOUNT,0"/>
@@ -76,8 +76,8 @@
       <icon enable="0">owner.ico</icon>
       <format exe="console" cpu="0"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1335"/>
-      <buildcount enable="1" value="148"/>
+      <compilecount enable="1" value="1338"/>
+      <buildcount enable="1" value="151"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>

diff --git a/Common.pb b/Common.pb
@@ -60,6 +60,7 @@ Enumeration
   #Text_8
   #Combo_4
   #Checkbox_BlockIni
+  #Checkbox_LoopMusic
   #String_AD
   #Text_AD
   #String_13
@@ -126,18 +127,18 @@ Procedure Open_Window_0()
     ButtonGadget(#Button_31,680,350,50,20,"SEND")
     BalloonTip(GadgetID(#ListIcon_2), #ListIcon_2, "Shows the OOC chat history", "", #TOOLTIP_NO_ICON)
     Frame3DGadget(#Frame_5, 520, 0, 210, 370, "OOC")
-      ListViewGadget(#listbox_event, 290, 20, 230, 350)
-      AddGadgetItem(#listbox_event,0,"serverD "+Str(#PB_Editor_CompileCount)+"."+Str(#PB_Editor_BuildCount))
-      AddGadgetItem(#listbox_event,0,"Check out https://github.com/stonedDiscord/serverD/ for updates")
-      If update
-        AddGadgetItem(#listbox_event,0,"UPDATE AVAILABLE",#PB_ListIcon_AlwaysShowSelection)
-      EndIf
+    ListViewGadget(#listbox_event, 290, 20, 230, 350)
+    AddGadgetItem(#listbox_event,0,"serverD "+Str(#PB_Editor_CompileCount)+"."+Str(#PB_Editor_BuildCount))
+    AddGadgetItem(#listbox_event,0,"Check out https://github.com/stonedDiscord/serverD/ for updates")
+    If update
+      AddGadgetItem(#listbox_event,0,"UPDATE AVAILABLE",#PB_ListIcon_AlwaysShowSelection)
+    EndIf
     BalloonTip(GadgetID(#listbox_event), #listbox_event, "Shows all activity", "", #TOOLTIP_NO_ICON)
   EndIf
 EndProcedure
 
 Procedure Open_Window_1()
-  If OpenWindow(#Window_1, 200, 400, 150, 220, "Config",  #PB_Window_SystemMenu | #PB_Window_TitleBar )
+  If OpenWindow(#Window_1, 200, 400, 150, 250, "Config",  #PB_Window_SystemMenu | #PB_Window_TitleBar )
 
     TextGadget(#Text_6, 10, 10, 40, 20, "OP pass")
     StringGadget(#String_OP, 60, 10, 80, 20, "", #PB_String_Password)
@@ -157,7 +158,8 @@ Procedure Open_Window_1()
     ComboBoxGadget(#Combo_4, 60, 115, 80, 20)
     CheckBoxGadget(#Checkbox_BlockIni,10,145,120,20,"Block INI char swap")
     CheckBoxGadget(#Checkbox_AOA,10,165,120,20,"100 char limit")
-    ButtonGadget(#Button_5, 0, 190, 150, 30, "DONE")
+    CheckBoxGadget(#Checkbox_LoopMusic,10,185,120,20,"Loop music")
+    ButtonGadget(#Button_5, 0, 220, 150, 30, "DONE")
   EndIf
 EndProcedure
 
@@ -174,7 +176,8 @@ Procedure ConfigWindow(var)
   SetGadgetText(#String_AD,adminpass$)
   SetGadgetState(#CheckBox_4,Logging)
   SetGadgetState(#Checkbox_BlockIni,blockini)
-  SetGadgetState(#Checkbox_BlockIni,CharLimit)
+  SetGadgetState(#Checkbox_AOA,CharLimit)
+  SetGadgetState(#Checkbox_LoopMusic,LoopMusic)
   SetGadgetState(#Combo_3,modcol)
   AddGadgetItem(#Combo_4,0,"NONE")
   For loadevi=1 To EviNumber
@@ -211,8 +214,10 @@ Procedure ConfigWindow(var)
         motdevi=GetGadgetState(#Combo_4)
       ElseIf GadgetID = #Checkbox_BlockIni  
         blockini=GetGadgetState(#Checkbox_BlockIni)
-        ElseIf GadgetID = #Checkbox_AOA
+      ElseIf GadgetID = #Checkbox_AOA
         CharLimit=GetGadgetState(#Checkbox_AOA)
+      ElseIf GadgetID = #Checkbox_LoopMusic
+        CharLimit=GetGadgetState(#Checkbox_LoopMusic)
       ElseIf GadgetID = #Button_9
         LogFile$=SaveFileRequester("Choose log file",LogFile$,"Log files (*.log)|*.log",0)
       EndIf
@@ -227,11 +232,13 @@ Procedure ConfigWindow(var)
   WritePreferenceInteger("ModCol",GetGadgetState(#Combo_3))
   WritePreferenceInteger("motdevi",GetGadgetState(#Combo_4))
   WritePreferenceInteger("BlockIni",GetGadgetState(#Checkbox_BlockIni))
+  WritePreferenceInteger("CharLimit",GetGadgetState(#Checkbox_AOA))
+  WritePreferenceInteger("LoopMusic",GetGadgetState(#Checkbox_LoopMusic))
   ClosePreferences()
 EndProcedure 
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-; CursorPosition = 139
-; FirstLine = 139
+; CursorPosition = 160
+; FirstLine = 134
 ; Folding = -
 ; EnableXP
 ; EnableCompileCount = 0

diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 You can find the downloads in the release tab
 
 ### changelog
-* AO2 bugfixes
-* VNO bugfixes
+* General system stability improvements to enhance the user's experience
 
 ### minimal setup (console version)
 > OS

diff --git a/main.pb b/main.pb
@@ -249,7 +249,7 @@ Procedure LoadSettings(reload)
     PrintN("Musicmode:"+Str(musicmode))
     PrintN("Scene:"+scene$)
   CompilerEndIf
-
+  Debug "done loading oldsettings"
 
   If OpenPreferences("poker.ini")=0
     If CreatePreferences("poker.ini")=0
@@ -668,7 +668,7 @@ ProcedureDLL MasterAdvert(Port)
   If public
     Repeat
 
-      If msID!=0
+      If msID<>0
 
         If tick>10
           sr=SendNetworkString(msID,"PING#%")
@@ -2643,15 +2643,7 @@ CompilerEndIf
 
 End
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-<<<<<<< HEAD
-; CursorPosition = 2219
-; FirstLine = 2087
+; CursorPosition = 251
+; FirstLine = 208
 ; Folding = ---
-=======
-; CursorPosition = 2197
-; FirstLine = 2194
-; Folding = -----
->>>>>>> origin/master
-; EnableXP
-; EnableCompileCount = 0
-; EnableBuildCount = 0
+; EnableXP
diff --git a/serverD.exe b/serverD.exe
diff --git a/serverDco.exe b/serverDco.exe
diff --git a/server_shared.pb b/server_shared.pb
@@ -578,13 +578,7 @@ Procedure TrackWait(a)
   Until LoopMusic=0
 EndProcedure
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-<<<<<<< HEAD
 ; CursorPosition = 578
-; FirstLine = 530
+; FirstLine = 526
 ; Folding = ----
-=======
-; CursorPosition = 530
-; FirstLine = 511
-; Folding = ------
->>>>>>> origin/master
 ; EnableXP
diff --git a/serverd.txt b/serverd.txt
@@ -1,4 +1,4 @@
 [Version]
-Compile=1292
-Build=144
+Compile=1337
+Build=150
 0.0.0.0