Progress on path generating code.

Add readfile and writefile builtins. Attempt to  print GSC callstack.
This commit is contained in:
JezuzLizard
2023-04-14 20:12:11 -07:00
parent f0ffd59c58
commit e0114bb4de
8 changed files with 771 additions and 10 deletions

View File

@ -32,6 +32,20 @@ namespace game
{ "dead", TEAM_DEAD }
};
void Scr_PrintPrevCodePos(const char* codepos, int scriptInstance, con_channel_e channel, int index)
{
static const auto call_addr = SELECT(0x0, 0x68B340);
__asm
{
push index;
push channel;
push scriptInstance;
mov eax, codepos;
call call_addr;
}
}
int Scr_GetInt(game::scriptInstance_t inst, unsigned int arg_index)
{
static const auto call_addr = SELECT(0x0, 0x699C50);
@ -321,7 +335,7 @@ namespace game
unsigned int Scr_GetNumParam(scriptInstance_t inst)
{
return scrVmPub[inst].outparamcount;
return gScrVmPub[inst].outparamcount;
}
VariableType Scr_GetType(scriptInstance_t inst, unsigned int index)
@ -467,6 +481,7 @@ namespace game
return answer;
}
//This is a __userpurge, which automatically cleans up the stack by itself so do not do add esp
int Path_FindPathFromTo(float* startPos, pathnode_t* pNodeTo, path_t* pPath, team_t eTeam, pathnode_t* pNodeFrom, float* vGoalPos, int bAllowNegotiationLinks, int bIgnoreBadplaces)
{
static const auto call_addr = SELECT(0x0, 0x4CF3F0);
@ -490,6 +505,30 @@ namespace game
return answer;
}
//This is a __userpurge, which automatically cleans up the stack by itself so do not do add esp
int Path_GeneratePath(path_t* pPath, team_t eTeam, const float* vStartPos, float* vGoalPos, pathnode_t* pNodeFrom, pathnode_t* pNodeTo, int bIncludeGoalPos, int bAllowNegotiationLinks)
{
static const auto call_addr = SELECT(0x0, 0x4CED90);
int answer;
__asm
{
push bAllowNegotiationLinks;
push bIncludeGoalPos;
push pNodeTo;
push pNodeFrom;
push vGoalPos;
push vStartPos;
push eTeam;
mov eax, pPath;
call call_addr;
mov answer, eax;
}
return answer;
}
namespace plutonium
{
}

View File

@ -23,6 +23,8 @@ namespace game
extern std::map<std::string, team_t> team_map;
void Scr_PrintPrevCodePos(const char* codepos, int scriptInstance, con_channel_e channel, int index);
const char* Cmd_Argv(int index);
unsigned int Cmd_Argc();
void Cmd_AddCommand(const char* name, void(__cdecl* function)());
@ -59,6 +61,7 @@ namespace game
int Path_FindPath(path_t* pPath, team_t eTeam, float* vStartPos, float* vGoalPos, int bAllowNegotiationLinks);
pathnode_t* Path_NearestNodeNotCrossPlanes(int typeFlags, int maxNodes, float* vOrigin, pathsort_t* nodes, float fMaxDist, float a6, float a7, int iPlaneCount, int* returnCount, nearestNodeHeightCheck heightCheck);
int Path_FindPathFromTo(float* startPos, pathnode_t* pNodeTo, path_t* pPath, team_t eTeam, pathnode_t* pNodeFrom, float* vGoalPos, int bAllowNegotiationLinks, int bIgnoreBadplaces);
int Path_GeneratePath(path_t* pPath, team_t eTeam, const float* vStartPos, float* vGoalPos, pathnode_t* pNodeFrom, pathnode_t* pNodeTo, int bIncludeGoalPos, int bAllowNegotiationLinks);
template <typename T>
class symbol

View File

