fix -1 CN arg in PLAYER_VARGS_ICOMMAND

sauerbraten · Jan 24, 2021 · 1e2ca75 · 1e2ca75
1 parent 4dbad0a
commit 1e2ca75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/patches/scoreboard.patch b/patches/scoreboard.patch
@@ -802,7 +802,7 @@ Index: src/fpsgame/weaponstats.h
 +    extern float playeraccuracy(fpsent *p, int gun = -1);
 +
 +    #define PLAYER_VARGS_ICOMMAND(name,b) ICOMMAND(name, "V", (tagval *args, int numargs), { \
-+        fpsent *p = numargs > 0 ? getclient(args[0].getint()) : hudplayer(); \
++        fpsent *p = (numargs > 0 && args[0].getint() != -1) ? getclient(args[0].getint()) : hudplayer(); \
 +        if(!p) { conoutf("\f6no player with CN %d", args[0].getint()); return; } \
 +        b; \
 +    })

diff --git a/src/fpsgame/weaponstats.h b/src/fpsgame/weaponstats.h
@@ -13,7 +13,7 @@ namespace game {
     extern float playeraccuracy(fpsent *p, int gun = -1);
 
     #define PLAYER_VARGS_ICOMMAND(name,b) ICOMMAND(name, "V", (tagval *args, int numargs), { \
-        fpsent *p = numargs > 0 ? getclient(args[0].getint()) : hudplayer(); \
+        fpsent *p = (numargs > 0 && args[0].getint() != -1) ? getclient(args[0].getint()) : hudplayer(); \
         if(!p) { conoutf("\f6no player with CN %d", args[0].getint()); return; } \
         b; \
     })