svn r6488

sauerbraten · Dec 22, 2020 · ccf4906 · ccf4906
1 parent cf6f1fe
commit ccf4906
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/engine/octaedit.cpp b/src/engine/octaedit.cpp
@@ -351,6 +351,8 @@ extern float rayent(const vec &o, const vec &ray, float radius, int mode, int si
 
 VAR(gridlookup, 0, 0, 1);
 VAR(passthroughcube, 0, 1, 1);
+VAR(passthroughent, 0, 1, 1);
+VARF(passthrough, 0, 0, 1, { passthroughsel = passthrough; entcancel(); });
 
 void rendereditcursor()
 {
@@ -391,9 +393,9 @@ void rendereditcursor()
 
         wdist = rayent(player->o, camdir, 1e16f,
                        (editmode && showmat ? RAY_EDITMAT : 0)   // select cubes first
-                       | (!dragging && entediting ? RAY_ENTS : 0)
+                       | (!dragging && entediting && (!passthrough || !passthroughent) ? RAY_ENTS : 0)
                        | RAY_SKIPFIRST
-                       | (passthroughcube==1 ? RAY_PASS : 0), gridsize, entorient, ent);
+                       | (passthroughcube || passthrough ? RAY_PASS : 0), gridsize, entorient, ent);
 
         if((havesel || dragging) && !passthroughsel && !hmapedit)     // now try selecting the selection
             if(rayboxintersect(vec(sel.o), vec(sel.s).mul(sel.grid), player->o, camdir, sdist, orient))

diff --git a/src/fpsgame/scoreboard.cpp b/src/fpsgame/scoreboard.cpp
@@ -529,6 +529,11 @@ namespace game
             {
                 if(best) score2 = groups[1]->score;
                 else for(int i = 1; i < groups.length(); ++i) if(isteam(player1->team, groups[i]->team)) { score2 = groups[i]->score; break; }
+                if(score2 == INT_MIN)
+                {
+                    fpsent *p = followingplayer(player1);
+                    if(p->state==CS_SPECTATOR) score2 = groups[1]->score;
+                }
             }
         }
         else
@@ -538,7 +543,7 @@ namespace game
             best = p == g->players[0];
             if(g->players.length() > 1)
             {
-                if(best) score2 = g->players[1]->frags;
+                if(best || p->state==CS_SPECTATOR) score2 = g->players[1]->frags;
                 else score2 = p->frags;
             }
         }

diff --git a/src/shared/glemu.h b/src/shared/glemu.h
@@ -53,9 +53,9 @@ namespace gle
 
     GLE_INITATTRIBF(vertex, ATTRIB_VERTEX)
     GLE_INITATTRIBF(color, ATTRIB_COLOR)
-    GLE_INITATTRIBN(color, ATTRIB_COLOR, ub, uchar, 255)
-    static inline void color(const bvec &v, uchar alpha = 255) { glVertexAttrib4Nub_(ATTRIB_COLOR, v.x, v.y, v.z, alpha); }
     static inline void color(const bvec4 &v) { glVertexAttrib4Nubv_(ATTRIB_COLOR, v.v); }
+    static inline void color(const bvec &v, uchar alpha = 255) { color(bvec4(v, alpha)); }
+    static inline void colorub(uchar x, uchar y, uchar z, uchar w = 255) { color(bvec4(x, y, z, w)); }
     GLE_INITATTRIBF(texcoord0, ATTRIB_TEXCOORD0)
     GLE_INITATTRIBF(texcoord1, ATTRIB_TEXCOORD1)
     static inline void normal(float x, float y, float z) { glVertexAttrib4f_(ATTRIB_NORMAL, x, y, z, 0.0f); }

diff --git a/src/xcode/sauerbraten.plist b/src/xcode/sauerbraten.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2020.12.04</string>
+	<string>2020.12.21</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSApplicationCategoryType</key>