Merge branch 'master' of https://github.com/ericwa/ericw-tools into q2-surfacelights

light/entities.cc

@@ -281,7 +281,7 @@ EntDict_CheckTargetnameKeyMatched(const mbsp_t *bsp, const entdict_t &entity, co
         }
         
         if (!found) {
-            logprint("WARNING: %s has targetname \"%s\" which is not targetted by anything.\n",
+            logprint("WARNING: %s has targetname \"%s\", which is not targeted by anything.\n",
                      EntDict_PrettyDescription(bsp, entity).c_str(),
                      targetnameVal.c_str());
             ok = false;

light/light.cc

@@ -1188,7 +1188,8 @@ light_main(int argc, const char **argv)
     
     if (!onlyents)
     {
-        CheckLitNeeded(cfg);
+        if (loadversion != Q2_BSPVERSION) //mxd. No lit for Quake 2
+            CheckLitNeeded(cfg);
         SetupDirt(cfg);
         
         LightWorld(&bspdata, !!lmscaleoverride);