# HG changeset patch # User Matti Hamalainen # Date 1317030517 -10800 # Node ID 55d2e718bb28f557ba292098e7297b62914e2fa3 # Parent 8cf53c768138b45ee06656541afbcebc0c4b8c42 Cosmetic cleanups. diff -r 8cf53c768138 -r 55d2e718bb28 src/checks.cc --- a/src/checks.cc Mon Sep 26 12:48:29 2011 +0300 +++ b/src/checks.cc Mon Sep 26 12:48:37 2011 +0300 @@ -184,6 +184,7 @@ maxlen = 44; else maxlen = 27; + if (strlen(prompt1) > maxlen) maxlen = strlen(prompt1); if (prompt2 && strlen(prompt2) > maxlen) @@ -320,7 +321,7 @@ these ideas, don't forget to credit DEU... Just a reminder... :-) */ -/* now check if all SideDefs are facing a sidedef with the same Sector number */ + /* now check if all SideDefs are facing a sidedef with the same Sector number */ for (n = 0; n < NumLineDefs; n++) { sd = LineDefs[n].sidedef1; @@ -384,7 +385,6 @@ /* check cross-references and delete unused objects */ - void CheckCrossReferences() /* SWAP! */ { char msg[80]; @@ -610,8 +610,7 @@ if (InvalidTextureName(Sectors[n].ceilt)) { sprintf(msg1, "Error: sector #%d has no ceiling texture", n); - sprintf(msg2, - "You probably used a brain-damaged editor to do that..."); + sprintf(msg2, "You probably used a brain-damaged editor to do that..."); CheckFailed(-1, -1, msg1, msg2, 1, first_time); GoToObject(Objid(OBJ_SECTORS, n)); return; @@ -619,19 +618,15 @@ if (InvalidTextureName(Sectors[n].floort)) { sprintf(msg1, "Error: sector #%d has no floor texture", n); - sprintf(msg2, - "You probably used a brain-damaged editor to do that..."); + sprintf(msg2, "You probably used a brain-damaged editor to do that..."); CheckFailed(-1, -1, msg1, msg2, 1, first_time); GoToObject(Objid(OBJ_SECTORS, n)); return; } if (Sectors[n].ceilh < Sectors[n].floorh) { - sprintf(msg1, - "Error: sector #%d has its ceiling lower than its floor", - n); - sprintf(msg2, - "The textures will never be displayed if you cannot go there"); + sprintf(msg1, "Error: sector #%d has its ceiling lower than its floor", n); + sprintf(msg2, "The textures will never be displayed if you cannot go there"); CheckFailed(-1, -1, msg1, msg2, 1, first_time); GoToObject(Objid(OBJ_SECTORS, n)); return; @@ -640,8 +635,7 @@ if (Sectors[n].ceilh - Sectors[n].floorh > 1023) { sprintf(msg1, "Error: sector #%d has its ceiling too high", n); - sprintf(msg2, - "The maximum difference allowed is 1023 (ceiling - floor)"); + sprintf(msg2, "The maximum difference allowed is 1023 (ceiling - floor)"); CheckFailed(-1, -1, msg1, msg2, 1, first_time); GoToObject(Objid(OBJ_SECTORS, n)); return; @@ -653,14 +647,17 @@ { sd1 = LineDefs[n].sidedef1; sd2 = LineDefs[n].sidedef2; + if (sd1 >= 0) s1 = SideDefs[sd1].sector; else s1 = OBJ_NO_NONE; + if (sd2 >= 0) s2 = SideDefs[sd2].sector; else s2 = OBJ_NO_NONE; + if (is_obj(s1) && !is_obj(s2)) { if (InvalidTextureName(SideDefs[sd1].tex3)) @@ -680,6 +677,7 @@ CheckingObjects(); } } + if (is_obj(s1) && is_obj(s2) && Sectors[s1].ceilh > Sectors[s2].ceilh) { if (InvalidTextureName(SideDefs[sd1].tex1) && @@ -700,6 +698,7 @@ CheckingObjects(); } } + if (is_obj(s1) && is_obj(s2) && Sectors[s1].floorh < Sectors[s2].floorh) { @@ -720,6 +719,7 @@ CheckingObjects(); } } + if (is_obj(s1) && is_obj(s2) && Sectors[s2].ceilh > Sectors[s1].ceilh) { if (InvalidTextureName(SideDefs[sd2].tex1) && @@ -740,6 +740,7 @@ CheckingObjects(); } } + if (is_obj(s1) && is_obj(s2) && Sectors[s2].floorh < Sectors[s1].floorh) { @@ -775,6 +776,7 @@ for (n = 0; n < numelems; n++) if (!y_strnicmp(name, list[n], WAD_TEX_NAME)) return true; + return false; }