fix #315 - add custom colours to routes (#1109)

* fix #315 - add custom colours to routes

* set fallback colour for routes

Author: Jigoku

config/usage.cfg

@@ -761,6 +761,8 @@ setdesc "sendmap" "manually sends map to the server"
 setdesc "getmap" "manually retrieves map from the server"
 setdesc "newmap" "create new map with the specified gridpower and name" "size" "name"
 setdesc "decalreset" "deletes all decal indices from map config file (including ones in use)"
+setdesc "routenames" "sets the routenames for race mode (list of names)" "text"
+setdesc "routecolours" "sets the routecolours for race mode (list of hexcolours)" "text"
 
 listcomplete "newent" "actor affinity camera checkpoint decal envmap light lightfx mapmodel particles playerstart pusher rail route sound teleport trigger weapon wind"
 listcomplete "entfind" "actor affinity camera checkpoint decal envmap light lightfx mapmodel particles playerstart pusher rail route sound teleport trigger weapon wind unused"

src/game/entities.cpp

@@ -43,12 +43,12 @@ namespace entities
 
     VARF(0, routeid, -1, -1, VAR_MAX, lastroutenode = -1; lastroutetime = 0; airnodes.setsize(0)); // selected route in race
     VARF(0, droproute, 0, 0, 1, lastroutenode = -1; lastroutetime = 0; airnodes.setsize(0); if(routeid < 0) routeid = 0);
-    VAR(IDF_HEX, routecolour, 0, 0xFF22FF, 0xFFFFFF);
     VAR(0, droproutedist, 1, 16, VAR_MAX);
     VAR(0, routemaxdist, 0, 64, VAR_MAX);
     VAR(IDF_PERSIST, showroutenames, 0, 1, 1);
     FVAR(IDF_PERSIST, routenameblend, 0, 1, 1);
-    SVARF(IDF_WORLD, routenames, "Easy Medium Hard", { string s; if(filterstring(s, routenames)) setsvar("routenames", s, false); });
+    SVARF(IDF_WORLD, routenames, "Easy Medium Hard", { string s; if(filterstring(s, routenames)) { delete[] routenames; routenames = newstring(s); } });
+    SVARF(IDF_WORLD, routecolours, "0x00FF00 0xFF7700 0xFF0000", { string s; if(filterstring(s, routecolours)) { delete[] routecolours; routecolours = newstring(s); } });
 
     struct rail
     {
@@ -3037,7 +3037,16 @@ namespace entities
             {
                 if(e.attrs[0] != routeid || (!m_edit(game::gamemode) && !m_race(game::gamemode))) break;
                 loopv(e.links) if(ents.inrange(e.links[i]) && ents[e.links[i]]->type == ROUTE && (!routemaxdist || o.dist(ents[e.links[i]]->o) <= routemaxdist))
-                    part_flare(o, ents[e.links[i]]->o, 1, PART_LIGHTNING_FLARE, routecolour);
+                {
+                    int col = 0xFF22FF;
+                    char *rcol = indexlist(routecolours, routeid);
+                    if(rcol)
+                    {
+                        if(*rcol) col = parseint(rcol);
+                        delete[] rcol;
+                    }
+                    part_flare(o, ents[e.links[i]]->o, 1, PART_LIGHTNING_FLARE, col);
+                }
 
                 if(showroutenames && getfirstroute() == idx)
                 {