Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove all references to DBP0() 

- Add Irrlicht evaluation to TODO


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@673 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2006-08-31 20:14:21 +00:00
parent 67aefda0d5
commit 2c460e920b
12 changed files with 48 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -41,7 +41,7 @@ More difficult:
- Integrate Karma's masterserver into Warzone
- Use OGRE3D for rendering?
- Use OGRE3D for rendering? Also have a look at Irrlicht? It seems to be unstable...
- Remove dependencies on sound libraries?

1
lib/framework/debug.h
View File

@ -51,7 +51,6 @@
*
*/
#define DBP0(x)
#define DBMB0(x)
#define DBP1(x)
#define DBMB1(x)

4
lib/framework/strres.c
View File

@ -140,9 +140,7 @@ void strresDestroy(STR_RES *psRes)
if (psBlock->aUsage[i - psBlock->idStart] == 0
&& i != 0 && i < psRes->nextID)
{
DBP0(("strresDestroy: String id %d not used:\n"
" \"%s\"\n",
i, psBlock->apStrings[i - psBlock->idStart]));
debug( LOG_NEVER, "strresDestroy: String id %d not used:\n \"%s\"\n", i, psBlock->apStrings[i - psBlock->idStart] );
}
#endif
if (psBlock->apStrings[i - psBlock->idStart])

4
src/action.c
View File

@ -1674,7 +1674,7 @@ void actionUpdateDroid(DROID *psDroid)
//hmmm, hope this doesn't cause any problems!
if (gameTime > psDroid->actionStarted)
{
DBP0(("sulk over.. %p\n",psDroid));
// debug( LOG_NEVER, "sulk over.. %p\n", psDroid );
psDroid->action = DACTION_NONE; // Sulking is over lets get back to the action ... is this all I need to do to get it back into the action?
}
break;
@ -2727,7 +2727,7 @@ static void actionDroidBase(DROID *psDroid, DROID_ACTION_DATA *psAction)
break;
case DACTION_SULK:
DBP0(("Go with sulk ... %p\n",psDroid));
// debug( LOG_NEVER, "Go with sulk ... %p\n", psDroid );
psDroid->action = DACTION_SULK;
//hmmm, hope this doesn't cause any problems!
//psDroid->actionStarted = gameTime; // what is action started used for ? Certainly not used here!

41
src/astar.c
View File