@ -1419,6 +1419,134 @@ namespace game
float fOrientLerp;
};
struct animCmdState_s
{
int field_0;
int field_4;
int field_8;
int field_C;
int field_10;
int field_14;
int field_18;
int field_1C;
int field_20;
int field_24;
int field_28;
};
struct SpawnVar
{
bool spawnVarsValid;
int numSpawnVars;
char* spawnVars[64][2];
int numSpawnVarChars;
char spawnVarChars[2048];
};
enum loading_t : __int32
{
LOADING_DONE = 0x0,
LOADING_LEVEL = 0x1,
LOADING_SAVEGAME = 0x2,
};
struct cached_tag_mat_t
{
int time;
int entnum;
unsigned __int16 name;
float tagMat[4][3];
};
struct trigger_info_t
{
unsigned __int16 entnum;
unsigned __int16 otherEntnum;
int useCount;
int otherUseCount;
};
struct __declspec(align(4)) level_locals_s
{
gclient_s* clients;
gentity_s* gentities;
int unk1;
int num_entities;
gentity_s* firstFreeEnt;
gentity_s* lastFreeEnt;
sentient_s* sentients;
actor_s* actors;
scr_vehicle_s* vehicles;
TurretInfo* turrets;
animCmdState_s* animCmds;
char gap_2C[4096];
int logFile;
int initializing;
int clientIsSpawning;
int maxclients;
int framenum;
int time;
int previousTime;
int startTime;
int newSession;
int actorCorpseCount;
SpawnVar spawnVar;
int reloadDelayTime;
int absoluteReloadDelayTime;
EntHandle droppedWeaponCue[32];
int changelevel;
int bMissionSuccess;
int bMissionFailed;
int exitTime;
int savepersist;
char cinematic[64];
float fFogOpaqueDist;
float fFogOpaqueDistSqrd;
unsigned int grenadeHintCount;
int remapCount;
int iSearchFrame;
loading_t loading;
int actorPredictDepth;
int bDrawCompassFriendlies;
int bPlayerIgnoreRadiusDamage;
int bPlayerIgnoreRadiusDamageLatched;
int triggerIndex;
int padd;
int currentEntityThink;
int currentIndex;
bool checkAnimChange;
int registerWeapons;
int bRegisterItems;
int framePos;
cached_tag_mat_t cachedTagMat;
cached_tag_mat_t cachedEntTargetTagMat;
__int16 soundAliasFirst;
__int16 soundAliasLast;
trigger_info_t pendingTriggerList[256];
trigger_info_t currentTriggerList[256];
int pendingTriggerListSize;
int currentTriggerListSize;
int entTriggerIndex[1024];
unsigned __int8 specialIndex[1024];
char gap4808[2628];
int scriptPrintChannel;
float compassMapUpperLeft[2];
float compassMapWorldSize[2];
float compassNorth[2];
float mapSunColor[3];
float mapSunDirection[3];
int script_ai_limit;
int disable_grenade_suicide;
int huh;
int manualNameChange;
objective_t objectives[16];
int frameTime;
int finished;
int pad;
};
static_assert(sizeof(level_locals_s) == 0x549C);
enum nodeType
{
NODE_BADNODE = 0x0,
@ -1687,4 +1815,358 @@ namespace game
function_frame_t function_frame_start[32];
VariableValue stack[2048];
};
struct __declspec(align(2)) scr_const_t
{
unsigned __int16 _;
__int16 active2;
__int16 j_spine4;
__int16 j_helmet;
__int16 j_head;
__int16 all;
__int16 allies;
__int16 axis;
__int16 bad_path;
__int16 begin_firing;
__int16 unknown_location;
__int16 cancel_location;
__int16 confirm_location;
__int16 regroup_location;
__int16 defend_location;
__int16 clear_squadcommand;
__int16 squadleader_changed;
__int16 squad_disbanded;
__int16 deployed_turret;
__int16 crouch;
__int16 current;
__int16 damage;
__int16 dead;
__int16 death;
__int16 disconnect;
__int16 death_or_disconnect;
__int16 detonate;
__int16 direct;
__int16 dlight;
__int16 done;
__int16 empty;
__int16 end_firing;
__int16 enter_vehicle;
__int16 entity;
__int16 exit_vehicle;
__int16 change_seat;
__int16 vehicle_death;
__int16 explode;
__int16 failed;
__int16 free;
__int16 fraction;
__int16 goal;
__int16 goal_changed;
__int16 goal_yaw;
__int16 grenade;
__int16 grenade_danger;
__int16 grenade_fire;
__int16 grenade_launcher_fire;
__int16 grenade_pullback;
__int16 info_notnull;
__int16 invisible;
__int16 key1;
__int16 key2;
__int16 killanimscript;
__int16 left;
__int16 left_tread;
__int16 light;
__int16 movedone;
__int16 noclass;
__int16 none;
__int16 normal;
__int16 player;
__int16 position;
__int16 projectile_impact;
__int16 prone;
__int16 right;
__int16 right_tread;
__int16 tank_armor;
__int16 reload;
__int16 reload_start;
__int16 rocket;
__int16 rotatedone;
__int16 script_brushmodel;
__int16 script_model;
__int16 script_origin;
__int16 snd_enveffectsprio_level;
__int16 snd_enveffectsprio_shellshock;
__int16 snd_busvolprio_holdbreath;
__int16 snd_busvolprio_pain;
__int16 snd_busvolprio_shellshock;
__int16 stand;
__int16 suppression;
__int16 suppression_end;
__int16 surfacetype;
__int16 tag_aim;
__int16 tag_aim_animated;
__int16 tag_brass;
__int16 tag_butt;
__int16 tag_clip;
__int16 tag_flash;
__int16 tag_flash_11;
__int16 tag_flash_2;
__int16 tag_flash_22;
__int16 tag_flash_3;
__int16 tag_fx;
__int16 tag_inhand2;
__int16 tag_knife_attach;
__int16 tag_knife_fx;
__int16 tag_bayonet;
__int16 tag_laser;
__int16 tag_origin;
__int16 tag_weapon;
__int16 tag_player2;
__int16 tag_camera;
__int16 tag_weapon_right;
__int16 tag_gasmask;
__int16 tag_gasmask2;
__int16 tag_sync;
__int16 tag_wake;
__int16 target_script_trigger;
__int16 tempEntity;
__int16 top;
__int16 touch;
__int16 trigger;
__int16 trigger_use;
__int16 trigger_use_touch;
__int16 trigger_damage;
__int16 trigger_lookat;
__int16 trigger_radius;
__int16 truck_cam;
__int16 weapon_change_on_turret;
__int16 weapon_change;
__int16 weapon_change_complete;
__int16 weapon_fired;
__int16 weapon_pvp_attack;
__int16 worldspawn;
__int16 flashbang;
__int16 flash;
__int16 smoke;
__int16 night_vision_on;
__int16 night_vision_off;
__int16 back_low;
__int16 back_mid;
__int16 back_up;
__int16 head;
__int16 j_mainroot;
__int16 neck;
__int16 pelvis;
__int16 j_head2;
__int16 MOD_UNKNOWN;
__int16 MOD_PISTOL_BULLET;
__int16 MOD_RIFLE_BULLET;
__int16 MOD_GRENADE;
__int16 MOD_GRENADE_SPLASH;
__int16 MOD_PROJECTILE;
__int16 MOD_PROJECTILE_SPLASH;
__int16 MOD_MELEE;
__int16 MOD_BAYONET;
__int16 MOD_HEAD_SHOT;
__int16 MOD_CRUSH;
__int16 MOD_TELEFRAG;
__int16 MOD_FALLING;
__int16 MOD_SUICIDE;
__int16 MOD_TRIGGER_HURT;
__int16 MOD_EXPLOSIVE;
__int16 MOD_IMPACT;
__int16 MOD_BURNED;
__int16 MOD_HIT_BY_OBJECT;
__int16 MOD_DROWN;
__int16 script_vehicle;
__int16 script_vehicle_collision;
__int16 script_vehicle_collmap;
__int16 script_vehicle_corpse;
__int16 turret_fire;
__int16 turret_on_target;
__int16 turret_not_on_target;
__int16 turret_on_vistarget;
__int16 turret_no_vis;
__int16 turret_rotate_stopped;
__int16 turret_deactivate;
__int16 turretstatechange;
__int16 turretownerchange;
__int16 reached_end_node;
__int16 reached_wait_node;
__int16 reached_wait_speed;
__int16 near_goal;
__int16 veh_collision;
__int16 veh_predictedcollision;
__int16 script_camera;
__int16 begin;
__int16 curve_nodehit;
__int16 curve_start;
__int16 curve_end;
__int16 tag_enter_driver;
__int16 tag_enter_gunner1;
__int16 tag_enter_gunner2;
__int16 tag_enter_gunner3;
__int16 tag_enter_gunner4;
__int16 tag_enter_passenger;
__int16 tag_enter_passenger2;
__int16 tag_enter_passenger3;
__int16 tag_enter_passenger4;
__int16 tag_player;
__int16 tag_passenger1;
__int16 tag_passenger2;
__int16 tag_passenger3;
__int16 tag_passenger4;
__int16 tag_gunner1;
__int16 tag_gunner2;
__int16 tag_gunner3;
__int16 tag_gunner4;
__int16 tag_gunner_barrel1;
__int16 tag_gunner_barrel2;
__int16 tag_gunner_barrel3;
__int16 tag_gunner_barrel4;
__int16 tag_gunner_turret1;
__int16 tag_gunner_turret2;
__int16 tag_gunner_turret3;
__int16 tag_gunner_turret4;
__int16 tag_flash_gunner1;
__int16 tag_flash_gunner2;
__int16 tag_flash_gunner3;
__int16 tag_flash_gunner4;
__int16 tag_flash_gunner1a;
__int16 tag_flash_gunner2a;
__int16 tag_flash_gunner3a;
__int16 tag_flash_gunner4a;
__int16 tag_gunner_brass1;
__int16 tag_gunner_hands1;
__int16 tag_wheel_front_left;
__int16 tag_wheel_front_right;
__int16 tag_wheel_back_left;
__int16 tag_wheel_back_right;
__int16 tag_wheel_middle_left;
__int16 tag_wheel_middle_right;
__int16 vampire_health_regen;
__int16 vampire_kill;
__int16 morphine_shot;
__int16 morphine_revive;
__int16 freelook;
__int16 intermission;
__int16 playing;
__int16 spectator;
__int16 action_notify_attack;
__int16 action_notify_melee;
__int16 action_notify_use_reload;
__int16 always;
__int16 auto_ai;
__int16 auto_nonai;
__int16 back_left;
__int16 back_right;
__int16 begin_custom_anim;
__int16 bullethit;
__int16 count;
__int16 corner_approach;
__int16 damage_notdone;
__int16 deathplant;
__int16 front_left;
__int16 front_right;
__int16 tag_inhand;
__int16 high_priority;
__int16 info_player_deathmatch;
__int16 infinite_energy;
__int16 low_priority;
__int16 manual;
__int16 manual_ai;
__int16 max_time;
__int16 menuresponse;
__int16 middle_left;
__int16 middle_right;
__int16 min_energy;
__int16 min_time;
__int16 neutral;
__int16 never;
__int16 pickup;
__int16 receiver;
__int16 sound_blend;
__int16 tag_wingtipl;
__int16 tag_wingtipr;
__int16 tag_wingmidl;
__int16 tag_wingmidr;
__int16 tag_prop;
__int16 tag_end;
__int16 tag_tailtop;
__int16 tag_tailbottom;
__int16 tag_detach;
__int16 tag_passenger;
__int16 tag_enter_back;
__int16 tag_detach2;
__int16 tag_popout;
__int16 tag_body;
__int16 tag_turret;
__int16 tag_turret_base;
__int16 tag_barrel;
__int16 tag_weapon_left;
__int16 human;
__int16 custom;
__int16 angle_deltas;
__int16 bulletwhizby;
__int16 dog;
__int16 enemy;
__int16 enemy_visible;
__int16 face_angle;
__int16 face_current;
__int16 face_default;
__int16 face_direction;
__int16 face_enemy;
__int16 face_enemy_or_motion;
__int16 face_goal;
__int16 face_motion;
__int16 face_point;
__int16 gravity;
__int16 groundEntChanged;
__int16 gunshot;
__int16 obstacle;
__int16 movemode;
__int16 node_out_of_range;
__int16 node_relinquished;
__int16 node_taken;
__int16 node_not_safe;
__int16 noclip;
__int16 nogravity;
__int16 nophysics;
__int16 pain;
__int16 run;
__int16 runto_arrived;
__int16 silenced_shot;
__int16 spawned;
__int16 start_move;
__int16 stop;
__int16 stop_soon;
__int16 tag_eye;
__int16 walk;
__int16 world;
__int16 zonly_physics;
__int16 j_ankle_le;
__int16 j_ankle_ri;
__int16 j_ball_le;
__int16 j_ball_ri;
__int16 j_palm_le;
__int16 j_palm_ri;
__int16 broken;
__int16 destructible;
__int16 snapacknowledged;
__int16 disconnected;
__int16 cinematic;
__int16 uicinematic;
__int16 logo;
__int16 connecting;
__int16 challenging;
__int16 connected;
__int16 sendingstats;
__int16 loading;
__int16 primed;
__int16 active;
__int16 map_restart;
__int16 orientdone;
__int16 field_2B6;
};
}

