Skip to content

Commit

Permalink
Update?
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kaperstone
Kaperstone committed Mar 3, 2018
1 parent 08d7606 commit 7dbaac9
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 21 deletions.
140 changes: 121 additions & 19 deletions fixes/fixes.cpp
View file
Expand Up @@ -26,6 +26,8 @@
* SA:MP Team past, present and future
*/

// KillTimer fixed by .silent

#include <malloc.h>
#include <string.h>
#include <stdio.h>
Expand All @@ -35,6 +37,9 @@
#include <functional>

#include <iostream>
#include <fstream>
#include <stdarg.h>
#include <time.h>

#include "fixes.h"

Expand All @@ -44,6 +49,9 @@
#ifdef LINUX
#include <sys/mman.h>
#include <time.h>
#include <alloca.h>
#include <stdlib.h>
#include <unistd.h>

long long unsigned int
MicrosecondTime()
Expand All @@ -52,7 +60,7 @@
ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
//return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
return ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
return ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000;
}
#else
#define VC_EXTRALEAN
Expand Down Expand Up @@ -143,6 +151,10 @@ struct TimerCompare : public std::binary_function<struct timer_s *, struct timer
logprintf_t
logprintf;

AMX_NATIVE
pPrint,
pPrintF;

// Order the timers by trigger time.
std::priority_queue<
// Store times.
Expand All @@ -166,14 +178,18 @@ AMX *
gAMXFiles[17];

char
gLogTimeFormat[32] = "[%H:%M:%S]",
gLogprintfAssembly[5];

bool
bDoLog,
bInPrint;

unsigned int
gCurrentTimer = 0;

int gKilledTimer = -1;

//AMX_NATIVE
// SetTimer;

Expand Down Expand Up @@ -223,11 +239,26 @@ int
vsnprintf(dst, 1024, str, ap);
va_end(ap);
printf("%s\n", dst);
if (bDoLog)
{
// Re-enable logging.
std::ofstream
f("server_log.txt", std::fstream::app | std::fstream::out);
if (f.is_open())
{
char
ft[32];
time_t
t;
time(&t);
strftime(ft, sizeof (ft), gLogTimeFormat, localtime(&t));
f << ft << ' ' << dst << std::endl;
f.close();
}
}
// So we can use "printf" without getting stuck in endless loops.
if (!bInPrint)
{
// So we can use "printf" without getting stuck in endless loops.
bInPrint = true;
//std::cout << "fixes.plugin: " << dst << std::endl;
for (int i = 0; i != 17; ++i)
{
if (gAMXPtr[i] != -1)
Expand All @@ -240,17 +271,11 @@ int
amx_Release(gAMXFiles[i], addr);
if (ret == 1)
{
bInPrint = false;
return 1;
}
}
}
bInPrint = false;
}
//asm
//{
//
//}
return 1;
}

Expand Down Expand Up @@ -332,8 +357,17 @@ PLUGIN_EXPORT int PLUGIN_CALL
}
p0 = p0->next;
}
switch (next->repeat)