@ -933,8 +933,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
while (psOpen != NULL)
{
psCurr = fpathOpenGet();
DBP0(("\nStart : %3d,%3d (%d,%d) = %d\n",
psCurr->x,psCurr->y, psCurr->dist, psCurr->est, psCurr->dist + psCurr->est));
// debug( LOG_NEVER, "\nStart : %3d,%3d (%d,%d) = %d\n", psCurr->x,psCurr->y, psCurr->dist, psCurr->est, psCurr->dist + psCurr->est );
if (psCurr->x == tileFX && psCurr->y == tileFY)
{
@ -962,7 +961,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
if (fpathBlockingTile(x,y))
{
// tile is blocked, skip it
DBP0(("blocked : %3d, %3d\n", x,y));
// debug( LOG_NEVER, "blocked : %3d, %3d\n", x, y );
continue;
}
@ -971,7 +970,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
if (psOFound && psOFound->dist <= currDist)
{
// already in the open list by a shorter route
DBP0(("blocked open : %3d, %3d dist %d\n", x,y, currDist));
// debug( LOG_NEVER, "blocked open : %3d, %3d dist %d\n", x, y, currDist );
continue;
}
@ -982,7 +981,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
if (psCFound && psCFound->dist <= currDist)
{
// already in the closed list by a shorter route
DBP0(("blocked closed : %3d, %3d dist %d\n", x,y, currDist));
// debug( LOG_NEVER, "blocked closed : %3d, %3d dist %d\n", x, y, currDist );
continue;
}
@ -996,8 +995,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
psNew->est = fpathEstimate(x,y, tileFX, tileFY);
fpathOpenAdd(psNew);
fpathHashAdd(apsOpen, psNew);
DBP0(("new : %3d, %3d (%d,%d) = %d\n",
x,y, currDist, psNew->est, currDist + psNew->est));
// debug( LOG_NEVER, "new : %3d, %3d (%d,%d) = %d\n", x, y, currDist, psNew->est, currDist + psNew->est );
}
else if (psOFound && !psCFound)
{
@ -1009,8 +1007,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
psOFound->psRoute = psCurr;
fpathOpenAdd(psOFound);
fpathHashAdd(apsOpen, psOFound);
DBP0(("replace open : %3d, %3d dist %d\n",
x,y, currDist, psOFound->est, currDist + psOFound->est));
// debug( LOG_NEVER, "replace open : %3d, %3d dist %d\n", x, y, currDist, psOFound->est, currDist + psOFound->est );
}
else if (!psOFound && psCFound)
{
@ -1019,8 +1016,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
psCFound->psRoute = psCurr;
fpathOpenAdd(psCFound);
fpathHashAdd(apsOpen, psCFound);
DBP0(("replace closed : %3d, %3d dist %d\n",
x,y, currDist, psCFound->est, currDist + psCFound->est));
// debug( _LOG_NEVER, "replace closed : %3d, %3d dist %d\n", x, y, currDist, psCFound->est, currDist + psCFound->est );
}
else
{
@ -1034,8 +1030,7 @@ BOOL fpathAStarRoute(ASTAR_ROUTE *psRoutePoints,
// add the current point to the closed nodes
fpathHashRemove(apsOpen, psCurr->x, psCurr->y);
fpathHashAdd(apsClosed, psCurr);
DBP0(("HashAdd - closed : %3d,%3d (%d,%d) = %d\n",
psCurr->x,psCurr->y, psCurr->dist, psCurr->est, psCurr->dist+psCurr->est));
// debug( LOG_NEVER, "HashAdd - closed : %3d,%3d (%d,%d) = %d\n", psCurr->x, psCurr->y, psCurr->dist, psCurr->est, psCurr->dist+psCurr->est );
}
// optimise the route if one was found
@ -1139,8 +1134,7 @@ static FP_NODE *psNearest, *psRoute;
}
psCurr = fpathOpenGet();
DBP0(("\nStart : %3d,%3d (%d,%d) = %d\n",
psCurr->x,psCurr->y, psCurr->dist, psCurr->est, psCurr->dist + psCurr->est));
// debug( LOG_NEVER, "\nStart : %3d,%3d (%d,%d) = %d\n", psCurr->x, psCurr->y, psCurr->dist, psCurr->est, psCurr->dist + psCurr->est );
if (psCurr->x == tileFX && psCurr->y == tileFY)
{
@ -1178,8 +1172,7 @@ static FP_NODE *psNearest, *psRoute;
if (psFound && psFound->dist <= currDist)
{
// already visited node by a shorter route
DBP0(("blocked (%d) : %3d, %3d dist %d\n",
psFound->type, x,y, currDist));
// debug( LOG_NEVER, "blocked (%d) : %3d, %3d dist %d\n", psFound->type, x, y, currDist );
continue;
}
@ -1187,7 +1180,7 @@ static FP_NODE *psNearest, *psRoute;
if (!psFound && fpathBlockingTile(x,y))
{
// tile is blocked, skip it
DBP0(("blocked : %3d, %3d\n", x,y));
// debug( LOG_NEVER, "blocked : %3d, %3d\n", x, y );
continue;
}
@ -1203,8 +1196,7 @@ static FP_NODE *psNearest, *psRoute;
psNew->est = (SWORD)fpathEstimate(x,y, tileFX, tileFY);
fpathOpenAdd(psNew);
fpathHashAdd(apsNodes, psNew);
DBP0(("new : %3d, %3d (%d,%d) = %d\n",
x,y, currDist, psNew->est, currDist + psNew->est));
// debug( LOG_NEVER, "new : %3d, %3d (%d,%d) = %d\n", x, y, currDist, psNew->est, currDist + psNew->est );
}
}
else if (psFound->type == NT_OPEN)
@ -1214,8 +1206,7 @@ static FP_NODE *psNearest, *psRoute;
// already in the open list but this is shorter
psFound->dist = (SWORD)currDist;
psFound->psRoute = psCurr;
DBP0(("replace open : %3d, %3d dist %d\n",
x,y, currDist, psFound->est, currDist + psFound->est));
// debug( LOG_NEVER, "replace open : %3d, %3d dist %d\n", x, y, currDist, psFound->est, currDist + psFound->est );
}
else if (psFound->type == NT_CLOSED)
{
@ -1224,8 +1215,7 @@ static FP_NODE *psNearest, *psRoute;
psFound->dist = (SWORD)currDist;
psFound->psRoute = psCurr;
fpathOpenAdd(psFound);
DBP0(("replace closed : %3d, %3d dist %d\n",
x,y, currDist, psFound->est, currDist + psFound->est));
// debug( LOG_NEVER, "replace closed : %3d, %3d dist %d\n", x, y, currDist, psFound->est, currDist + psFound->est );
}
else
{
@ -1240,8 +1230,7 @@ static FP_NODE *psNearest, *psRoute;
// fpathHashRemove(apsOpen, psCurr->x, psCurr->y);
// fpathHashAdd(apsClosed, psCurr);
psCurr->type = NT_CLOSED;
DBP0(("HashAdd - closed : %3d,%3d (%d,%d) = %d\n",
psCurr->x,psCurr->y, psCurr->dist, psCurr->est, psCurr->dist+psCurr->est));
// debug( LOG_NEVER, "HashAdd - closed : %3d,%3d (%d,%d) = %d\n", psCurr->x, psCurr->y, psCurr->dist, psCurr->est, psCurr->dist+psCurr->est );
}

