RELEASE FROM HERE!! - V1

trk305 · Oct 25, 2024 · cb07f9a · cb07f9a
1 parent 86c9124
commit cb07f9a
Show file tree

Hide file tree

Showing 24 changed files with 670 additions and 712 deletions.
diff --git a/Frame(time) b/Frame(time)
diff --git a/UpdateSpeakerStatus(entindex b/UpdateSpeakerStatus(entindex
diff --git a/game/ricochet/ricochet.fgd b/game/ricochet/ricochet.fgd
@@ -39,7 +39,6 @@
 		0 : "Arena"
 		1 : "Deathmatch"
 	]
-
 	rpc_chapter(string) : "RPC Chapter" : : "Chapter name to display in Discord."
     rpc_area(string) : "RPC Area" : : "Area name to display in Discord. Shows map file name if empty."
     rpc_image(string) : "RPC Image" : : "Image to display in Discord."

diff --git a/...9197fb4-ef07-40c3-bea3-aca9417a2750.vsidx → ...245e1f0-c02a-4fea-b5b7-f91f4f62491c.vsidx b/...9197fb4-ef07-40c3-bea3-aca9417a2750.vsidx → ...245e1f0-c02a-4fea-b5b7-f91f4f62491c.vsidx
diff --git a/projects/vs2019/.vs/projects/FileContentIndex/c875325e-a2ca-467e-9b0e-d254e4b37048.vsidx b/projects/vs2019/.vs/projects/FileContentIndex/c875325e-a2ca-467e-9b0e-d254e4b37048.vsidx
diff --git a/...0a41a59-d360-4ea1-bbe4-1324fa0a1a6c.vsidx → ...ecd42f7-7399-4144-a3d5-a1b98cc23f0c.vsidx b/...0a41a59-d360-4ea1-bbe4-1324fa0a1a6c.vsidx → ...ecd42f7-7399-4144-a3d5-a1b98cc23f0c.vsidx
diff --git a/projects/vs2019/.vs/projects/v17/Browse.VC.db b/projects/vs2019/.vs/projects/v17/Browse.VC.db
diff --git a/projects/vs2019/.vs/projects/v17/Browse.VC.db-shm b/projects/vs2019/.vs/projects/v17/Browse.VC.db-shm
diff --git a/projects/vs2019/.vs/projects/v17/Browse.VC.db-wal b/projects/vs2019/.vs/projects/v17/Browse.VC.db-wal
diff --git a/projects/vs2019/.vs/projects/v17/DocumentLayout.backup.json b/projects/vs2019/.vs/projects/v17/DocumentLayout.backup.json
@@ -3,25 +3,22 @@
   "WorkspaceRootPath": "E:\\localization-halflife\\projects\\vs2019\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\client.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\player.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\hud.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\client.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     }
   ],
   "DocumentGroupContainers": [
@@ -36,44 +33,31 @@
             {
               "$type": "Document",
               "DocumentIndex": 0,
-              "Title": "vgui_TeamFortressViewport.cpp",
-              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp*",
-              "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp*",
-              "ViewState": "AgIAAHkEAAAAAAAAAAArwIcEAAAGAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-19T07:36:25.962Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "discord_manager.cpp",
-              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "ViewState": "AgIAACQAAAAAAAAAAAAAACkAAAAoAAAAAAAAAA==",
+              "Title": "multiplay_gamerules.cpp",
+              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "RelativeDocumentMoniker": "..\\..\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "ToolTip": "E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "RelativeToolTip": "..\\..\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "ViewState": "AgIAAMEFAAAAAAAAAAAAAM0FAAA3AAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-18T10:35:47.852Z",
+              "WhenOpened": "2024-10-25T11:46:59.305Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 3,
               "Title": "cdll_int.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\cdll_int.cpp",
               "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp",
               "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\cdll_int.cpp",
-              "ViewState": "AgIAAPwAAAAAAAAAAAAswAYBAAABAAAAAAAAAA==",
+              "ViewState": "AgIAAP8AAAAAAAAAAAAswAYBAAABAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
               "WhenOpened": "2024-10-18T09:01:17.723Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 2,
               "Title": "input.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\input.cpp",
@@ -93,8 +77,7 @@
               "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\hud.cpp",
               "ViewState": "AgIAACMBAAAAAAAAAAAnwDwBAAAyAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-18T06:59:29.345Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-10-18T06:59:29.345Z"
             },
             {
               "$type": "Document",
@@ -110,13 +93,13 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 6,
+              "DocumentIndex": 1,
               "Title": "client.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\dlls\\client.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\dlls\\client.cpp",
               "ToolTip": "E:\\localization-halflife\\ricochet\\dlls\\client.cpp",
               "RelativeToolTip": "..\\..\\ricochet\\dlls\\client.cpp",
-              "ViewState": "AgIAAPUDAAAAAAAAAAAIwP4DAAAkAAAAAAAAAA==",
+              "ViewState": "AgIAAC8BAAAAAAAAAAAAAD0BAAApAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
               "WhenOpened": "2024-09-14T11:07:44.942Z",
               "EditorCaption": ""

diff --git a/projects/vs2019/.vs/projects/v17/DocumentLayout.json b/projects/vs2019/.vs/projects/v17/DocumentLayout.json
@@ -3,25 +3,22 @@
   "WorkspaceRootPath": "E:\\localization-halflife\\projects\\vs2019\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\client.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\player.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EA7DE935-F997-4EA8-9135-E2FE5E5D2C1B}|ricochet_cdll.vcxproj|E:\\localization-halflife\\ricochet\\cl_dll\\hud.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{CE8DCBE4-D8DB-46E5-8607-8FCC5FA667FB}|ricochetdll.vcxproj|E:\\localization-halflife\\ricochet\\dlls\\client.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     }
   ],
   "DocumentGroupContainers": [
@@ -36,44 +33,31 @@
             {
               "$type": "Document",
               "DocumentIndex": 0,
-              "Title": "vgui_TeamFortressViewport.cpp",
-              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\vgui_TeamFortressViewport.cpp",
-              "ViewState": "AgIAAGsEAAAAAAAAAAAkwHcEAAAVAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-19T07:36:25.962Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "discord_manager.cpp",
-              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\discord\\discord_manager.cpp",
-              "ViewState": "AgIAACQAAAAAAAAAAAAAACkAAAAoAAAAAAAAAA==",
+              "Title": "multiplay_gamerules.cpp",
+              "DocumentMoniker": "E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "RelativeDocumentMoniker": "..\\..\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "ToolTip": "E:\\localization-halflife\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "RelativeToolTip": "..\\..\\ricochet\\dlls\\multiplay_gamerules.cpp",
+              "ViewState": "AgIAAMEFAAAAAAAAAAAAAM0FAAA3AAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-18T10:35:47.852Z",
+              "WhenOpened": "2024-10-25T11:46:59.305Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 3,
               "Title": "cdll_int.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\cdll_int.cpp",
               "ToolTip": "E:\\localization-halflife\\ricochet\\cl_dll\\cdll_int.cpp",
               "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\cdll_int.cpp",
-              "ViewState": "AgIAAPwAAAAAAAAAAAAswAYBAAABAAAAAAAAAA==",
+              "ViewState": "AgIAAP8AAAAAAAAAAAAswAYBAAABAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
               "WhenOpened": "2024-10-18T09:01:17.723Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 2,
               "Title": "input.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\cl_dll\\input.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\cl_dll\\input.cpp",
@@ -93,8 +77,7 @@
               "RelativeToolTip": "..\\..\\ricochet\\cl_dll\\hud.cpp",
               "ViewState": "AgIAACMBAAAAAAAAAAAnwDwBAAAyAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
-              "WhenOpened": "2024-10-18T06:59:29.345Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-10-18T06:59:29.345Z"
             },
             {
               "$type": "Document",
@@ -110,13 +93,13 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 6,
+              "DocumentIndex": 1,
               "Title": "client.cpp",
               "DocumentMoniker": "E:\\localization-halflife\\ricochet\\dlls\\client.cpp",
               "RelativeDocumentMoniker": "..\\..\\ricochet\\dlls\\client.cpp",
               "ToolTip": "E:\\localization-halflife\\ricochet\\dlls\\client.cpp",
               "RelativeToolTip": "..\\..\\ricochet\\dlls\\client.cpp",
-              "ViewState": "AgIAAPUDAAAAAAAAAAAIwP4DAAAkAAAAAAAAAA==",
+              "ViewState": "AgIAAC8BAAAAAAAAAAAAAD0BAAApAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
               "WhenOpened": "2024-09-14T11:07:44.942Z",
               "EditorCaption": ""

diff --git a/projects/vs2019/.vs/projects/v17/Solution.VC.db-wal b/projects/vs2019/.vs/projects/v17/Solution.VC.db-wal
diff --git a/projects/vs2019/.vs/projects/v17/fileList.bin b/projects/vs2019/.vs/projects/v17/fileList.bin
diff --git a/projects/vs2019/ricochet_cdll.vcxproj b/projects/vs2019/ricochet_cdll.vcxproj
@@ -202,7 +202,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\cl_dlls
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;CLIENT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>E:\localization-halflife\utils\discord\lib;E:\localization-halflife\lib\public;..\..\ricochet;..\..\ricochet\dlls;E:\localization-halflife\ricochet\cl_dll\discord;..\..\ricochet\cl_dll;..\..\game_shared;..\..\engine;..\..\public;..\..\common;..\..\ricochet\pm_shared;..\..\utils\vgui\include;..\..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>E:\localization-halflife\ricochet\cl_dll;E:\localization-halflife\utils\discord\lib;E:\localization-halflife\lib\public;..\..\ricochet;..\..\ricochet\dlls;E:\localization-halflife\ricochet\cl_dll\discord;..\..\ricochet\cl_dll;..\..\game_shared;..\..\engine;..\..\public;..\..\common;..\..\ricochet\pm_shared;..\..\utils\vgui\include;E:\localization-halflife\external\SDL2;..\..\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>

diff --git a/ricochet/cl_dll/ev_hldm.cpp b/ricochet/cl_dll/ev_hldm.cpp
@@ -1,9 +1,9 @@
 /***
 *
 *	Copyright (c) 1999, Valve LLC. All rights reserved.
-*	
-*	This product contains software technology licensed from Id 
-*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*
+*	This product contains software technology licensed from Id
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc.
 *	All Rights Reserved.
 *
 *   Use, distribution, and modification of this source code and/or resulting
@@ -34,10 +34,10 @@
 
 extern "C"
 {
-// RICOCHET
-void EV_FireDisc( struct event_args_s *args );
-void EV_TriggerJump( struct event_args_s *args );
-void EV_TrainPitchAdjust( struct event_args_s *args );
+	// RICOCHET
+	void EV_FireDisc(struct event_args_s* args);
+	void EV_TriggerJump(struct event_args_s* args);
+	void EV_TrainPitchAdjust(struct event_args_s* args);
 }
 
 /*
@@ -47,15 +47,15 @@ EV_TriggerJump
 Plays the jump pad sound
 ==============================
 */
-void EV_TriggerJump( event_args_t *args )
+void EV_TriggerJump(event_args_t* args)
 {
 	int idx;
 	idx = args->entindex;
 	vec3_t origin;
 
-	VectorCopy( args->origin, origin );
+	VectorCopy(args->origin, origin);
 
-	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_AUTO, "triggerjump.wav", 1.0, ATTN_NORM, 0, 98 + gEngfuncs.pfnRandomLong( 0, 3 ) );
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_AUTO, "triggerjump.wav", 1.0, ATTN_NORM, 0, 98 + gEngfuncs.pfnRandomLong(0, 3));
 }
 
 /*
@@ -65,30 +65,30 @@ EV_FireDisc
 Play's disc firing animation and play's appropriate sound effect
 ==============================
 */
-void EV_FireDisc( event_args_t *args )
+void EV_FireDisc(event_args_t* args)
 {
 	int idx;
 
 	idx = args->entindex;
 	vec3_t origin;
 	int decap;
 
-	VectorCopy( args->origin, origin );
+	VectorCopy(args->origin, origin);
 	decap = args->bparam1 ? 1 : 0;
 
-	if ( EV_IsLocal( idx ) )
+	if (EV_IsLocal(idx))
 	{
 		// Add muzzle flash to current weapon model
-		gEngfuncs.pEventAPI->EV_WeaponAnimation( DISC_THROW1, 2 );
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(DISC_THROW1, 2);
 	}
 
-	if ( decap )
+	if (decap)
 	{
-		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/altfire.wav", 0.8, ATTN_NORM, 0, 100 );
+		gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, "weapons/altfire.wav", 0.8, ATTN_NORM, 0, 100);
 	}
 	else
 	{
-		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/cbar_miss1.wav", 0.8, ATTN_NORM, 0, 100 );
+		gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, "weapons/cbar_miss1.wav", 0.8, ATTN_NORM, 0, 100);
 	}
 }
 
