sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-07 10:28:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #777 from shavitush/very_good_yes

Browse Source 
2.5.2
This commit is contained in:
shavit 2019-04-06 02:02:35 +03:00 committed by GitHub
commit 5fb84e6ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sourcemod/scripting/include/shavit.inc
View File

@ -23,7 +23,7 @@
#endif
#define _shavit_included
#define SHAVIT_VERSION "2.5.1"
#define SHAVIT_VERSION "2.5.2"
#define STYLE_LIMIT 256
#define MAX_ZONES 64
#define MAX_NAME_LENGTH_SQL 32

44
addons/sourcemod/scripting/shavit-replay.sp
View File

@ -33,7 +33,7 @@
#define REPLAY_FORMAT_V2 "{SHAVITREPLAYFORMAT}{V2}"
#define REPLAY_FORMAT_FINAL "{SHAVITREPLAYFORMAT}{FINAL}"
#define REPLAY_FORMAT_SUBVERSION 0x02
#define REPLAY_FORMAT_SUBVERSION 0x03
#define CELLS_PER_FRAME 8 // origin[3], angles[2], buttons, flags, movetype
#define FRAMES_PER_WRITE 100 // amounts of frames to write per read/write call
@ -983,6 +983,8 @@ bool LoadReplay(int style, int track, const char[] path)
if(!fFile.ReadLine(sHeader, 64))
{
delete fFile;
return false;
}
@ -990,10 +992,35 @@ bool LoadReplay(int style, int track, const char[] path)
char sExplodedHeader[2][64];
ExplodeString(sHeader, ":", sExplodedHeader, 2, 64);
// TODO: split this piece of shit to different functions. cbf to keep it like this
if(StrEqual(sExplodedHeader[1], REPLAY_FORMAT_FINAL)) // hopefully, the last of them
{
gA_FrameCache[style][track].iReplayVersion = StringToInt(sExplodedHeader[0]);
// replay file integrity and preframes
if(gA_FrameCache[style][track].iReplayVersion >= 0x03)
{
char sMap[160];
fFile.ReadString(sMap, 160);
int iStyle = 0;
fFile.ReadUint8(iStyle);
int iTrack = 0;
fFile.ReadUint8(iTrack);
if(!StrEqual(sMap, gS_Map, false) || iStyle != style || iTrack != track)
{
delete fFile;
return false;
}
// whenever this is implemented
// fFile.ReadInt32(gA_FrameCache[style][track].iPreframes);
fFile.Seek(4, SEEK_CUR);
}
int iTemp = 0;
fFile.ReadInt32(iTemp);
gA_FrameCache[style][track].iFrameCount = iTemp;
@ -1114,7 +1141,7 @@ bool LoadReplay(int style, int track, const char[] path)
return false;
}
bool SaveReplay(int style, int track, float time, char[] authid, char[] name)
bool SaveReplay(int style, int track, float time, char[] authid, char[] name, int preframes = 0)
{
char sTrack[4];
FormatEx(sTrack, 4, "_%d", track);
@ -1130,14 +1157,16 @@ bool SaveReplay(int style, int track, float time, char[] authid, char[] name)
File fFile = OpenFile(sPath, "wb");
fFile.WriteLine("%d:" ... REPLAY_FORMAT_FINAL, REPLAY_FORMAT_SUBVERSION);
int iSize = gA_Frames[style][track].Length;
fFile.WriteString(gS_Map, true);
fFile.WriteInt8(style);
fFile.WriteInt8(track);
fFile.WriteInt32(preframes);
int iSize = gA_Frames[style][track].Length;
fFile.WriteInt32(iSize);
fFile.WriteInt32(view_as<int>(time));
fFile.WriteString(authid, true);
// if REPLAY_FORMAT_SUBVERSION is over 0x01 i'll add variables here
any aFrameData[CELLS_PER_FRAME];
any aWriteData[CELLS_PER_FRAME * FRAMES_PER_WRITE];
int iFramesWritten = 0;
@ -2313,11 +2342,6 @@ void OpenReplaySubMenu(int client, int track, int item = 0)
menu.AddItem("-1", "ERROR");
}
else if(menu.ItemCount <= ((gEV_Type == Engine_CSS)? 8:7))
{
menu.Pagination = MENU_NO_PAGINATION;
}
menu.ExitBackButton = true;
menu.DisplayAt(client, item, 60);
}