From 9069013dc518babcbc9c272a5d91e6b8bf1a5f7a Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 30 Dec 2018 20:29:39 +0000 Subject: [PATCH] "r_particledesc default" should not screw over the user. use ./default if you really meant that. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5374 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/p_script.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/client/p_script.c b/engine/client/p_script.c index d9d83c587..7844de6c8 100644 --- a/engine/client/p_script.c +++ b/engine/client/p_script.c @@ -3602,8 +3602,11 @@ static qboolean P_LoadParticleSet(char *name, qboolean implicit, qboolean showwa } } - FS_LoadFile(va("particles/%s.cfg", name), (void**)&file); - if (!file) + if (!strncmp(name, "./", 2)) + FS_LoadFile(va("%s.cfg", name+2), (void**)&file); + else + FS_LoadFile(va("particles/%s.cfg", name), (void**)&file); + if (!file && strchr(name, '/')) FS_LoadFile(va("%s.cfg", name), (void**)&file); if (file) {