Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed warning and perhaps code, nice programming alternative added.

Browse source
This commit is contained in:
johns 2002-08-02 18:20:14 +00:00
parent 70126d5192
commit fef0f6da52
2 changed files with 37 additions and 15 deletions

2
src/pathfinder/hierarchical.cpp
View file

@ -52,7 +52,7 @@ int PfHierShowGroupIds = 1;
local void AreaDestroyRegions (int , int );
local int AreasInitialize (void);
local void AreasDestroy (void);
local void AreasFillRegionLists (void);
// local void AreasFillRegionLists (void);
local int PfHierGetPrecomputed (Unit * , int * , int * );
local int ResolveDeadlock (Unit * , Unit * , int * , int * );
local int GetGroupIds (int , int , int , int , unsigned short ** );

50
src/pathfinder/region_groups.cpp
View file

@ -608,25 +608,47 @@ local void MovementTypeAddSuperGroup (int type, SuperGroup *s)
}
}
local void MovementTypeDeleteSuperGroup (int type, SuperGroup *sg)
local void MovementTypeDeleteSuperGroup(int type, SuperGroup * sg)
{
SuperGroup *s, *p;
#if 1
SuperGroup *s;
SuperGroup *p;
if (MovementTypes[type].SuperGroups == NULL)
return;
if (MovementTypes[type].SuperGroups == NULL) {
return;
}
if (MovementTypes[type].SuperGroups == sg) {
MovementTypes[type].SuperGroups = MovementTypes[type].SuperGroups->Next;
sg->Next = NULL;
return;
if (MovementTypes[type].SuperGroups == sg) {
MovementTypes[type].SuperGroups =
MovementTypes[type].SuperGroups->Next;
sg->Next = NULL;
return;
}
DebugLevel0Fn("FIXME: s unintialized, please control my fix!\n");
for (p = MovementTypes[type].SuperGroups, s = p->Next;
s; p = s, s = s->Next) {
if (s == sg) {
p->Next = s->Next;
s->Next = NULL;
return;
}
}
#else
// JOHNS: should do the same as the above part :)
SuperGroup **p;
SuperGroup *s;
for (p = MovementTypes[type].SuperGroups, s; s; p=s, s=s->Next)
if (s == sg) {
p->Next = s->Next;
s->Next = NULL;
return;
}
p = &MovementTypes[type].SuperGroups;
while ((s=*p)) {
if (s == sg) {
*p = s->Next;
s->Next = NULL;
return;
}
p = &s->Next;
}
#endif
}
local int MovementTypeCheckPassability (int type, unsigned short flags)