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

Patch by Gerard Krol: misc 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@803 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2006-11-02 20:55:19 +00:00
parent 3ea3f99f73
commit de058ca669
7 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/script/interp.c
View File

@ -125,7 +125,7 @@ BOOL interpTrace;
/* Print out trace info if tracing is turned on */
#define TRCPRINTF(x) \
if (interpTrace) \
debug( LOG_NEVER, x)
debug( LOG_NEVER, (#x))
#define TRCPRINTVAL(x) \
if (interpTrace) \

2
src/fpath.c
View File

@ -18,7 +18,7 @@ BOOL fpathDoMessage;
#undef DBP2
#define DBP2( x ) \
if (fpathDoMessage) \
debug( LOG_NEVER, x )
debug( LOG_NEVER, (#x) )
#include "objects.h"
#include "map.h"

2
src/multilimit.c
View File

@ -324,7 +324,7 @@ void runLimitScreen(void)
void createLimitSet(void)
{
UDWORD i,numchanges;
void *pChanges;
UBYTE *pChanges;
UBYTE *pEntry;
if(ingame.numStructureLimits) // free the old set if required.

4
src/objmem.c
View File

@ -331,7 +331,7 @@ void objmemUpdate(void)
#define CREATE(plyr, heap, new, objType, structType) \
ASSERT( plyr<MAX_PLAYERS, "addObject: invalid player number" ); \
if (!HEAP_ALLOC(heap, (void*) new)) \
if (!HEAP_ALLOC(heap, (void**)new)) \
{ \
return FALSE; \
} \
@ -619,7 +619,7 @@ BOOL createFlagPosition(FLAG_POSITION **ppsNew, UDWORD player)
{
ASSERT( player<MAX_PLAYERS, "createFlagPosition: invalid player number" );
if (!HEAP_ALLOC(psFlagPosHeap, (void*) ppsNew))
if (!HEAP_ALLOC(psFlagPosHeap, (void**) ppsNew))
{
return FALSE;
}

47
src/order.c
View File

@ -728,7 +728,7 @@ if(!bMultiPlayer || myResponsibility(psDroid->player))
orderDroid(psDroid, DORDER_STOP);
psDroid->psTarget = NULL;
psDroid->psTarStats = NULL;
secondarySetState(psDroid, DSO_RETURN_TO_LOC, 0);
secondarySetState(psDroid, DSO_RETURN_TO_LOC, DSS_NONE);
}
}
else if(psDroid->action == DACTION_NONE)
@ -767,7 +767,7 @@ if(!bMultiPlayer || myResponsibility(psDroid->player))
if (psDroid->action == DACTION_NONE)
{
psDroid->order = DORDER_NONE;
secondarySetState(psDroid, DSO_RETURN_TO_LOC, 0);
secondarySetState(psDroid, DSO_RETURN_TO_LOC, DSS_NONE);
}
break;
case DORDER_LEAVEMAP:
@ -2781,7 +2781,7 @@ DROID_ORDER chooseOrderLoc(DROID *psDroid, UDWORD x,UDWORD y)
state == DSS_PATROL_SET)
{
order = DORDER_PATROL;
secondarySetState(psDroid, DSO_PATROL, 0);
secondarySetState(psDroid, DSO_PATROL, DSS_NONE);
}
return order;
@ -3449,37 +3449,37 @@ BOOL secondarySupported(DROID *psDroid, SECONDARY_ORDER sec)
// get the state of a secondary order, return FALSE if unsupported
BOOL secondaryGetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE *pState)
{
UDWORD state;
SECONDARY_STATE state;
state = psDroid->secondaryOrder;
switch (sec)
{
case DSO_ATTACK_RANGE:
*pState = state & DSS_ARANGE_MASK;
*pState = (SECONDARY_STATE)(state & DSS_ARANGE_MASK);
break;
case DSO_REPAIR_LEVEL:
*pState = state & DSS_REPLEV_MASK;
*pState = (SECONDARY_STATE)(state & DSS_REPLEV_MASK);
break;
case DSO_ATTACK_LEVEL:
*pState = state & DSS_ALEV_MASK;
*pState = (SECONDARY_STATE)(state & DSS_ALEV_MASK);
break;
case DSO_ASSIGN_PRODUCTION:
case DSO_ASSIGN_CYBORG_PRODUCTION:
case DSO_ASSIGN_VTOL_PRODUCTION:
*pState = state & DSS_ASSPROD_MASK;
*pState = (SECONDARY_STATE)(state & DSS_ASSPROD_MASK);
break;
case DSO_RECYCLE:
*pState = state & DSS_RECYCLE_MASK;
*pState = (SECONDARY_STATE)(state & DSS_RECYCLE_MASK);
break;
case DSO_PATROL:
*pState = state & DSS_PATROL_MASK;
*pState = (SECONDARY_STATE)(state & DSS_PATROL_MASK);
break;
case DSO_HALTTYPE:
*pState = state & DSS_HALT_MASK;
*pState = (SECONDARY_STATE)(state & DSS_HALT_MASK);
break;
case DSO_RETURN_TO_LOC:
*pState = state & DSS_RTL_MASK;
*pState = (SECONDARY_STATE)(state & DSS_RTL_MASK);
break;
case DSO_FIRE_DESIGNATOR:
// *pState = state & DSS_FIREDES_MASK;
@ -3489,11 +3489,11 @@ BOOL secondaryGetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE *pSt
}
else
{
*pState = 0;
*pState = DSS_NONE;
}
break;
default:
*pState = 0;
*pState = DSS_NONE;
break;
}
@ -3541,24 +3541,25 @@ STRING *secondaryPrintFactories(UDWORD state)
void secondaryCheckDamageLevel(DROID *psDroid)
{
SECONDARY_STATE State;
unsigned int repairLevel;
if( secondaryGetState(psDroid, DSO_REPAIR_LEVEL, &State) )
{
if (State == DSS_REPLEV_LOW)
{
State = REPAIRLEV_HIGH; //repair often
repairLevel = REPAIRLEV_HIGH; //repair often
}
else if(State == DSS_REPLEV_HIGH)
{
State = REPAIRLEV_LOW; // don't repair often.
repairLevel = REPAIRLEV_LOW; // don't repair often.
}
else
{
State = 0; //never repair
repairLevel = 0; //never repair
}
//don't bother checking if 'do or die'
if( State && (SDWORD)(PERCENT(psDroid->body,psDroid->originalBody)) <= State)
if( repairLevel && PERCENT(psDroid->body,psDroid->originalBody) <= repairLevel)
{
if (psDroid->selected)
{
@ -4537,19 +4538,19 @@ BOOL getFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE *
switch (sec)
{
case DSO_ATTACK_RANGE:
*pState = state & DSS_ARANGE_MASK;
*pState = (SECONDARY_STATE)(state & DSS_ARANGE_MASK);
break;
case DSO_REPAIR_LEVEL:
*pState = state & DSS_REPLEV_MASK;
*pState = (SECONDARY_STATE)(state & DSS_REPLEV_MASK);
break;
case DSO_ATTACK_LEVEL:
*pState = state & DSS_ALEV_MASK;
*pState = (SECONDARY_STATE)(state & DSS_ALEV_MASK);
break;
case DSO_PATROL:
*pState = state & DSS_PATROL_MASK;
*pState = (SECONDARY_STATE)(state & DSS_PATROL_MASK);
break;
case DSO_HALTTYPE:
*pState = state & DSS_HALT_MASK;
*pState = (SECONDARY_STATE)(state & DSS_HALT_MASK);
break;
default:
*pState = 0;

2
src/order.h
View File

@ -77,6 +77,7 @@ typedef enum _secondary_order
// the state of secondary orders
typedef enum _secondary_state
{
DSS_NONE = 0x000000,
DSS_ARANGE_SHORT = 0x000001,
DSS_ARANGE_LONG = 0x000002,
DSS_ARANGE_DEFAULT = 0x000003,
@ -227,3 +228,4 @@ extern void orderStructureObj(UDWORD player, BASE_OBJECT *psObj);
#endif

8
src/structure.c
View File

@ -3219,17 +3219,17 @@ void assignFactoryCommandDroid(STRUCTURE *psStruct, DROID *psCommander)
if (typeFlag == FACTORY_FLAG)
{
secondarySetState(psFact->psCommander, DSO_CLEAR_PRODUCTION,
1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_SHIFT) );
(SECONDARY_STATE)(1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_SHIFT)) );
}
else if (typeFlag == CYBORG_FLAG)
{
secondarySetState(psFact->psCommander, DSO_CLEAR_PRODUCTION,
1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_CYBORG_SHIFT) );
(SECONDARY_STATE)(1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_CYBORG_SHIFT)) );
}
else
{
secondarySetState(psFact->psCommander, DSO_CLEAR_PRODUCTION,
1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_VTOL_SHIFT) );
(SECONDARY_STATE)(1 << ( psFact->psAssemblyPoint->factoryInc + DSS_ASSPROD_VTOL_SHIFT)) );
}
psFact->psCommander = NULL;
@ -4678,7 +4678,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure)
// bFinishRepair = TRUE;
// if completely repaired reset order
secondarySetState(psDroid, DSO_RETURN_TO_LOC, 0);
secondarySetState(psDroid, DSO_RETURN_TO_LOC, DSS_NONE);
if ((psDroid->psGroup != NULL) &&
(psDroid->psGroup->type == GT_COMMAND) &&