deskmod

# Conflicts: # main.pb # server_shared.pb
stonedDiscord · Apr 1, 2017 · 98a6193 · 98a6193
2 parents 9a36b45 + b05186c
commit 98a6193
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/main.pb b/main.pb
@@ -668,7 +668,7 @@ ProcedureDLL MasterAdvert(Port)
   If public
     Repeat
 
-      If msID
+      If msID!=0
 
         If tick>10
           sr=SendNetworkString(msID,"PING#%")
@@ -1130,6 +1130,7 @@ Procedure HandleAOCommand(ClientID)
             nmes\color=Val(StringField(rawreceive$,10,"#"))
           Default
             ;MS#chat#<pre-emote>#<char>#<emote>#<mes>#<pos>#<sfx>#<zoom>#<cid>#<animdelay>#<objection-state>#<evi>#<cid>#<bling>#<color>#%%
+            nmes\deskmod=StringField(rawreceive$,2,"#")
             nmes\preemote=StringField(rawreceive$,3,"#")
             nmes\char=StringField(rawreceive$,4,"#")
             nmes\emote=StringField(rawreceive$,5,"#")
@@ -2194,7 +2195,7 @@ Procedure HandleAOCommand(ClientID)
           UnlockMutex(ListMutex)                      
 
           SendTarget(Str(ClientID),"PN#"+Str(players)+"#"+slots$+"#%",Server)
-          SendTarget(Str(ClientID),"FL#yellowtext#customobjections#flipping#fastloading#noencryption#%",Server)
+          SendTarget(Str(ClientID),"FL#yellowtext#customobjections#flipping#fastloading#noencryption#deskmod#%",Server)
         EndIf
         rf=1
 
@@ -2642,9 +2643,15 @@ CompilerEndIf
 
 End
 ; IDE Options = PureBasic 5.31 (Windows - x86)
+<<<<<<< HEAD
 ; CursorPosition = 2219
 ; FirstLine = 2087
 ; Folding = ---
+=======
+; CursorPosition = 2197
+; FirstLine = 2194
+; Folding = -----
+>>>>>>> origin/master
 ; EnableXP
 ; EnableCompileCount = 0
 ; EnableBuildCount = 0
diff --git a/server_shared.pb b/server_shared.pb
@@ -522,7 +522,7 @@ Procedure SendChatMessage(*ntmes.ChatMessage,*seUser.Client)
             EndIf
           Case #AOTWO
             ;MS#chat#<pre-emote>#<char>#<emote>#<mes>#<pos>#<sfx>#<zoom>#<cid>#<animdelay>#<objection-state>#<evi>#<cid>#<bling>#<color>#%%
-            message$="MS#chat#"+*ntmes\preemote+"#"+*ntmes\char+"#"+*ntmes\emote+"#"+*ntmes\message+"#"+*ntmes\position+"#"+*ntmes\sfx+"#"
+            message$="MS#"+*ntmes\deskmod+"#"+*ntmes\preemote+"#"+*ntmes\char+"#"+*ntmes\emote+"#"+*ntmes\message+"#"+*ntmes\position+"#"+*ntmes\sfx+"#"
             message$=message$+Str(*ntmes\emotemod)+"#"+Str(*seUser\CID)+"#"+Str(*ntmes\animdelay)+"#"+Str(*ntmes\objmod)+"#"+Str(*ntmes\evidence)+"#"+Str(*ntmes\flip)+"#"+Str(*ntmes\realization)+"#"+Str(*ntmes\color)+"#%%"
 
             sresult=SendString(Clients()\ClientID,message$)
@@ -578,7 +578,13 @@ Procedure TrackWait(a)
   Until LoopMusic=0
 EndProcedure
 ; IDE Options = PureBasic 5.31 (Windows - x86)
+<<<<<<< HEAD
 ; CursorPosition = 578
 ; FirstLine = 530
 ; Folding = ----
+=======
+; CursorPosition = 530
+; FirstLine = 511
+; Folding = ------
+>>>>>>> origin/master
 ; EnableXP
diff --git a/shared_headers.pb b/shared_headers.pb
@@ -123,6 +123,7 @@ Structure Client
 EndStructure
 
 Structure ChatMessage
+  deskmod.s
   message.s
   char.s
   emote.s
@@ -178,6 +179,6 @@ Enumeration
   #MOVE
 EndEnumeration
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-; CursorPosition = 47
-; FirstLine = 21
+; CursorPosition = 125
+; FirstLine = 111
 ; EnableXP