@@ -101,7 +101,7 @@ EV_TrainPitchAdjust
 Do we support trains in Ricochet?
 ==============================
 */
-void EV_TrainPitchAdjust( event_args_t *args )
+void EV_TrainPitchAdjust(event_args_t* args)
 {
 	int idx;
 	vec3_t origin;
@@ -111,40 +111,40 @@ void EV_TrainPitchAdjust( event_args_t *args )
 	float m_flVolume;
 	int pitch;
 	int stop;
-	
-	char sz[ 256 ];
+
+	char sz[256];
 
 	idx = args->entindex;
-	
-	VectorCopy( args->origin, origin );
+
+	VectorCopy(args->origin, origin);
 
 	us_params = (unsigned short)args->iparam1;
-	stop	  = args->bparam1;
+	stop = args->bparam1;
 
-	m_flVolume	= (float)(us_params & 0x003f)/40.0;
-	noise		= (int)(((us_params) >> 12 ) & 0x0007);
-	pitch		= (int)( 10.0 * (float)( ( us_params >> 6 ) & 0x003f ) );
+	m_flVolume = (float)(us_params & 0x003f) / 40.0;
+	noise = (int)(((us_params) >> 12) & 0x0007);
+	pitch = (int)(10.0 * (float)((us_params >> 6) & 0x003f));
 
-	switch ( noise )
+	switch (noise)
 	{
-	case 1: strcpy( sz, "plats/ttrain1.wav"); break;
-	case 2: strcpy( sz, "plats/ttrain2.wav"); break;
-	case 3: strcpy( sz, "plats/ttrain3.wav"); break; 
-	case 4: strcpy( sz, "plats/ttrain4.wav"); break;
-	case 5: strcpy( sz, "plats/ttrain6.wav"); break;
-	case 6: strcpy( sz, "plats/ttrain7.wav"); break;
+	case 1: strcpy(sz, "plats/ttrain1.wav"); break;
+	case 2: strcpy(sz, "plats/ttrain2.wav"); break;
+	case 3: strcpy(sz, "plats/ttrain3.wav"); break;
+	case 4: strcpy(sz, "plats/ttrain4.wav"); break;
+	case 5: strcpy(sz, "plats/ttrain6.wav"); break;
+	case 6: strcpy(sz, "plats/ttrain7.wav"); break;
 	default:
 		// no sound
-		strcpy( sz, "" );
+		strcpy(sz, "");
 		return;
 	}
 
-	if ( stop )
+	if (stop)
 	{
-		gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_STATIC, sz );
+		gEngfuncs.pEventAPI->EV_StopSound(idx, CHAN_STATIC, sz);
 	}
 	else
 	{
-		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_STATIC, sz, m_flVolume, ATTN_NORM, SND_CHANGE_PITCH, pitch );
+		gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_STATIC, sz, m_flVolume, ATTN_NORM, SND_CHANGE_PITCH, pitch);
 	}
-}
+}