diff --git a/changelog.txt b/changelog.txt index f125bd2d..212b29d2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,9 +6,10 @@ Unreleased * qbsp: include clip brushes when calculating bmodel bounding box * qbsp: enable creation of clip-only bmodels * light: implemented self shadowing and full shadows for brush models -* light: removed the "-nominlimit" option (now the default behaviour) -* light: remove support for negative color components (never worked properly) * light: implemented the "-soft" command line option +* light: remove support for negative color components (never worked properly) +* light: removed the "-nominlimit" option (now the default behaviour) +* light: removed the "-compress" option (a bad idea from long ago) * vis: changed the default testlevel to 4 2013-03-07 TyrUtils v0.6 diff --git a/include/light/light.h b/include/light/light.h index 2c277d64..710d66c2 100644 --- a/include/light/light.h +++ b/include/light/light.h @@ -113,7 +113,6 @@ extern byte *filebase; extern byte *lit_filebase; extern int oversample; -extern qboolean compress_ents; extern qboolean colored; extern qboolean litfile; diff --git a/light/entities.c b/light/entities.c index f34e6aee..1c371fdc 100644 --- a/light/entities.c +++ b/light/entities.c @@ -455,20 +455,9 @@ WriteEntitiesToString(void) end += 2; for (ep = entities[i].epairs; ep; ep = ep->next) { - if (compress_ents && !strncmp(entities[i].classname, "light", 5)) { - if (!strcmp(ep->key, "classname") || - !strcmp(ep->key, "origin") || - !strcmp(ep->key, "targetname") || - !strcmp(ep->key, "spawnflags")) { - sprintf(line, "\"%s\" \"%s\"\n", ep->key, ep->value); - strcat(end, line); - end += strlen(line); - } - } else { - sprintf(line, "\"%s\" \"%s\"\n", ep->key, ep->value); - strcat(end, line); - end += strlen(line); - } + sprintf(line, "\"%s\" \"%s\"\n", ep->key, ep->value); + strcat(end, line); + end += strlen(line); } strcat(end, "}\n"); end += 2; diff --git a/light/light.c b/light/light.c index 5fa3e157..a217c9fe 100644 --- a/light/light.c +++ b/light/light.c @@ -44,7 +44,6 @@ static modelinfo_t *modelinfo; const dmodel_t *const *tracelist; int oversample = 1; -qboolean compress_ents; qboolean colored; void @@ -243,9 +242,6 @@ main(int argc, const char **argv) fadegate = atof(argv[++i]); } else if (!strcmp(argv[i], "-light")) { minlight.light = atof(argv[++i]); - } else if (!strcmp(argv[i], "-compress")) { - compress_ents = true; - logprint("light entity compression enabled\n"); } else if (!strcmp(argv[i], "-lit")) { colored = true; } else if (!strcmp(argv[i], "-soft")) { @@ -262,7 +258,7 @@ main(int argc, const char **argv) if (i != argc - 1) { printf("usage: light [-threads num] [-light num] [-extra|-extra4]\n" " [-dist n] [-range n] [-gate n] [-lit]\n" - " [-soft [n]] [-compress] bspfile\n"); + " [-soft [n]] bspfile\n"); exit(1); }