qf
/
game-source
mirror of https://git.code.sf.net/p/quake/game-source
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get closer to working waypoints

This commit is contained in:
Bill Currie 2003-08-24 08:18:50 +00:00
parent 1c48b8a977
commit 61f3d32eae
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fbxa/libfrikbot.h
View File

@ -32,7 +32,7 @@ typedef struct bot_data_t bot_data_t;
integer flags;
vector origin;
integer b_pants, b_skill, b_shirt, b_frags, b_sound;
integer b_sound;
integer keys;
float items;
Waypoint enemy;

41
fbxa/waypoint.r
View File

@ -74,6 +74,13 @@ Array waypoint_array;
{
[self init];
[waypoint_array addItem: self];
if ([waypoint_array count] == 2) {
local id obj = [Waypoint class];
local IMP imp = [obj methodForSelector: @selector (fixWaypoints)];
waypoint_thinker.think = (void ()) imp;
waypoint_thinker.nextthink = time;
}
return self;
}
@ -208,10 +215,12 @@ Waypoint Loading from file
-(void)fix
{
links[0] = [Waypoint waypointForNum:b_pants];
links[1] = [Waypoint waypointForNum:b_skill];
links[2] = [Waypoint waypointForNum:b_shirt];
links[3] = [Waypoint waypointForNum:b_frags];
local integer i, tmp;
for (i = 0; i < 3; i++) {
tmp = (integer)links[i];
links[i] = [Waypoint waypointForNum:tmp];
}
}
+(void) fixWaypoints
@ -271,7 +280,7 @@ Route & path table management
+(void)clearMyRoute:(Bot) bot
{
[waypoint_array makeObjectsPerformSelector:@selector (clearRoute)
[waypoint_array makeObjectsPerformSelector:@selector (clearRouteForBot)
withObject:bot];
}
@ -350,7 +359,7 @@ tripping the runaway loop counter
if (waypoint_thinker.@this = [waypoint_queue removeItemAtHead]) {
local id obj = waypoint_thinker.@this;
local IMP imp = [obj methodForSelector: @selector (waypointThink)];
(IMP)waypoint_thinker.think = imp;
waypoint_thinker.think = (void ()) imp;
waypoint_thinker.nextthink = time;
}
}
@ -361,7 +370,7 @@ tripping the runaway loop counter
[waypoint_queue addItemAtTail: self];
} else {
local IMP imp = [self methodForSelector: @selector (waypointThink)];
(IMP)waypoint_thinker.think = imp;
waypoint_thinker.think = (void ()) imp;
waypoint_thinker.nextthink = time;
waypoint_thinker.@this = self;
}
@ -420,18 +429,10 @@ void() waypoint =
void(vector org, vector bit1, integer bit4, integer flargs) make_way =
{
local Waypoint y = [[Waypoint alloc] initAt:org];
//local entity y;
//waypoint_mode = WM_LOADED;
//y = make_waypoint(org);
waypoint_mode = WM_LOADED;
y.flags = flargs;
y.b_pants = (integer)bit1_x;
y.b_skill = (integer)bit1_y;
y.b_shirt = (integer)bit1_z;
y.b_frags = bit4;
/*
if (y.count == 1) {
y.think = FixWaypoints; // wait until all qc loaded points are spawned
y.nextthink = time;
}
*/
y.links[0] = (Waypoint) (integer) bit1_x;
y.links[1] = (Waypoint) (integer) bit1_y;
y.links[2] = (Waypoint) (integer) bit1_z;
y.links[3] = (Waypoint) (integer) bit4;
};