Remove dependency on AI commands

This commit is contained in:
Ryan Dwyer
2022-11-04 19:01:47 +10:00
parent fbaff805e7
commit 817e2fe7fb
5 changed files with 29 additions and 9 deletions
+3
View File
@@ -253,6 +253,9 @@ void botSpawn(struct chrdata *chr, u8 respawning)
chr->aibot->unk0b8 = 0;
func0f02e9a0(chr, 0);
}
chr->maxdamage = 8;
chr->speedrating = 100;
}
void botSpawnAll(void)
+1 -1
View File
@@ -775,7 +775,7 @@ void chraiExecute(void *entity, s32 proptype)
}
// Iterate and execute the ailist
while (g_Vars.ailist) {
while (0) {
u8 *cmd = g_Vars.aioffset + g_Vars.ailist;
s32 type = (cmd[0] << 8) + cmd[1];
-7
View File
@@ -11129,13 +11129,6 @@ bool aiChrToggleModelPart(void)
*/
bool aiActivateLift(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct defaultobj *obj = objFindByTagId(cmd[3]);
if (obj && obj->prop) {
liftActivate(obj->prop, cmd[2]);
}
g_Vars.aioffset += 4;
return false;
+21 -1
View File
@@ -1,5 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/bot.h"
#include "game/chraction.h"
#include "game/dlights.h"
#include "game/game_006900.h"
@@ -528,7 +529,26 @@ void scenarioCreateMatchStartHudmsgs(void)
void scenarioTick(void)
{
if (g_Vars.normmplayerisrunning) {
if (g_Vars.lvframenum == 5) {
if (g_Vars.lvframenum == 1) {
switch (g_Vars.stagenum) {
case STAGE_MP_CARPARK:
g_SkyWindSpeed = 0.8f;
break;
case STAGE_MP_G5BUILDING:
g_SkyWindSpeed = 1.1f;
break;
case STAGE_MP_AREA52:
g_SkyWindSpeed = 1.5f;
break;
case STAGE_MP_WAREHOUSE:
g_SkyWindSpeed = 2.2f;
break;
}
botSpawnAll();
rebuildTeams();
rebuildSquadrons();
} else if (g_Vars.lvframenum == 5) {
scenarioCreateMatchStartHudmsgs();
}
+4
View File
@@ -1470,6 +1470,7 @@ void setupCreateProps(s32 stagenum)
struct defaultobj *obj;
s32 i;
s32 j;
s32 liftnum = 0;
withhovercars = !(stagenum == STAGE_EXTRACTION || stagenum == STAGE_DEFECTION)
|| !(g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0);
@@ -1685,6 +1686,9 @@ void setupCreateProps(s32 stagenum)
liftUpdateTiles(lift, true);
}
liftnum++;
liftActivate(prop, liftnum);
}
break;
case OBJTYPE_HOVERPROP: