lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Monster Iestyn 2018-03-04 19:10:01 +00:00
parent 4fdb82c942 16e60aada9
commit ad1801e7f1
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/console.c
View file

@ -842,8 +842,9 @@ boolean CON_Responder(event_t *ev)
return true; return true;
} }
// don't eat the key // ...why shouldn't it eat the key? if it doesn't, it just means you
return false; // can control Sonic from the console, which is silly
return true; //return false;
} }
// command completion forward (tab) and backward (shift-tab) // command completion forward (tab) and backward (shift-tab)
@ -1042,7 +1043,7 @@ boolean CON_Responder(event_t *ev)
// enter a char into the command prompt // enter a char into the command prompt
if (key < 32 || key > 127) if (key < 32 || key > 127)
return false; return true; // even if key can't be printed, eat it anyway
// add key to cmd line here // add key to cmd line here
if (key >= 'A' && key <= 'Z' && !shiftdown) //this is only really necessary for dedicated servers if (key >= 'A' && key <= 'Z' && !shiftdown) //this is only really necessary for dedicated servers

28
src/sdl/i_system.c
View file

@ -2709,7 +2709,7 @@ const char *I_LocateWad(void)
return waddir; return waddir;
} }
#if defined(LINUX) || defined(LINUX64) #ifdef __linux__
#define MEMINFO_FILE "/proc/meminfo" #define MEMINFO_FILE "/proc/meminfo"
#define MEMTOTAL "MemTotal:" #define MEMTOTAL "MemTotal:"
#define MEMFREE "MemFree:" #define MEMFREE "MemFree:"
@ -2729,20 +2729,23 @@ UINT32 I_GetFreeMem(UINT32 *total)
}; };
if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL) if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
{ {
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
if (kvm_nlist(kd, namelist) != 0) if (kvm_nlist(kd, namelist) != 0)
{ {
kvm_close (kd); kvm_close (kd);
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
if (kvm_read(kd, namelist[X_SUM].n_value, &sum, if (kvm_read(kd, namelist[X_SUM].n_value, &sum,
sizeof (sum)) != sizeof (sum)) sizeof (sum)) != sizeof (sum))
{ {
kvm_close(kd); kvm_close(kd);
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
kvm_close(kd); kvm_close(kd);
@ -2773,7 +2776,7 @@ UINT32 I_GetFreeMem(UINT32 *total)
(PVOID) &pr_arena, sizeof (UINT32)); (PVOID) &pr_arena, sizeof (UINT32));
return pr_arena; return pr_arena;
#elif defined (LINUX) || defined (LINUX64) #elif defined (__linux__)
/* Linux */ /* Linux */
char buf[1024]; char buf[1024];
char *memTag; char *memTag;
@ -2789,25 +2792,28 @@ UINT32 I_GetFreeMem(UINT32 *total)
if (n < 0) if (n < 0)
{ {
// Error // Error
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
buf[n] = '\0'; buf[n] = '\0';
if (NULL == (memTag = strstr(buf, MEMTOTAL))) if ((memTag = strstr(buf, MEMTOTAL)) == NULL)
{ {
// Error // Error
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
memTag += sizeof (MEMTOTAL); memTag += sizeof (MEMTOTAL);
totalKBytes = atoi(memTag); totalKBytes = atoi(memTag);
if (NULL == (memTag = strstr(buf, MEMFREE))) if ((memTag = strstr(buf, MEMFREE)) == NULL)
{ {
// Error // Error
*total = 0L; if (total)
*total = 0L;
return 0; return 0;
} }
@ -2822,7 +2828,7 @@ UINT32 I_GetFreeMem(UINT32 *total)
if (total) if (total)
*total = 48<<20; *total = 48<<20;
return 48<<20; return 48<<20;
#endif /* LINUX */ #endif
} }
const CPUInfoFlags *I_CPUInfo(void) const CPUInfoFlags *I_CPUInfo(void)