if (gKilledTimer == next->id)
{
DestroyTimer(next);
gKilledTimer = -1;
}
else
{
switch (next->repeat)
{
case 0:
case 1:
DestroyTimer(next);
break;
Expand All @@ -345,6 +379,7 @@ PLUGIN_EXPORT int PLUGIN_CALL
next->trigger += next->interval;
gTimers.push(next);
break;
}
}
}
else
Expand Down Expand Up @@ -420,8 +455,8 @@ static cell
}
return (cell)gCurrentTimer;
}
case 'i': case 'f': case 'x': case 'h': case 'b': case 'c': case 'l':
case 'I': case 'F': case 'X': case 'H': case 'B': case 'C': case 'L':
case 'i': case 'f': case 'x': case 'h': case 'b': case 'c': case 'l': case 'd':
case 'I': case 'F': case 'X': case 'H': case 'B': case 'C': case 'L': case 'D':
{
struct params_s *
p0 = (struct params_s *)malloc(sizeof (struct params_s));
Expand Down Expand Up @@ -478,8 +513,8 @@ static cell
{
switch (*fmat)
{
case 'i': case 'x': case 'h': case 'b':
case 'I': case 'X': case 'H': case 'B':
case 'i': case 'x': case 'h': case 'd':
case 'I': case 'X': case 'H': case 'D':
{
cell *
cstr;
Expand Down Expand Up @@ -575,12 +610,35 @@ static cell AMX_NATIVE_CALL
if (it != gHandles.end() && (*it).second->amx == amx)
{
// Can't remove it yet because it's stuck in a queue.
gKilledTimer = (*it).second->id;
(*it).second->repeat = 0;
gHandles.erase(params[1]);
}
return 0;
}

// Intercept "print" and "printf" to just log them (relatively) normally.
static cell AMX_NATIVE_CALL
n_print(AMX * amx, cell * params)
{
bInPrint = true;
cell
ret = pPrint(amx, params);
bInPrint = false;
return ret;
}

// native SetTimerEx_(const function[], const delay, const interval, const count, const format[], {Float, _}:...);
static cell AMX_NATIVE_CALL
n_printf(AMX * amx, cell * params)
{
bInPrint = true;
cell
ret = pPrintF(amx, params);
bInPrint = false;
return ret;
}

#if SSCANF_QUIET
void
qlog(char * str, ...)
Expand All @@ -589,6 +647,48 @@ static cell AMX_NATIVE_CALL
}
#endif

// Load an entry from server.cfg.
int
CFGLoad(char const * const name, char * const dest, size_t dlen)
{
std::ifstream
f("server.cfg");
int
ret = 1,
len = strlen(name);
if (f.is_open())
{
char
line[256];
f.clear();
while (!f.eof())
{
f.getline(line, 256);
if (f.fail())
{
goto CFGLoad_close;
}
// Does the line START with this text? Anything other than the
// first character fails.
if (!strncmp(line, name, len) && line[len] <= ' ')
{
while (line[++len] <= ' ')
{
if (line[len] == '\0') goto CFGLoad_close;
}
// Skipped leading spaces, save the value.
if (dest) strncpy(dest, line + len, dlen);
ret = atoi(line + len);
goto CFGLoad_close;
}
}
CFGLoad_close:
// Yes, I used a label! I needed to escape from a double loop.
f.close();
}
return ret;
}

//----------------------------------------------------------
// The Support() function indicates what possibilities this
// plugin has. The SUPPORTS_VERSION flag is required to check
Expand Down Expand Up @@ -620,12 +720,14 @@ PLUGIN_EXPORT bool PLUGIN_CALL
//logprintf("0x%08X\n", (int)logprintf);
logprintf("\n");
logprintf(" ===============================\n");
logprintf(" fixes plugin loaded. \n");
logprintf(" fixes2 plugin loaded. \n");
logprintf(" (c) 2012 Alex \"Y_Less\" Cole\n");
logprintf(" ===============================\n");

AssemblyRedirect(logprintf, FIXES_logprintf, gLogprintfAssembly);
AssemblyRedirect((void *)logprintf, (void *)FIXES_logprintf, gLogprintfAssembly);
bInPrint = false;
CFGLoad("logtimeformat", gLogTimeFormat, sizeof (gLogTimeFormat));
bDoLog = !!CFGLoad("enablelog", 0, 0);

#ifndef LINUX
LARGE_INTEGER
Expand Down Expand Up @@ -725,8 +827,8 @@ PLUGIN_EXPORT int PLUGIN_CALL
Redirect(amx, "SetTimer", (ucell)n_SetTimer, 0);
Redirect(amx, "KillTimer", (ucell)n_KillTimer, 0);
Redirect(amx, "SetTimerEx", (ucell)n_SetTimerEx, 0);
//Redirect(amx, "print", (ucell)n_print, 0);
//Redirect(amx, "printf", (ucell)n_printf, 0);
Redirect(amx, "print", (ucell)n_print, &pPrint);
Redirect(amx, "printf", (ucell)n_printf, &pPrintF);
for (int i = 0; i != 17; ++i)
{
if (gAMXFiles[i] == 0)
Expand Down
5 changes: 4 additions & 1 deletion fixes/fixes2.vcxproj
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand All @@ -15,16 +15,19 @@
<RootNamespace>HelloWorld</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>fixes2</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
2 changes: 1 addition & 1 deletion fixes/makefile
View file
Expand Up @@ -22,4 +22,4 @@ FIXES: clean
$(GPP) $(FIXES) ./SDK/amx/*.c -lrt
$(GPP) $(FIXES) ./SDK/*.cpp -lrt
$(GPP) $(FIXES) *.cpp -lrt
$(GPP) -m32 -O2 -fshort-wchar -shared -o $(FIXES_OUTFILE) -lrt *.o
$(GPP) -m32 -O2 -fshort-wchar -shared -o $(FIXES_OUTFILE) *.o -lrt

0 comments on commit 7dbaac9

Please sign in to comment.