IOQ3 commit 2271

This commit is contained in:
Richard Allen 2012-10-04 15:09:25 +00:00
parent d64afc3be0
commit 0afce1f03c
2 changed files with 5 additions and 5 deletions

View file

@ -848,7 +848,7 @@ int AAS_Reachability_Swim(int area1num, int area2num)
area1 = &aasworld.areas[area1num]; area1 = &aasworld.areas[area1num];
area2 = &aasworld.areas[area2num]; area2 = &aasworld.areas[area2num];
//if the areas are not near anough //if the areas are not near enough
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
if (area1->mins[i] > area2->maxs[i] + 10) return qfalse; if (area1->mins[i] > area2->maxs[i] + 10) return qfalse;
@ -923,7 +923,7 @@ int AAS_Reachability_EqualFloorHeight(int area1num, int area2num)
area1 = &aasworld.areas[area1num]; area1 = &aasworld.areas[area1num];
area2 = &aasworld.areas[area2num]; area2 = &aasworld.areas[area2num];
//if the areas are not near anough in the x-y direction //if the areas are not near enough in the x-y direction
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if (area1->mins[i] > area2->maxs[i] + 10) return qfalse; if (area1->mins[i] > area2->maxs[i] + 10) return qfalse;
@ -1085,7 +1085,7 @@ int AAS_Reachability_Step_Barrier_WaterJump_WalkOffLedge(int area1num, int area2
area2 = &aasworld.areas[area2num]; area2 = &aasworld.areas[area2num];
//if the first area contains a liquid //if the first area contains a liquid
area1swim = AAS_AreaSwim(area1num); area1swim = AAS_AreaSwim(area1num);
//if the areas are not near anough in the x-y direction //if the areas are not near enough in the x-y direction
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if (area1->mins[i] > area2->maxs[i] + 10) return qfalse; if (area1->mins[i] > area2->maxs[i] + 10) return qfalse;
@ -2131,7 +2131,7 @@ int AAS_Reachability_Jump(int area1num, int area2num)
//maximum height a player can jump with the given initial z velocity //maximum height a player can jump with the given initial z velocity
maxjumpheight = AAS_MaxJumpHeight(phys_jumpvel); maxjumpheight = AAS_MaxJumpHeight(phys_jumpvel);
//if the areas are not near anough in the x-y direction //if the areas are not near enough in the x-y direction
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if (area1->mins[i] > area2->maxs[i] + maxjumpdistance) return qfalse; if (area1->mins[i] > area2->maxs[i] + maxjumpdistance) return qfalse;

View file

@ -1988,7 +1988,7 @@ bot_moveresult_t BotTravel_Ladder(bot_movestate_t *ms, aas_reachability_t *reach
{ {
//botimport.Print(PRT_MESSAGE, "moving towards ladder\n"); //botimport.Print(PRT_MESSAGE, "moving towards ladder\n");
VectorSubtract(reach->end, ms->origin, dir); VectorSubtract(reach->end, ms->origin, dir);
//make sure the horizontal movement is large anough //make sure the horizontal movement is large enough
VectorCopy(dir, hordir); VectorCopy(dir, hordir);
hordir[2] = 0; hordir[2] = 0;
dist = VectorNormalize(hordir); dist = VectorNormalize(hordir);