ref: d47b25596139c9aa4571001653006c1b2f1845f0
parent: 03e7d48000274c1027291c173b3e2d809c3a9aea
author: Marc-Alexandre Espiaut <marcalexandre@member.fsf.org>
date: Tue Jun 5 08:13:11 EDT 2018
Removing obsolete *TEST code from rt_door.c
--- a/rott/rt_door.c
+++ b/rott/rt_door.c
@@ -105,33 +105,6 @@
DeactivateLight
};
-#if ((DEVELOPMENT == 1))
-#if ((LOADSAVETEST == 1))
-static char*touchstrings[NUMTOUCHPLATEACTIONS] =
-{ "ActivatePushWall",- "ActivateMoveWall",
- "LinkedOpenDoor",
- "LinkedCloseDoor",
- "EnableObject",
- "DisableObject",
- "ActivateLight",
- "DeactivateLight"
-};
-#endif
-#endif
-#if ((DEVELOPMENT == 1))
-#if ((ELEVATORTEST == 1))
-
-static char*elevstring[NUMELEVATORACTIONS] =
-{ "ready at source",- "ready at destination",
- "moving to source",
- "moving to destination",
- "doorclosing"
-};
-#endif
-#endif
-
void UtilizeDoor (int door,void (*action)(int));
void UseDoor (int door);
void Teleport(elevator_t*eptr,int destination);
@@ -346,39 +319,8 @@
memcpy(tptr,&numactions[0],sizeof(numactions));
tptr+=sizeof(numactions);
-#if ((DEVELOPMENT == 1))
-#if (LOADSAVETEST == 1)
- Debug("\n\nSAVE INFO\n");- Debug("---------");-
- Debug("\n\nTOUCHINDICES\n");- Debug("------------\n\n");- for(i=0; i<MAPSIZE; i++)
- for(j=0; j< MAPSIZE; j++)
- if (touchindices[i][j])
- Debug("\ntouchindices[%3d][%3d]: %d",i,j,touchindices[i][j]);-
- Debug("\n\nTRIGGER: ");- for(i=0; i<(sizeof(TRIGGER)/sizeof(TRIGGER[0])); i++)
- if (TRIGGER[i])
- Debug("%1d",TRIGGER[i]);- Debug("\n\nNUMACTIONS PER TOUCHPLATE\n");- Debug("-------------------------\n\n");- for(i=0; i<(sizeof(numactions)/sizeof(numactions[0])); i++)
- if (numactions[i])
- Debug("\n %2d: %2d",i,numactions[i]);-#endif
-#endif
-
for(i=0; i<lasttouch; i++)
{-#if ((DEVELOPMENT == 1))
-#if (LOADSAVETEST == 1)
- Debug("\n\nTOUCHPLATE[%2d]\n",i);- Debug("--------------\n\n");-#endif
-#endif
-
for(k=0,temp=touchplate[i]; temp; k++,temp = temp->nextaction)
{dummy.tictime = temp->tictime;
@@ -416,27 +358,6 @@
else
dummy.whichobj = temp->whichobj;
-#if ((DEVELOPMENT == 1))
-#if (LOADSAVETEST == 1)
- Debug("action node %d: tictime: %d, ticcount: %d ",k,dummy.tictime,dummy.ticcount);- if (dummy.actionindex == -1)
- Debug("action: -1,");- else
- Debug("action: %13s,",touchstrings[dummy.actionindex]);-
- if (dummy.swapactionindex == -1)
- Debug("swapaction: -1,");- else
- Debug("swapaction: %13s,",touchstrings[dummy.swapactionindex]);-
- if (dummy.whichobj & FL_TACT)
- Debug("whichobj (actor): %4x\n",(dummy.whichobj & ~FL_TACT));- else
- Debug("whichobj (nonactor): %4x\n",dummy.whichobj);-#endif
-#endif
-
-
memcpy(tptr,&dummy,sizeof(saved_touch_type));
tptr+=sizeof(saved_touch_type);
}
@@ -525,53 +446,6 @@
}
}
-
-#if ((DEVELOPMENT == 1))
-#if (LOADSAVETEST == 1)
- Debug("\n\nLOAD INFO\n");- Debug("---------");-
- Debug("\n\nTOUCHINDICES\n");- Debug("------------\n\n");- for(i=0; i<MAPSIZE; i++)
- for(j=0; j< MAPSIZE; j++)
- if (touchindices[i][j])
- Debug("\ntouchindices[%3d][%3d]: %d",i,j,touchindices[i][j]);-
- Debug("\n\nTRIGGER: ");- for(i=0; i<(sizeof(TRIGGER)/sizeof(TRIGGER[0])); i++)
- if (TRIGGER[i])
- Debug("%1d",TRIGGER[i]);- Debug("\n\nNUMACTIONS PER TOUCHPLATE\n");- Debug("-------------------------\n\n");- for(i=0; i<(sizeof(numactions)/sizeof(numactions[0])); i++)
- if (numactions[i])
- Debug("\n %2d: %2d",i,numactions[i]);-
- for(i=0; i<lasttouch; i++)
- {- Debug("\n\nTOUCHPLATE[%2d]\n",i);- Debug("--------------\n\n");-
- for(k=0,temp=touchplate[i]; temp; k++,temp = temp->nextaction)
- {- Debug("action node %d: tictime: %d, ticcount: %d ",k,temp->tictime,temp->ticcount);- if (!temp->action)
- Debug("action: NULL,");- else
- Debug("action: %13s,",touchstrings[GetIndexForAction(temp->action)]);-
- if (!temp->swapaction)
- Debug("swapaction: NULL,");- else
- Debug("swapaction: %13s,",touchstrings[GetIndexForAction(temp->swapaction)]);-
- Debug("whichobj: %4x\n",(int)temp->whichobj);- }
- }
-#endif
-#endif
-
SafeFree(objlist);
}
@@ -3037,11 +2911,6 @@
if (dnum == eptr->door1)
{eptr->nextaction = ev_mts;//eptr->doortoopen = eptr->door1;
- #if (DEVELOPMENT == 1)
- #if (ELEVATORTEST == 1)
- Debug("\nplayer at source requesting elev %d mtd",dptr->eindex);- #endif
- #endif
}
break;
@@ -3049,11 +2918,6 @@
if (dnum == eptr->door2)
{eptr->nextaction = ev_mtd;//eptr->doortoopen = eptr->door2;
- #if (DEVELOPMENT == 1)
- #if (ELEVATORTEST == 1)
- Debug("\nplayer at dest requesting elev %d mts",dptr->eindex);- #endif
- #endif
}
break;
*/
@@ -3061,11 +2925,6 @@
if ((dnum == eptr->door1) && (eptr->nextaction != ev_mts)) // process request, lock doors,
{-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nplayer at source requesting elev %d rad",dptr->eindex);-#endif
-#endif
// start moving to current loc;
SetNextAction(eptr,0); // if already there, do nothing
@@ -3075,11 +2934,6 @@
case ev_ras:
if ((dnum == eptr->door2) && (eptr->nextaction != ev_mtd))
{-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nplayer at dest requesting elev %d ras",dptr->eindex);-#endif
-#endif
SetNextAction(eptr,1);
}
@@ -3096,21 +2950,11 @@
else //else prepare for movement
{ if ((eptr->door1 == dnum) && (eptr->nextaction != ev_mts)) {-#if ((DEVELOPMENT == 1))
-#if ((ELEVATORTEST == 1))
- Debug("\nplayer at source requesting elev %d dc",dptr->eindex);-#endif
-#endif
SetNextAction(eptr,0);
}
else if ((eptr->door2 == dnum) && (eptr->nextaction != ev_mtd))
{-#if ((DEVELOPMENT == 1))
-#if ((ELEVATORTEST == 1))
- Debug("\nplayer at dest requesting elev %d dc",dptr->eindex);-#endif
-#endif
SetNextAction(eptr,1);
}
@@ -3143,11 +2987,6 @@
eptr->state = ev_doorclosing;
eptr->doorclosing = dn;
-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nCloseDoor %d",dn);-#endif
-#endif
if (doorobjlist[dn]->action != dr_closed)
CloseDoor(dn);
doorobjlist[dn]->flags |= DF_ELEVLOCKED;
@@ -3165,11 +3004,6 @@
if ((eptr->state == ev_mts) ||
(eptr->state == ev_mtd))
{-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nobj %d tried to use elevator %d switch while in use",ob->obclass,elevnum);-#endif
-#endif
return;
}
@@ -3179,21 +3013,11 @@
(abs(ob->tiley-door->tiley)<=1))
{ if (!SetNextAction(eptr,1)) // set next to destreturn;
-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nswitch at src %d flipped",elevnum);-#endif
-#endif
eptr->ticcount = 0;
}
else //switch at dest
{ if (!SetNextAction(eptr,0)) // set next to srcreturn;
-#if (DEVELOPMENT == 1)
-#if (ELEVATORTEST == 1)
- Debug("\nswitch at dest %d flipped",elevnum);-#endif
-#endif
eptr->ticcount = 0;
}