pepsi cola

napoj gazowany o smaku cola
stonedDiscord · Aug 21, 2017 · fbb835d · fbb835d
1 parent cbc79c6
commit fbb835d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/main.pb b/main.pb
@@ -1271,13 +1271,25 @@ Procedure HandleAOCommand(ClientID)
             nmes\emote=StringField(rawreceive$,3,"#")
             nmes\message=StringField(rawreceive$,4,"#")
             nmes\showname=StringField(rawreceive$,5,"#")
+            nmes\color=Val(StringField(rawreceive$,6,"#"))
+            ;7 is charid
             nmes\background=StringField(rawreceive$,8,"#")
-            nmes\color=Val(StringField(rawreceive$,10,"#"))
+            Select Val(StringField(rawreceive$,9,"#"))
+                Case 1
+                  nmes\position="def"
+                Case 2
+                  nmes\position="pro"
+                Default
+                  nmes\position="wit"
+              EndSelect
+              nmes\flip=Val(StringField(rawreceive$,10,"#"))
+              nmes\sfx=StringField(rawreceive$,11,"#")
           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\showname="char"
             nmes\emote=StringField(rawreceive$,5,"#")
             nmes\message=StringField(rawreceive$,6,"#")
             If *usagePointer\pos=""
@@ -1293,9 +1305,11 @@ Procedure HandleAOCommand(ClientID)
             nmes\flip=Val(StringField(rawreceive$,14,"#"))
             nmes\realization=Val(StringField(rawreceive$,15,"#"))
             nmes\color=Val(StringField(rawreceive$,16,"#"))
+            nmes\background="[Default]"
         EndSelect
         If ReplayMode=0 Or *usagePointer\perm=#SERVER
           SendChatMessage(nmes,*usagePointer)
+          WriteReplay(rawreceive$)
         Else
           Select Trim(nmes\message)
             Case "<"
@@ -2398,7 +2412,7 @@ Procedure HandleAOCommand(ClientID)
         WriteLog("freed char",*usagePointer)
 
       Case "ARC"
-        SwitchChannels(*usagePointer,StringField(rawreceive$,2,"#"),StringField(rawreceive$,3,"#"))
+        SwitchChannels(*usagePointer,Str(Val(StringField(rawreceive$,2,"#"))-1),StringField(rawreceive$,3,"#"))
 
       Case "CA"
         If *usagePointer\perm
@@ -2823,7 +2837,7 @@ CompilerEndIf
 
 End
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-; CursorPosition = 861
-; FirstLine = 859
-; Folding = ---
+; CursorPosition = 1285
+; FirstLine = 1269
+; Folding = ------
 ; EnableXP
diff --git a/server_shared.pb b/server_shared.pb
@@ -493,6 +493,8 @@ Procedure SendChatMessage(*ntmes.ChatMessage,*seUser.Client)
         vpos=1;left
       Case "pro"
         vpos=2;right
+      Case "wit"
+        vpos=3
     EndSelect
     If CharLimit
       oldCID = *seUser\CID % 100
@@ -514,7 +516,7 @@ Procedure SendChatMessage(*ntmes.ChatMessage,*seUser.Client)
               Websocket_SendTextFrame(Clients()\ClientID,message$)
             CompilerEndIf
           Case #VNO
-            message$="MS#"+*ntmes\char+"#"+*ntmes\emote+"#"+*ntmes\message+"#"+*ntmes\showname+"#"+*ntmes\emotemod+"#"+Str(*seUser\CID)+"#"+*ntmes\background+"#"+Str(vpos)+"#"+Str(*ntmes\color)+"##%"
+            message$="MS#"+*ntmes\char+"#"+*ntmes\emote+"#"+*ntmes\message+"#"+*ntmes\showname+"#"+*ntmes\color+"#"+Str(*seUser\CID+1)+"#"+*ntmes\background+"#"+Str(vpos)+"#"+Str(*ntmes\flip)+"#"+*ntmes\sfx+"#%"
             sresult=SendString(Clients()\ClientID,message$)
             If sresult=-1
               WriteLog("CLIENT DIED",Clients())
@@ -578,7 +580,7 @@ Procedure TrackWait(a)
   Until LoopMusic=0
 EndProcedure
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-; CursorPosition = 571
-; FirstLine = 527
-; Folding = ----
+; CursorPosition = 519
+; FirstLine = 502
+; Folding = ------
 ; EnableXP