6
src/cluster.c
View File

@ -197,9 +197,9 @@ void clustRemoveObject(BASE_OBJECT *psObj)
aClusterMap[i] = 0;
if (i != 0)
{
DBP0(("Cluster %d empty: ", i));
DBP0(("%s ", (psObj->type == OBJ_DROID) ? "Unit" : ((psObj->type == OBJ_STRUCTURE) ? "Struct" : "Feat") ));
DBP0(("id %d player %d\n", psObj->id, psObj->player));
// debug( LOG_NEVER, "Cluster %d empty: ", i );
// debug( LOG_NEVER, "%s ", (psObj->type == OBJ_DROID) ? "Unit" : ( (psObj->type == OBJ_STRUCTURE) ? "Struct" : "Feat") );
// debug( LOG_NEVER, "id %d player %d\n", psObj->id, psObj->player );
aClusterEmpty[i] = TRUE;
}
}

7
src/formation.c
View File

@ -120,8 +120,7 @@ BOOL formationNew(FORMATION **ppsFormation, FORMATION_TYPE type,
return FALSE;
}
DBP0(("formationNew: type %d, at (%d,%d), dir %d\n",
type, x,y, dir));
// debug( LOG_NEVER, "formationNew: type %d, at (%d,%d), dir %d\n", type, x, y, dir );
// initialise it
psNew->refCount = 0;
@ -242,7 +241,7 @@ void formationJoin(FORMATION *psFormation, BASE_OBJECT *psObj)
ASSERT( PTRVALID(psFormation, sizeof(FORMATION)),
"formationJoin: invalid formation" );
DBP0(("formationJoin: %p, obj %d\n", psFormation, psObj->id));
// debug( LOG_NEVER, "formationJoin: %p, obj %d\n", psFormation, psObj->id );
psFormation->refCount += 1;
@ -275,7 +274,7 @@ void formationLeave(FORMATION *psFormation, BASE_OBJECT *psObj)
ASSERT( psFormation->refCount > 0,
"formationLeave: refcount is zero" );
DBP0(("formationLeave: %p, obj %d\n", psFormation, psObj->id));
// debug( LOG_NEVER, "formationLeave: %p, obj %d\n", psFormation, psObj->id );
asMembers = psFormation->asMembers;

16
src/fpath.c
View File

