Skip to content
This repository was archived by the owner on Sep 22, 2021. It is now read-only.

Commit 68bc538

Browse files
econoraptoreconoraptor
committed
Change access modifiers and spaces to tabs
1 parent 448ce15 commit 68bc538

File tree

2 files changed

+146
-146
lines changed

2 files changed

+146
-146
lines changed

‎DemoInfo/DemoParser.cs‎

Lines changed: 143 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ public IEnumerable<Player> PlayingParticipants {
274274
/// </summary>
275275
private IBitStream BitStream;
276276

277-
/// <summary>
278-
/// The file stream read by BitStream
279-
/// </summary>
280-
private Stream Input;
277+
/// <summary>
278+
/// The file stream read by BitStream
279+
/// </summary>
280+
private Stream Input;
281281

282282
/// <summary>
283283
/// A parser for DataTables. This contains the ServerClasses and DataTables.
@@ -435,21 +435,21 @@ public string TFlag
435435
/// </summary>
436436
/// <value>The tick rate.</value>
437437
public float TickRate {
438-
get { return this.Header.PlaybackFrames / this.Header.PlaybackTime; }
438+
get { return this.Header.PlaybackFrames / this.Header.PlaybackTime; }
439439
}
440440

441-
/// <summary>
442-
/// Used to impute header time values when they're corrupted
443-
/// TickInterval = 1/TickRate
444-
/// </summary>
445-
internal float TickInterval;
441+
/// <summary>
442+
/// Used to impute header time values when they're corrupted
443+
/// TickInterval = 1/TickRate
444+
/// </summary>
445+
internal float TickInterval;
446446

447447
/// <summary>
448448
/// How long a tick of the demo is in s^-1
449449
/// </summary>
450450
/// <value>The tick time.</value>
451451
public float TickTime {
452-
get { return this.Header.PlaybackTime / this.Header.PlaybackFrames;}
452+
get { return this.Header.PlaybackTime / this.Header.PlaybackFrames; }
453453
}
454454

455455
/// <summary>
@@ -472,10 +472,10 @@ public float ParsingProgess {
472472
/// <value>The current tick.</value>
473473
public int CurrentTick { get; private set; }
474474

475-
/// <summary>
476-
/// The CurrentTick for the last tick where IngameTick == 0
477-
/// </summary>
478-
private int TickAtStart;
475+
/// <summary>
476+
/// The CurrentTick for the last tick where IngameTick == 0
477+
/// </summary>
478+
private int TickAtStart;
479479

480480
/// <summary>
481481
/// The current ingame-tick as reported by the demo-file.
@@ -502,7 +502,7 @@ public float ParsingProgess {
502502
/// <param name="input">An input-stream.</param>
503503
public DemoParser(Stream input)
504504
{
505-
Input = input;
505+
Input = input;
506506

507507
BitStream = BitStreamUtil.Create(input);
508508

@@ -531,140 +531,140 @@ public void ParseHeader()
531531
if (HeaderParsed != null)
532532
HeaderParsed(this, new HeaderParsedEventArgs(Header));
533533

534-
if (header.PlaybackTime == 0) //header is corrupted
535-
FixHeader();
536-
}
537-
538-
void FixHeader()
539-
{
540-
ExpressParseToEnd();
541-
Header.PlaybackTicks = IngameTick;
542-
Header.PlaybackFrames = CurrentTick - (TickAtStart + 1);
543-
Header.PlaybackTime = TickInterval * IngameTick;
544-
545-
CurrentTick = 0;
546-
547-
//the ol' switcheroo
548-
//It's probably safest and easiest to
549-
//swap out for a fresh bitstream.
550-
Input.Seek(0, System.IO.SeekOrigin.Begin);
551-
BitStream = BitStreamUtil.Create(Input);
552-
//Put the new stream back at the end of the header
553-
ExpressParseHeader(BitStream);
554-
}
555-
556-
//These express functions mirror functions without the express prefix,
557-
//but all they do is read ticks and get ServerInfo. They do not parse
558-
//data from any other packets.
559-
void ExpressParseToEnd()
560-
{
561-
while (true)
562-
{
563-
try
564-
{
565-
if (!ExpressParseTick())
566-
break;
567-
}
568-
catch (System.IO.EndOfStreamException)
569-
{
570-
break;
571-
}
572-
}
573-
}
574-
575-
576-
bool ExpressParseTick()
577-
{
578-
DemoCommand command = (DemoCommand)BitStream.ReadByte();
579-
580-
IngameTick = (int)BitStream.ReadInt(32); // tick number
581-
582-
if (IngameTick == 0)
583-
TickAtStart = CurrentTick;
584-
585-
BitStream.ReadByte(); // player slot
586-
587-
this.CurrentTick++; // = TickNum;
588-
589-
switch (command)
590-
{
591-
case DemoCommand.Synctick:
592-
break;
593-
case DemoCommand.Stop:
594-
return false;
595-
case DemoCommand.ConsoleCommand:
596-
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
597-
BitStream.EndChunk();
598-
break;
599-
case DemoCommand.DataTables:
600-
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
601-
BitStream.EndChunk();
602-
break;
603-
case DemoCommand.StringTables:
604-
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
605-
BitStream.EndChunk();
606-
break;
607-
case DemoCommand.UserCommand:
608-
BitStream.ReadInt(32);
609-
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
610-
BitStream.EndChunk();
611-
break;
612-
case DemoCommand.Signon:
613-
case DemoCommand.Packet:
614-
ExpressParseDemoPacket();
615-
break;
616-
default:
617-
throw new Exception("Can't handle Demo-Command " + command);
618-
}
619-
620-
return true;
621-
}
622-
623-
void ExpressParseDemoPacket()
624-
{
625-
//Read a command-info. Contains no really useful information afaik.
626-
CommandInfo.Parse(BitStream);
627-
BitStream.ReadInt(32); // SeqNrIn
628-
BitStream.ReadInt(32); // SeqNrOut
629-
630-
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
631-
ExpressParsePacket(BitStream, this);
632-
BitStream.EndChunk();
633-
}
634-
635-
void ExpressParsePacket(IBitStream bitstream, DemoParser demo)
636-
{
637-
while (!bitstream.ChunkFinished)
638-
{
639-
int cmd = bitstream.ReadProtobufVarInt(); //What type of packet is this?
640-
int length = bitstream.ReadProtobufVarInt(); //And how long is it?
641-
bitstream.BeginChunk(length * 8); //read length bytes
642-
if (cmd == (int)SVC_Messages.svc_ServerInfo)
643-
{
644-
new ServerInfo().Parse(bitstream, demo);
645-
}
646-
bitstream.EndChunk();
647-
}
648-
}
534+
if (header.PlaybackTime == 0) //header is corrupted
535+
FixHeader();
536+
}
537+
538+
void FixHeader()
539+
{
540+
ExpressParseToEnd();
541+
Header.PlaybackTicks = IngameTick;
542+
Header.PlaybackFrames = CurrentTick - (TickAtStart + 1);
543+
Header.PlaybackTime = TickInterval * IngameTick;
544+
545+
CurrentTick = 0;
649546

650-
void ExpressParseHeader(IBitStream reader)
651-
{
652-
var MAX_OSPATH = DemoHeader.MAX_OSPATH;
547+
//the ol' switcheroo
548+
//It's probably safest and easiest to
549+
//swap out for a fresh bitstream.
550+
Input.Seek(0, System.IO.SeekOrigin.Begin);
551+
BitStream = BitStreamUtil.Create(Input);
552+
//Put the new stream back at the end of the header
553+
ExpressParseHeader(BitStream);
554+
}
653555

654-
reader.ReadCString(8);
655-
reader.ReadSignedInt(32);
556+
//These express functions mirror functions without the express prefix,
557+
//but all they do is read ticks and get ServerInfo. They do not parse
558+
//data from any other packets.
559+
void ExpressParseToEnd()
560+
{
561+
while (true)
562+
{
563+
try
564+
{
565+
if (!ExpressParseTick())
566+
break;
567+
}
568+
catch (System.IO.EndOfStreamException)
569+
{
570+
break;
571+
}
572+
}
573+
}
574+
575+
576+
bool ExpressParseTick()
577+
{
578+
DemoCommand command = (DemoCommand)BitStream.ReadByte();
579+
580+
IngameTick = (int)BitStream.ReadInt(32); // tick number
581+
582+
if (IngameTick == 0)
583+
TickAtStart = CurrentTick;
584+
585+
BitStream.ReadByte(); // player slot
586+
587+
this.CurrentTick++; // = TickNum;
588+
589+
switch (command)
590+
{
591+
case DemoCommand.Synctick:
592+
break;
593+
case DemoCommand.Stop:
594+
return false;
595+
case DemoCommand.ConsoleCommand:
596+
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
597+
BitStream.EndChunk();
598+
break;
599+
case DemoCommand.DataTables:
600+
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
601+
BitStream.EndChunk();
602+
break;
603+
case DemoCommand.StringTables:
604+
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
605+
BitStream.EndChunk();
606+
break;
607+
case DemoCommand.UserCommand:
608+
BitStream.ReadInt(32);
609+
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
610+
BitStream.EndChunk();
611+
break;
612+
case DemoCommand.Signon:
613+
case DemoCommand.Packet:
614+
ExpressParseDemoPacket();
615+
break;
616+
default:
617+
throw new Exception("Can't handle Demo-Command " + command);
618+
}
619+
620+
return true;
621+
}
622+
623+
void ExpressParseDemoPacket()
624+
{
625+
//Read a command-info. Contains no really useful information afaik.
626+
CommandInfo.Parse(BitStream);
627+
BitStream.ReadInt(32); // SeqNrIn
628+
BitStream.ReadInt(32); // SeqNrOut
629+
630+
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);
631+
ExpressParsePacket(BitStream, this);
632+
BitStream.EndChunk();
633+
}
634+
635+
void ExpressParsePacket(IBitStream bitstream, DemoParser demo)
636+
{
637+
while (!bitstream.ChunkFinished)
638+
{
639+
int cmd = bitstream.ReadProtobufVarInt(); //What type of packet is this?
640+
int length = bitstream.ReadProtobufVarInt(); //And how long is it?
641+
bitstream.BeginChunk(length * 8); //read length bytes
642+
if (cmd == (int)SVC_Messages.svc_ServerInfo)
643+
{
644+
new ServerInfo().Parse(bitstream, demo);
645+
}
646+
bitstream.EndChunk();
647+
}
648+
}
649+
650+
void ExpressParseHeader(IBitStream reader)
651+
{
652+
var MAX_OSPATH = DemoHeader.MAX_OSPATH;
653+
654+
reader.ReadCString(8);
656655
reader.ReadSignedInt(32);
657-
reader.ReadCString(MAX_OSPATH);
656+
reader.ReadSignedInt(32);
657+
reader.ReadCString(MAX_OSPATH);
658658

659-
reader.ReadCString(MAX_OSPATH);
660-
reader.ReadCString(MAX_OSPATH);
661-
reader.ReadCString(MAX_OSPATH);
659+
reader.ReadCString(MAX_OSPATH);
660+
reader.ReadCString(MAX_OSPATH);
661+
reader.ReadCString(MAX_OSPATH);
662662
reader.ReadFloat();
663663

664664
reader.ReadSignedInt(32);
665665
reader.ReadSignedInt(32);
666-
reader.ReadSignedInt(32);
667-
}
666+
reader.ReadSignedInt(32);
667+
}
668668

669669
/// <summary>
670670
/// Parses this file until the end of the demo is reached.
@@ -802,7 +802,7 @@ private void ParseDemoPacket()
802802
{
803803
//Read a command-info. Contains no really useful information afaik.
804804
CommandInfo.Parse(BitStream);
805-
uint seqin = BitStream.ReadInt(32); // SeqNrIn
805+
BitStream.ReadInt(32); // SeqNrIn
806806
BitStream.ReadInt(32); // SeqNrOut
807807

808808
BitStream.BeginChunk(BitStream.ReadSignedInt(32) * 8);

‎DemoInfo/Structs.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public int NetworkProtocal {
3030
public string ClientName { get; private set; } // Name of client who recorded the game
3131
public string MapName { get; private set; } // Name of map
3232
public string GameDirectory { get; private set; } // Name of game directory (com_gamedir)
33-
public float PlaybackTime { get; set; } // Time of track
34-
public int PlaybackTicks { get; set; } // # of ticks in track
35-
public int PlaybackFrames { get; set; } // # of frames in track
33+
public float PlaybackTime { get; internal set; } // Time of track
34+
public int PlaybackTicks { get; internal set; } // # of ticks in track
35+
public int PlaybackFrames { get; internal set; } // # of frames in track
3636
public int SignonLength { get; private set; } // length of sigondata in bytes
3737

3838
public static DemoHeader ParseFrom(IBitStream reader)

0 commit comments

Comments
 (0)