Merge
This commit is contained in:
parent
7259ec764b
commit
cba7e535aa
@ -679,12 +679,8 @@ char *getenv(const char *name)
|
|||||||
{
|
{
|
||||||
char *(*_getenv)(const char *name) = dlsym(RTLD_NEXT, "getenv");
|
char *(*_getenv)(const char *name) = dlsym(RTLD_NEXT, "getenv");
|
||||||
|
|
||||||
<<<<<<< HEAD
|
if ((strcmp(name, "TEA_DIR") == 0) && ((getConfig()->game == VIRTUA_TENNIS_3) || (getConfig()->game == VIRTUA_TENNIS_3_TEST) ||
|
||||||
if ((strcmp(name, "TEA_DIR") == 0) && getConfig()->game == VIRTUA_TENNIS_3)
|
|
||||||
=======
|
|
||||||
if ((strcmp(name, "TEA_DIR") == 0) && ((getConfig()->game == VT3) || (getConfig()->game == VT3_TESTMODE) ||
|
|
||||||
((getConfig()->game == RAMBO)) || (getConfig()->game == TOO_SPICY)))
|
((getConfig()->game == RAMBO)) || (getConfig()->game == TOO_SPICY)))
|
||||||
>>>>>>> More-patching
|
|
||||||
{
|
{
|
||||||
if (getcwd(envpath, 100) == NULL)
|
if (getcwd(envpath, 100) == NULL)
|
||||||
return "";
|
return "";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user