Since there was actually an issue with DVAR struct, it should now actually fix the log issue.
This commit is contained in:
parent
e646f9eb40
commit
81c5fb60be
@ -72,7 +72,7 @@ namespace IW4MAdmin
|
|||||||
public uint flags;
|
public uint flags;
|
||||||
|
|
||||||
[FieldOffset(12)]
|
[FieldOffset(12)]
|
||||||
public short type;
|
public Byte type;
|
||||||
|
|
||||||
[FieldOffset(16)]
|
[FieldOffset(16)]
|
||||||
public IntPtr current;
|
public IntPtr current;
|
||||||
@ -83,7 +83,7 @@ namespace IW4MAdmin
|
|||||||
[FieldOffset(48)]
|
[FieldOffset(48)]
|
||||||
public IntPtr _default;
|
public IntPtr _default;
|
||||||
|
|
||||||
[FieldOffset(65)]
|
[FieldOffset(64)]
|
||||||
public IntPtr min;
|
public IntPtr min;
|
||||||
|
|
||||||
[FieldOffset(68)]
|
[FieldOffset(68)]
|
||||||
|
@ -624,17 +624,8 @@ namespace IW4MAdmin
|
|||||||
logPath = logPath.Replace("/", "\\");
|
logPath = logPath.Replace("/", "\\");
|
||||||
Mod = Mod.Replace("/", "\\");
|
Mod = Mod.Replace("/", "\\");
|
||||||
|
|
||||||
int count = 0;
|
Thread.Sleep(100);
|
||||||
|
Int32.TryParse(getDvar("iw4m_onelog").current, out oneLog);
|
||||||
while(count < 15)
|
|
||||||
{
|
|
||||||
Int32.TryParse(getDvar("iw4m_onelog").current, out oneLog);
|
|
||||||
if (oneLog == 1)
|
|
||||||
break;
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
count = 0;
|
|
||||||
|
|
||||||
if (oneLog == -1)
|
if (oneLog == -1)
|
||||||
{
|
{
|
||||||
@ -650,15 +641,9 @@ namespace IW4MAdmin
|
|||||||
Website = "this server's website";
|
Website = "this server's website";
|
||||||
|
|
||||||
int logSync = -1;
|
int logSync = -1;
|
||||||
while (count < 15)
|
|
||||||
{
|
|
||||||
Int32.TryParse(getDvar("g_logSync").current, out logSync);
|
|
||||||
if (logSync == 1)
|
|
||||||
break;
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
count = 0;
|
Thread.Sleep(100);
|
||||||
|
Int32.TryParse(getDvar("g_logSync").current, out logSync);
|
||||||
|
|
||||||
if (logSync == 0)
|
if (logSync == 0)
|
||||||
{
|
{
|
||||||
|
@ -144,28 +144,31 @@ namespace IW4MAdmin
|
|||||||
dvar_actual.name = getStringFromPointer((int)dvar_raw.name, (int)Handle);
|
dvar_actual.name = getStringFromPointer((int)dvar_raw.name, (int)Handle);
|
||||||
dvar_actual.description = getStringFromPointer((int)dvar_raw.description, (int)Handle);
|
dvar_actual.description = getStringFromPointer((int)dvar_raw.description, (int)Handle);
|
||||||
|
|
||||||
if ((int)dvar_raw._default > short.MaxValue)
|
if (dvar_raw.type == 7)
|
||||||
|
{
|
||||||
dvar_actual._default = getStringFromPointer((int)dvar_raw._default, (int)Handle);
|
dvar_actual._default = getStringFromPointer((int)dvar_raw._default, (int)Handle);
|
||||||
else
|
|
||||||
dvar_actual._default = dvar_raw._default.ToString();
|
|
||||||
|
|
||||||
if ((int)dvar_raw.current > short.MaxValue)
|
|
||||||
dvar_actual.current = getStringFromPointer((int)dvar_raw.current, (int)Handle);
|
dvar_actual.current = getStringFromPointer((int)dvar_raw.current, (int)Handle);
|
||||||
else if ((int)dvar_raw.current <= 1025)
|
|
||||||
dvar_actual.current = ((int)dvar_raw.current % 1024).ToString();
|
|
||||||
else
|
|
||||||
dvar_actual.current = dvar_raw.current.ToString();
|
|
||||||
|
|
||||||
if ((int)dvar_raw.latched > short.MaxValue)
|
|
||||||
dvar_actual.latched = getStringFromPointer((int)dvar_raw.latched, (int)Handle);
|
dvar_actual.latched = getStringFromPointer((int)dvar_raw.latched, (int)Handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (dvar_raw.type == 0)
|
||||||
|
{
|
||||||
|
dvar_actual._default = ((byte)dvar_raw._default).ToString();
|
||||||
|
dvar_actual.current = ((byte)dvar_raw.current).ToString();
|
||||||
|
dvar_actual.latched = ((byte)dvar_raw.latched).ToString();
|
||||||
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
dvar_actual.current = dvar_raw.current.ToString();
|
||||||
|
dvar_actual._default = dvar_raw._default.ToString();
|
||||||
dvar_actual.latched = dvar_raw.latched.ToString();
|
dvar_actual.latched = dvar_raw.latched.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
dvar_actual.type = dvar_raw.type;
|
dvar_actual.type = dvar_raw.type;
|
||||||
dvar_actual.flags = getIntFromPointer((int)dvar_raw.flags, (int)Handle);
|
dvar_actual.flags = getIntFromPointer((int)dvar_raw.flags, (int)Handle);
|
||||||
dvar_actual.max = getIntFromPointer((int)dvar_raw.max, (int)Handle);
|
dvar_actual.max = getIntFromPointer((int)dvar_raw.max, (int)Handle);
|
||||||
dvar_actual.min = getIntFromPointer((int)dvar_raw.min, (int)Handle);
|
dvar_actual.min = getIntFromPointer((int)dvar_raw.min, (int)Handle);
|
||||||
|
|
||||||
// done!
|
// done!
|
||||||
|
|
||||||
return dvar_actual;
|
return dvar_actual;
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1,8 +1,4 @@
|
|||||||
VERSION 0.9.6
|
opllllllllll
|
||||||
CHANGELOG:
|
|
||||||
-fixed issue with log path sometimes not reading properly
|
|
||||||
-webfront no long crashes on reload
|
|
||||||
-
|
|
||||||
|
|
||||||
VERSION 0.9.5
|
VERSION 0.9.5
|
||||||
-Major refactoring to support plugins
|
-Major refactoring to support plugins
|
||||||
|
Loading…
x
Reference in New Issue
Block a user