View File

@ -18,16 +18,31 @@ namespace game
WEAK symbol<cmd_function_s*> cmd_functions{ 0x0, 0x1F416F4 };
WEAK symbol<CmdArgs> cmd_args{ 0x0, 0x1F41670 };
WEAK symbol<GameWorldSp*> gameWorldCurrent{ 0x0, 0x8E1D80 };
WEAK symbol<pathlocal_t> g_path{ 0x0, 0x1F2F700 };
WEAK symbol<gentity_s> g_entities{ 0x0, 0x176C6F0 };
//WEAK symbol<scrVarPub_t> scrVarPub{ 0x0, 0x3882B70 };
WEAK symbol<scrVmPub_t> gScrVmPub{ 0x0, 0x3BD4700 };
WEAK symbol<level_locals_s> level{ 0x0, 0x18F5D88 };
WEAK symbol<float*> g_pathAttemptGoalPos{ 0x0, 0x16CFD6C };
//WEAK symbol<scrParserPub_t> scrParserPub{ 0x0, 0x3882B00 };
//WEAK symbol<scrVarGlob_t> gScrVarGlob{ 0x0, 0x3914700 };
WEAK symbol<scrVmPub_t> scrVmPub{ 0x0, 0x3BD4700 };
WEAK symbol<function_stack_t> function_stack{ 0x0, 0x3BDDDD0 };
WEAK symbol<scr_const_t> scr_const{0x0, 0x1F33B90};
// Dvars
WEAK symbol<dvar_s*> com_developer{ 0x0, 0x1F55288 };
WEAK symbol<dvar_s*> com_logfile{ 0x0, 0x1F552BC };
WEAK symbol<dvar_s*> com_developer_script{ 0x0, 0x1F9646C };
WEAK symbol<dvar_s*> ai_pathNegotiationOverlapCost{ 0x0, 0x18FB224 };
WEAK symbol<dvar_s*> fs_homepath{ 0x0, 0x2123C1C };
WEAK symbol<dvar_s*> fs_game{ 0x0, 0x2122B00 };
WEAK symbol<dvar_s*> useFastFile{ 0x0, 0x1F552FC };
WEAK symbol<dvar_s*> sv_running{ 0x0, 0x1F552DC };
WEAK symbol<dvar_s*> g_connectpaths{ 0x0, 0x18ECF8C };
WEAK symbol<dvar_s*> r_reflectionProbeGenerate{ 0x0, 0x3BFD478 };
namespace plutonium
{