@ -1345,7 +1345,7 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
if (startX == targetX && startY == targetY)
{
// return failed to stop them moving anywhere
DBP0(("Unit %d: route failed (same pos)\n", psDroid->id));
// debug( LOG_NEVER, "Unit %d: route failed (same pos)\n", psDroid->id );
return FPR_FAILED;
}
@ -1423,7 +1423,7 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
{
// surrounded by blocking tiles, give up
retVal = FPR_FAILED;
DBP0(("Unit %d: route failed (surrouned by blocking)\n", psDroid->id));
// debug( LOG_NEVER, "Unit %d: route failed (surrouned by blocking)\n", psDroid->id );
goto exit;
}
else
@ -1455,10 +1455,10 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
// no obstructions - trivial route
fpathSetDirectRoute( psObj, targetX, targetY );
retVal = FPR_OK;
DBP0(("Unit %d: trivial route\n", psDroid->id));
// debug( LOG_NEVER, "Unit %d: trivial route\n", psDroid->id );
if (psPartialRouteObj != NULL)
{
DBP0(("Unit %d: trivial route during multi-frame route\n"));
// debug( LOG_NEVER, "Unit %d: trivial route during multi-frame route\n" );
}
goto exit;
}
@ -1475,10 +1475,10 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
// see if there is another unit with a usable route
if (fpathFindRoute((DROID *)psDroid, startX,startY, targetX,targetY))
{
DBP0(("Unit %d: found route\n", psDroid->id));
// debug( LOG_NEVER, "Unit %d: found route\n", psDroid->id );
if (psPartialRouteObj != NULL)
{
DBP0(("Unit %d: found route during multi-frame route\n"));
// debug( LOG_NEVER, "Unit %d: found route during multi-frame route\n" );
}
goto exit;
}
@ -1504,7 +1504,7 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
}
else
{
DBP0(("Unit %d: reschedule\n"));
// debug( LOG_NEVER, "Unit %d: reschedule\n" );
retVal = FPR_RESCHEDULE;
goto exit;
}
@ -1519,7 +1519,7 @@ FPATH_RETVAL fpathRoute(BASE_OBJECT *psObj, MOVE_CONTROL *psMoveCntl,
goto exit;
}
DBP0(("Unit %d: ", psObj->id));
// debug( LOG_NEVER, "Unit %d: ", psObj->id );
if (psPartialRouteObj == NULL)
{
retVal = fpathGatewayRoute(psObj, ASR_NEWROUTE, GWTerrain,

6
src/gateway.c
View File

@ -845,11 +845,7 @@ BOOL gwLinkGateways(void)
if (bAddLink)
{
DBP0(("Linking %sgateway (%d,%d)->(%d,%d) through %s to gateway (%d,%d)->(%d,%d)\n",
(psCurr->flags & GWR_WATERLINK) ? "water " : "",
psCurr->x1,psCurr->y1, psCurr->x2,psCurr->y2,
bZone1 ? "zone1" : "zone2",
psLink->x1,psLink->y1, psLink->x2,psLink->y2));
// debug( LOG_NEVER, "Linking %sgateway (%d,%d)->(%d,%d) through %s to gateway (%d,%d)->(%d,%d)\n", (psCurr->flags & GWR_WATERLINK) ? "water " : "", psCurr->x1,psCurr->y1, psCurr->x2, psCurr->y2, bZone1 ? "zone1" : "zone2", psLink->x1, psLink->y1, psLink->x2, psLink->y2 );
psCurr->psLinks[link].psGateway = psLink;
psCurr->psLinks[link].flags = 0;

21
src/gatewayroute.c
View File

@ -11,11 +11,6 @@
#include "lib/framework/frame.h"
BOOL gwrDoMessage;
#undef DBP0
#define DBP0( x ) \
if (gwrDoMessage) \
debug( LOG_ERROR, x )
#include "map.h"
#include "gateway.h"
@ -243,15 +238,14 @@ SDWORD gwrAStarRoute(SDWORD player, UDWORD terrain,
while (psOpenList != NULL)
{
psCurr = gwrOpenGet();
DBP0(("processing gateway (%d,%d)->(%d,%d)\n",
psCurr->x1,psCurr->y1, psCurr->x2,psCurr->y2));
// debug( LOG_NEVER, "processing gateway (%d,%d)->(%d,%d)\n", psCurr->x1, psCurr->y1, psCurr->x2, psCurr->y2 );
if (psCurr->zone1 == finalZone || psCurr->zone2 == finalZone ||
((psCurr->flags & GWR_WATERLINK) && gwZoneInEquiv(psCurr->zone1, finalZone)))
{
// reached the target
psRoute = psCurr;
DBP0(("Found route\n"));
// debug( LOG_NEVER, "Found route\n" );
break;
}
@ -312,22 +306,19 @@ SDWORD gwrAStarRoute(SDWORD player, UDWORD terrain,
psNew->psRoute = psCurr;
psNew->flags |= (psNew->zone1 == zone) ? GWR_ZONE1 : GWR_ZONE2;
gwrOpenAdd(psNew);
DBP0(("new gateway (%d,%d)->(%d,%d) dist %d est %d\n",
psNew->x1, psNew->y1, psNew->x2, psNew->y2, psNew->dist, psNew->est));
// debug( LOG_NEVER, "new gateway (%d,%d)->(%d,%d) dist %d est %d\n", psNew->x1, psNew->y1, psNew->x2, psNew->y2, psNew->dist, psNew->est );
}
else if (psNew->flags & GWR_OPEN)
{
// already in the open list but this is shorter
DBP0(("new route to open gateway (%d,%d)->(%d,%d) dist %d->%d est %d\n",
psNew->x1, psNew->y1, psNew->x2, psNew->y2, currDist, psNew->dist, psNew->est));
// debug( LOG_NEVER, "new route to open gateway (%d,%d)->(%d,%d) dist %d->%d est %d\n", psNew->x1, psNew->y1, psNew->x2, psNew->y2, currDist, psNew->dist, psNew->est );
psNew->dist = (SWORD)currDist;
psNew->psRoute = psCurr;
}
else if (psNew->flags & GWR_CLOSED)
{
// already in the closed list but this is shorter
DBP0(("new route to closed gateway (%d,%d)->(%d,%d) dist %d->%d est %d\n",
psNew->x1, psNew->y1, psNew->x2, psNew->y2, currDist, psNew->dist, psNew->est));
// debug( LOG_NEVER, "new route to closed gateway (%d,%d)->(%d,%d) dist %d->%d est %d\n", psNew->x1, psNew->y1, psNew->x2, psNew->y2, currDist, psNew->dist, psNew->est );
psNew->dist = (SWORD)currDist;
psNew->psRoute = psCurr;
gwrOpenAdd(psNew);
@ -344,7 +335,7 @@ SDWORD gwrAStarRoute(SDWORD player, UDWORD terrain,
retval = GWR_OK;
if (psRoute == NULL)
{
DBP0(("Partial route\n"));
// debug( LOG_NEVER, "Partial route\n" );
psRoute = psNearest;
retval = GWR_NEAREST;
}

14
src/order.c
View File

@ -4223,7 +4223,7 @@ void orderMoralCheck(UDWORD player)
// too many units, don't run
return;
}
DBP0(("moral check for player %d\n", player));
// debug( LOG_NEVER, "moral check for player %d\n", player );
// calculate the overall leadership
leadership = asRunData[player].leadership + 10;
@ -4248,7 +4248,7 @@ void orderMoralCheck(UDWORD player)
{
if (check > personLShip)
{
DBP0((" DORDER_RUN: droid %d\n", psCurr->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psCurr->id );
orderDroid(psCurr, DORDER_RUN);
}
}
@ -4256,7 +4256,7 @@ void orderMoralCheck(UDWORD player)
{
if (check > leadership)
{
DBP0((" DORDER_RUN: droid %d\n", psCurr->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psCurr->id );
orderDroid(psCurr, DORDER_RUN);
}
}
@ -4312,7 +4312,7 @@ void orderGroupMoralCheck(DROID_GROUP *psGroup)
{
if (check > personLShip)
{
DBP0((" DORDER_RUN: droid %d\n", psCurr->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psCurr->id );
orderDroidLoc(psCurr, DORDER_RUN, psRunData->sPos.x, psRunData->sPos.y);
}
}
@ -4320,7 +4320,7 @@ void orderGroupMoralCheck(DROID_GROUP *psGroup)
{
if (check > leadership)
{
DBP0((" DORDER_RUN: droid %d\n", psCurr->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psCurr->id );
orderDroidLoc(psCurr, DORDER_RUN, psRunData->sPos.x, psRunData->sPos.y);
}
}
@ -4427,7 +4427,7 @@ void orderHealthCheck(DROID *psDroid)
orderState(psDroid, DORDER_RTR) ||
orderState(psDroid, DORDER_DESTRUCT)))
{
DBP0((" DORDER_RUN: droid %d\n", psDroid->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psDroid->id );
orderDroidLoc(psDroid, DORDER_RUN, retreatX, retreatY);
}
@ -4447,7 +4447,7 @@ void orderHealthCheck(DROID *psDroid)
continue;
}
DBP0((" DORDER_RUN: droid %d\n", psCurr->id));
// debug( LOG_NEVER, " DORDER_RUN: droid %d\n", psCurr->id );
orderDroidLoc(psCurr, DORDER_RUN, retreatX, retreatY);
}
}

3
src/scriptai.c
View File

@ -88,8 +88,7 @@ BOOL scrGroupAddArea(void)
return FALSE;
}
DBP0(("groupAddArea: player %d (%d,%d) -> (%d,%d)\n", player,
x1,y1,x2,y2));
// debug( LOG_SCRIPT, "groupAddArea: player %d (%d,%d) -> (%d,%d)\n", player, x1, y1, x2, y2 );
for(psDroid=apsDroidLists[player]; psDroid; psDroid=psDroid->psNext)
{