id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-19 04:04:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed legacy AAS from Doom, cleaned up naming.

Browse Source
This commit is contained in:
Justin Marshall
2026-05-22 22:26:19 -07:00
parent b0788b922e
commit 164a6e1f48
53 changed files with 912 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neo/doom3/game/gamesys/GameTypeInfo.cpp
+9 -9
View File
@@ -4857,12 +4857,12 @@ intptr_t idPlayer::Invoke(const char *functionName, void *param1) {
AdjustBodyAngles();
return 0;
};
if(functionNameHash == 182149) { // InitAASLocation
InitAASLocation();
if(functionNameHash == 184123) { // InitNAVLocation
InitNAVLocation();
return 0;
};
if(functionNameHash == 168400) { // SetAASLocation
SetAASLocation();
if(functionNameHash == 170358) { // SetNAVLocation
SetNAVLocation();
return 0;
};
if(functionNameHash == 49083) { // Move
@@ -5225,10 +5225,10 @@ bool idPlayer::HasNativeFunction(const char *functionName) {
if(functionNameHash == 205065) { // AdjustBodyAngles
return true;
};
if(functionNameHash == 182149) { // InitAASLocation
if(functionNameHash == 184123) { // InitNAVLocation
return true;
};
if(functionNameHash == 168400) { // SetAASLocation
if(functionNameHash == 170358) { // SetNAVLocation
return true;
};
if(functionNameHash == 49083) { // Move
@@ -7291,8 +7291,8 @@ intptr_t idAI::Invoke(const char *functionName, void *param1) {
GetTalkState();
return 0;
};
if(functionNameHash == 62250) { // SetAAS
SetAAS();
if(functionNameHash == 64208) { // SetNAV
SetNAV();
return 0;
};
if(functionNameHash == 150747) { // DormantBegin
@@ -7900,7 +7900,7 @@ bool idAI::HasNativeFunction(const char *functionName) {
if(functionNameHash == 149251) { // GetTalkState
return true;
};
if(functionNameHash == 62250) { // SetAAS
if(functionNameHash == 64208) { // SetNAV
return true;
};
if(functionNameHash == 150747) { // DormantBegin
neo/doom3/game/gamesys/GameTypeInfo.h
+10 -10
View File
@@ -5360,11 +5360,11 @@ static classVariableInfo_t aasObstacle_t_typeInfo[] = {
{ NULL, 0 }
};
static classVariableInfo_t idAASCallback_typeInfo[] = {
static classVariableInfo_t idNAVCallback_typeInfo[] = {
{ NULL, 0 }
};
static classVariableInfo_t idAAS_typeInfo[] = {
static classVariableInfo_t idNAV_typeInfo[] = {
{ NULL, 0 }
};
@@ -5626,8 +5626,8 @@ static classVariableInfo_t idGameLocal_typeInfo[] = {
{ "idLocationEntity * *", "locationEntities", (intptr_t)(&((idGameLocal *)0)->locationEntities), sizeof( ((idGameLocal *)0)->locationEntities ) },
{ "idCamera *", "camera", (intptr_t)(&((idGameLocal *)0)->camera), sizeof( ((idGameLocal *)0)->camera ) },
{ "const idMaterial *", "globalMaterial", (intptr_t)(&((idGameLocal *)0)->globalMaterial), sizeof( ((idGameLocal *)0)->globalMaterial ) },
{ "idList < idAAS * >", "aasList", (intptr_t)(&((idGameLocal *)0)->aasList), sizeof( ((idGameLocal *)0)->aasList ) },
{ "idStrList", "aasNames", (intptr_t)(&((idGameLocal *)0)->aasNames), sizeof( ((idGameLocal *)0)->aasNames ) },
{ "idList < idNAV * >", "navList", (intptr_t)(&((idGameLocal *)0)->navList), sizeof( ((idGameLocal *)0)->navList ) },
{ "idStrList", "navNames", (intptr_t)(&((idGameLocal *)0)->navNames), sizeof( ((idGameLocal *)0)->navNames ) },
{ "idEntityPtr < idActor >", "lastAIAlertEntity", (intptr_t)(&((idGameLocal *)0)->lastAIAlertEntity), sizeof( ((idGameLocal *)0)->lastAIAlertEntity ) },
{ "int", "lastAIAlertTime", (intptr_t)(&((idGameLocal *)0)->lastAIAlertTime), sizeof( ((idGameLocal *)0)->lastAIAlertTime ) },
{ "idDict", "spawnArgs", (intptr_t)(&((idGameLocal *)0)->spawnArgs), sizeof( ((idGameLocal *)0)->spawnArgs ) },
@@ -5653,7 +5653,7 @@ static classVariableInfo_t idGameLocal_typeInfo[] = {
{ "byte[16384]", "lagometer", (intptr_t)(&((idGameLocal *)0)->lagometer), sizeof( ((idGameLocal *)0)->lagometer ) },
{ "idList < rvmGameDelayRemoveEntry_t >", "delayRemoveEntities", (intptr_t)(&((idGameLocal *)0)->delayRemoveEntities), sizeof( ((idGameLocal *)0)->delayRemoveEntities ) },
{ "const idDeclEntityDef *", "botItemTable", (intptr_t)(&((idGameLocal *)0)->botItemTable), sizeof( ((idGameLocal *)0)->botItemTable ) },
{ "idAAS *", "bot_aas", (intptr_t)(&((idGameLocal *)0)->bot_aas), sizeof( ((idGameLocal *)0)->bot_aas ) },
{ "idNAV *", "bot_nav", (intptr_t)(&((idGameLocal *)0)->bot_nav), sizeof( ((idGameLocal *)0)->bot_nav ) },
{ NULL, 0 }
};
@@ -7488,7 +7488,7 @@ static classVariableInfo_t idDoor_typeInfo[] = {
{ ": float", "triggersize", (intptr_t)(&((idDoor *)0)->triggersize), sizeof( ((idDoor *)0)->triggersize ) },
{ "bool", "crusher", (intptr_t)(&((idDoor *)0)->crusher), sizeof( ((idDoor *)0)->crusher ) },
{ "bool", "noTouch", (intptr_t)(&((idDoor *)0)->noTouch), sizeof( ((idDoor *)0)->noTouch ) },
{ "bool", "aas_area_closed", (intptr_t)(&((idDoor *)0)->aas_area_closed), sizeof( ((idDoor *)0)->aas_area_closed ) },
{ "bool", "nav_area_closed", (intptr_t)(&((idDoor *)0)->nav_area_closed), sizeof( ((idDoor *)0)->nav_area_closed ) },
{ "idStr", "buddyStr", (intptr_t)(&((idDoor *)0)->buddyStr), sizeof( ((idDoor *)0)->buddyStr ) },
{ "idClipModel *", "trigger", (intptr_t)(&((idDoor *)0)->trigger), sizeof( ((idDoor *)0)->trigger ) },
{ "idClipModel *", "sndTrigger", (intptr_t)(&((idDoor *)0)->sndTrigger), sizeof( ((idDoor *)0)->sndTrigger ) },
@@ -7952,7 +7952,7 @@ static classVariableInfo_t idMoveState_typeInfo[] = {
};
static classVariableInfo_t idAI_typeInfo[] = {
{ ": idAAS *", "aas", (intptr_t)(&((idAI *)0)->aas), sizeof( ((idAI *)0)->aas ) },
{ ": idNAV *", "aas", (intptr_t)(&((idAI *)0)->aas), sizeof( ((idAI *)0)->aas ) },
{ "int", "travelFlags", (intptr_t)(&((idAI *)0)->travelFlags), sizeof( ((idAI *)0)->travelFlags ) },
{ "idMoveState", "move", (intptr_t)(&((idAI *)0)->move), sizeof( ((idAI *)0)->move ) },
{ "idMoveState", "savedMove", (intptr_t)(&((idAI *)0)->savedMove), sizeof( ((idAI *)0)->savedMove ) },
@@ -8576,7 +8576,7 @@ static classVariableInfo_t rvmBot_typeInfo[] = {
{ "int", "weapon_shotgun", (intptr_t)(&((rvmBot *)0)->weapon_shotgun), sizeof( ((rvmBot *)0)->weapon_shotgun ) },
{ "int", "weapon_plasmagun", (intptr_t)(&((rvmBot *)0)->weapon_plasmagun), sizeof( ((rvmBot *)0)->weapon_plasmagun ) },
{ "int", "weapon_rocketlauncher", (intptr_t)(&((rvmBot *)0)->weapon_rocketlauncher), sizeof( ((rvmBot *)0)->weapon_rocketlauncher ) },
{ ": idAAS *", "aas", (intptr_t)(&((rvmBot *)0)->aas), sizeof( ((rvmBot *)0)->aas ) },
{ ": idNAV *", "aas", (intptr_t)(&((rvmBot *)0)->aas), sizeof( ((rvmBot *)0)->aas ) },
{ NULL, 0 }
};
@@ -8882,8 +8882,8 @@ static classTypeInfo_t classTypeInfo[] = {
{ "aasPath_t", "", sizeof(aasPath_t), aasPath_t_typeInfo },
{ "aasGoal_t", "", sizeof(aasGoal_t), aasGoal_t_typeInfo },
{ "aasObstacle_t", "", sizeof(aasObstacle_t), aasObstacle_t_typeInfo },
{ "idAASCallback", "", sizeof(idAASCallback), idAASCallback_typeInfo },
{ "idAAS", "", sizeof(idAAS), idAAS_typeInfo },
{ "idNAVCallback", "", sizeof(idNAVCallback), idNAVCallback_typeInfo },
{ "idNAV", "", sizeof(idNAV), idNAV_typeInfo },
{ "idClipModel", "", sizeof(idClipModel), idClipModel_typeInfo },
{ "idClip", "", sizeof(idClip), idClip_typeInfo },
{ "idPush::pushed_s", "", sizeof(idPush::pushed_s), idPush_pushed_s_typeInfo },
neo/doom3/game/gamesys/SysCmds.cpp
+6 -6
View File
@@ -1458,20 +1458,20 @@ static void Cmd_ListAnims_f( const idCmdArgs &args ) {
/*
==================
Cmd_AASStats_f
Cmd_NAVStats_f
==================
*/
static void Cmd_AASStats_f( const idCmdArgs &args ) {
static void Cmd_NAVStats_f( const idCmdArgs &args ) {
int aasNum;
if ( !gameLocal.CheatsOk() ) {
return;
}
aasNum = aas_test.GetInteger();
idAAS *aas = gameLocal.GetAAS( aasNum );
aasNum = nav_test.GetInteger();
idNAV *aas = gameLocal.GetNAV( aasNum );
if ( !aas ) {
gameLocal.Printf( "No aas #%d loaded\n", aasNum );
gameLocal.Printf( "No nav #%d loaded\n", aasNum );
} else {
aas->Stats();
}
@@ -2411,7 +2411,7 @@ void idGameLocal::InitConsoleCommands( void ) {
cmdSystem->AddCommand( "reexportmodels", Cmd_ReexportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "reexports models", ArgCompletion_DefFile );
cmdSystem->AddCommand( "reloadanims", Cmd_ReloadAnims_f, CMD_FL_GAME|CMD_FL_CHEAT, "reloads animations" );
cmdSystem->AddCommand( "listAnims", Cmd_ListAnims_f, CMD_FL_GAME, "lists all animations" );
cmdSystem->AddCommand( "aasStats", Cmd_AASStats_f, CMD_FL_GAME, "shows AAS stats" );
cmdSystem->AddCommand( "navStats", Cmd_NAVStats_f, CMD_FL_GAME, "shows NAV stats" );
cmdSystem->AddCommand( "recastNavBuild", Cmd_RecastNavBuild_f, CMD_FL_GAME|CMD_FL_CHEAT, "builds Recast navmesh data for a map" );
cmdSystem->AddCommand( "testDamage", Cmd_TestDamage_f, CMD_FL_GAME|CMD_FL_CHEAT, "tests a damage def", idCmdSystem::ArgCompletion_Decl<DECL_ENTITYDEF> );
cmdSystem->AddCommand( "weaponSplat", Cmd_WeaponSplat_f, CMD_FL_GAME|CMD_FL_CHEAT, "projects a blood splat on the player weapon" );
neo/doom3/game/gamesys/SysCvar.cpp
+11 -11
View File
@@ -294,17 +294,17 @@ idCVar g_testDeath( "g_testDeath", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar g_exportMask( "g_exportMask", "", CVAR_GAME, "" );
idCVar g_flushSave( "g_flushSave", "0", CVAR_GAME | CVAR_BOOL, "1 = don't buffer file writing for save games." );
idCVar aas_test( "aas_test", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_showAreas( "aas_showAreas", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar aas_showRecastNavMesh( "aas_showRecastNavMesh", "0", CVAR_GAME | CVAR_INTEGER, "0 = off, 1 = draw Recast navmesh, 2 = also draw dynamic blockers" );
idCVar aas_showPath( "aas_showPath", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_showFlyPath( "aas_showFlyPath", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_showWallEdges( "aas_showWallEdges", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar aas_showHideArea( "aas_showHideArea", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_pullPlayer( "aas_pullPlayer", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_randomPullPlayer( "aas_randomPullPlayer", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar aas_goalArea( "aas_goalArea", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar aas_showPushIntoArea( "aas_showPushIntoArea", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar nav_test( "nav_test", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_showAreas( "nav_showAreas", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar nav_showRecastNavMesh( "nav_showRecastNavMesh", "0", CVAR_GAME | CVAR_INTEGER, "0 = off, 1 = draw Recast navmesh, 2 = also draw dynamic blockers" );
idCVar nav_showPath( "nav_showPath", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_showFlyPath( "nav_showFlyPath", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_showWallEdges( "nav_showWallEdges", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar nav_showHideArea( "nav_showHideArea", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_pullPlayer( "nav_pullPlayer", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_randomPullPlayer( "nav_randomPullPlayer", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar nav_goalArea( "nav_goalArea", "0", CVAR_GAME | CVAR_INTEGER, "" );
idCVar nav_showPushIntoArea( "nav_showPushIntoArea", "0", CVAR_GAME | CVAR_BOOL, "" );
idCVar g_password( "g_password", "", CVAR_GAME | CVAR_ARCHIVE, "game password" );
idCVar password( "password", "", CVAR_GAME | CVAR_NOCHEAT, "client password used when connecting" );
neo/doom3/game/gamesys/SysCvar.h
+11 -11
View File
@@ -222,17 +222,17 @@ extern idCVar g_testModelBlend;
extern idCVar g_exportMask;
extern idCVar g_flushSave;
extern idCVar aas_test;
extern idCVar aas_showAreas;
extern idCVar aas_showRecastNavMesh;
extern idCVar aas_showPath;
extern idCVar aas_showFlyPath;
extern idCVar aas_showWallEdges;
extern idCVar aas_showHideArea;
extern idCVar aas_pullPlayer;
extern idCVar aas_randomPullPlayer;
extern idCVar aas_goalArea;
extern idCVar aas_showPushIntoArea;
extern idCVar nav_test;
extern idCVar nav_showAreas;
extern idCVar nav_showRecastNavMesh;
extern idCVar nav_showPath;
extern idCVar nav_showFlyPath;
extern idCVar nav_showWallEdges;
extern idCVar nav_showHideArea;
extern idCVar nav_pullPlayer;
extern idCVar nav_randomPullPlayer;
extern idCVar nav_goalArea;
extern idCVar nav_showPushIntoArea;
extern idCVar net_clientPredictGUI;