From 246c146ca55fc5772ef5d3487308436b968c65b0 Mon Sep 17 00:00:00 2001 From: Cowcat5150 Date: Wed, 21 Jun 2023 12:26:14 +0200 Subject: [PATCH] Remove idSoftware internal stuff (d3wasm). --- neo/d3xp/gamesys/SysCmds.cpp | 33 ++++++++++++++++++++------------- neo/framework/Session.cpp | 18 +++++++++++++----- neo/framework/Session_local.h | 4 ++-- neo/framework/Session_menu.cpp | 7 ++++--- neo/game/gamesys/SysCmds.cpp | 33 ++++++++++++++++++++------------- 5 files changed, 59 insertions(+), 36 deletions(-) diff --git a/neo/d3xp/gamesys/SysCmds.cpp b/neo/d3xp/gamesys/SysCmds.cpp index cc63b8f..caa7d82 100644 --- a/neo/d3xp/gamesys/SysCmds.cpp +++ b/neo/d3xp/gamesys/SysCmds.cpp @@ -1410,6 +1410,7 @@ static void Cmd_CollisionModelInfo_f( const idCmdArgs &args ) { Cmd_ExportModels_f ================== */ +#if 0 static void Cmd_ExportModels_f( const idCmdArgs &args ) { idModelExport exporter; idStr name; @@ -1429,12 +1430,13 @@ static void Cmd_ExportModels_f( const idCmdArgs &args ) { exporter.ExportDefFile( name ); } } - +#endif /* ================== Cmd_ReexportModels_f ================== */ +#if 0 static void Cmd_ReexportModels_f( const idCmdArgs &args ) { idModelExport exporter; idStr name; @@ -1456,7 +1458,7 @@ static void Cmd_ReexportModels_f( const idCmdArgs &args ) { } idAnimManager::forceExport = false; } - +#endif /* ================== Cmd_ReloadAnims_f @@ -2053,10 +2055,11 @@ static void Cmd_SaveParticles_f( const idCmdArgs &args ) { Cmd_DisasmScript_f ================== */ +#if 0 static void Cmd_DisasmScript_f( const idCmdArgs &args ) { gameLocal.program.Disassemble(); } - +#endif /* ================== Cmd_TestSave_f @@ -2075,6 +2078,7 @@ static void Cmd_TestSave_f( const idCmdArgs &args ) { Cmd_RecordViewNotes_f ================== */ +#if 0 static void Cmd_RecordViewNotes_f( const idCmdArgs &args ) { idPlayer *player; idVec3 origin; @@ -2119,12 +2123,13 @@ static void Cmd_RecordViewNotes_f( const idCmdArgs &args ) { player->hud->SetStateString( "viewcomments", viewComments ); player->hud->HandleNamedEvent( "showViewComments" ); } - +#endif /* ================== Cmd_CloseViewNotes_f ================== */ +#if 0 static void Cmd_CloseViewNotes_f( const idCmdArgs &args ) { idPlayer *player = gameLocal.GetLocalPlayer(); @@ -2135,12 +2140,13 @@ static void Cmd_CloseViewNotes_f( const idCmdArgs &args ) { player->hud->SetStateString( "viewcomments", "" ); player->hud->HandleNamedEvent( "hideViewComments" ); } - +#endif /* ================== Cmd_ShowViewNotes_f ================== */ +#if 0 static void Cmd_ShowViewNotes_f( const idCmdArgs &args ) { static idLexer parser( LEXFL_ALLOWPATHNAMES | LEXFL_NOSTRINGESCAPECHARS | LEXFL_NOSTRINGCONCAT | LEXFL_NOFATALERRORS ); idToken token; @@ -2182,7 +2188,7 @@ static void Cmd_ShowViewNotes_f( const idCmdArgs &args ) { return; } } - +#endif /* ================= FindEntityGUIs @@ -2369,10 +2375,11 @@ void Cmd_SetActorState_f( const idCmdArgs &args ) { } #endif +/* static void ArgCompletion_DefFile( const idCmdArgs &args, void(*callback)( const char *s ) ) { cmdSystem->ArgCompletion_FolderExtension( args, callback, "def/", true, ".def", NULL ); } - +*/ /* =============== Cmd_TestId_f @@ -2464,7 +2471,7 @@ void idGameLocal::InitConsoleCommands( void ) { cmdSystem->AddCommand( "script", Cmd_Script_f, CMD_FL_GAME|CMD_FL_CHEAT, "executes a line of script" ); cmdSystem->AddCommand( "listCollisionModels", Cmd_ListCollisionModels_f, CMD_FL_GAME, "lists collision models" ); cmdSystem->AddCommand( "collisionModelInfo", Cmd_CollisionModelInfo_f, CMD_FL_GAME, "shows collision model info" ); - cmdSystem->AddCommand( "reexportmodels", Cmd_ReexportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "reexports models", ArgCompletion_DefFile ); + //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" ); @@ -2481,11 +2488,11 @@ void idGameLocal::InitConsoleCommands( void ) { cmdSystem->AddCommand( "clearLights", Cmd_ClearLights_f, CMD_FL_GAME|CMD_FL_CHEAT, "clears all lights" ); cmdSystem->AddCommand( "gameError", Cmd_GameError_f, CMD_FL_GAME|CMD_FL_CHEAT, "causes a game error" ); - cmdSystem->AddCommand( "disasmScript", Cmd_DisasmScript_f, CMD_FL_GAME|CMD_FL_CHEAT, "disassembles script" ); - cmdSystem->AddCommand( "recordViewNotes", Cmd_RecordViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "record the current view position with notes" ); - cmdSystem->AddCommand( "showViewNotes", Cmd_ShowViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "show any view notes for the current map, successive calls will cycle to the next note" ); - cmdSystem->AddCommand( "closeViewNotes", Cmd_CloseViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "close the view showing any notes for this map" ); - cmdSystem->AddCommand( "exportmodels", Cmd_ExportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "exports models", ArgCompletion_DefFile ); + //cmdSystem->AddCommand( "disasmScript", Cmd_DisasmScript_f, CMD_FL_GAME|CMD_FL_CHEAT, "disassembles script" ); + //cmdSystem->AddCommand( "recordViewNotes", Cmd_RecordViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "record the current view position with notes" ); + //cmdSystem->AddCommand( "showViewNotes", Cmd_ShowViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "show any view notes for the current map, successive calls will cycle to the next note" ); + //cmdSystem->AddCommand( "closeViewNotes", Cmd_CloseViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "close the view showing any notes for this map" ); + //cmdSystem->AddCommand( "exportmodels", Cmd_ExportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "exports models", ArgCompletion_DefFile ); // multiplayer client commands ( replaces old impulses stuff ) cmdSystem->AddCommand( "clientDropWeapon", idMultiplayerGame::DropWeapon_f, CMD_FL_GAME, "drop current weapon" ); diff --git a/neo/framework/Session.cpp b/neo/framework/Session.cpp index a6b74d7..857fb2b 100644 --- a/neo/framework/Session.cpp +++ b/neo/framework/Session.cpp @@ -373,7 +373,7 @@ idSessionLocal::idSessionLocal idSessionLocal::idSessionLocal() { guiInGame = guiMainMenu = guiIntro \ = guiRestartMenu = guiLoading = guiGameOver = guiActive \ - = guiTest = guiMsg = guiMsgRestore = guiTakeNotes = NULL; + = guiTest = guiMsg = guiMsgRestore = /*guiTakeNotes =*/ NULL; menuSoundWorld = NULL; @@ -1782,26 +1782,30 @@ void SaveGame_f( const idCmdArgs &args ) { TakeViewNotes_f =============== */ +#if 0 void TakeViewNotes_f( const idCmdArgs &args ) { const char *p = ( args.Argc() > 1 ) ? args.Argv( 1 ) : ""; sessLocal.TakeNotes( p ); } - +#endif /* =============== TakeViewNotes2_f =============== */ +#if 0 void TakeViewNotes2_f( const idCmdArgs &args ) { const char *p = ( args.Argc() > 1 ) ? args.Argv( 1 ) : ""; sessLocal.TakeNotes( p, true ); } +#endif /* =============== idSessionLocal::TakeNotes =============== */ +#if 0 void idSessionLocal::TakeNotes( const char *p, bool extended ) { if ( !mapSpawned ) { common->Printf( "No map loaded!\n" ); @@ -1843,7 +1847,7 @@ void idSessionLocal::TakeNotes( const char *p, bool extended ) { guiActive->SetStateBool( "extended", extended ); guiActive->Activate( true, com_frameTime ); } - +#endif /* =============== Session_Hitch_f @@ -2509,9 +2513,11 @@ void idSessionLocal::Draw() { } // draw the menus full screen + #if 0 if ( guiActive == guiTakeNotes && !com_skipGameDraw.GetBool() ) { game->Draw( GetLocalClientNum() ); } + #endif guiActive->Redraw( com_frameTime ); } else if ( readDemo ) { @@ -3001,9 +3007,11 @@ void idSessionLocal::Init() { cmdSystem->AddCommand( "loadGame", LoadGame_f, CMD_FL_SYSTEM|CMD_FL_CHEAT, "loads a game", idCmdSystem::ArgCompletion_SaveGame ); #endif + #if 0 cmdSystem->AddCommand( "takeViewNotes", TakeViewNotes_f, CMD_FL_SYSTEM, "take notes about the current map from the current view" ); cmdSystem->AddCommand( "takeViewNotes2", TakeViewNotes2_f, CMD_FL_SYSTEM, "extended take view notes" ); - + #endif + cmdSystem->AddCommand( "rescanSI", Session_RescanSI_f, CMD_FL_SYSTEM, "internal - rescan serverinfo cvars and tell game" ); cmdSystem->AddCommand( "promptKey", Session_PromptKey_f, CMD_FL_SYSTEM, "prompt and sets the CD Key" ); @@ -3030,7 +3038,7 @@ void idSessionLocal::Init() { guiRestartMenu = uiManager->FindGui( "guis/restart.gui", true, false, true ); guiGameOver = uiManager->FindGui( "guis/gameover.gui", true, false, true ); guiMsg = uiManager->FindGui( "guis/msg.gui", true, false, true ); - guiTakeNotes = uiManager->FindGui( "guis/takeNotes.gui", true, false, true ); + //guiTakeNotes = uiManager->FindGui( "guis/takeNotes.gui", true, false, true ); guiIntro = uiManager->FindGui( "guis/intro.gui", true, false, true ); whiteMaterial = declManager->FindMaterial( "_white" ); diff --git a/neo/framework/Session_local.h b/neo/framework/Session_local.h index 45acd09..8e7e71e 100644 --- a/neo/framework/Session_local.h +++ b/neo/framework/Session_local.h @@ -256,7 +256,7 @@ class idSessionLocal : public idSession { idUserInterface * guiIntro; idUserInterface * guiGameOver; idUserInterface * guiTest; - idUserInterface * guiTakeNotes; + //idUserInterface * guiTakeNotes; idUserInterface * guiMsg; idUserInterface * guiMsgRestore; // store the calling GUI for restore @@ -339,7 +339,7 @@ class idSessionLocal : public idSession { void HandleMsgCommands( const char *menuCommand ); void HandleNoteCommands( const char *menuCommand ); void GetSaveGameList( idStrList &fileList, idList &fileTimes ); - void TakeNotes( const char * p, bool extended = false ); + //void TakeNotes( const char * p, bool extended = false ); void UpdateMPLevelShot( void ); void SetSaveGameGuiVars( void ); diff --git a/neo/framework/Session_menu.cpp b/neo/framework/Session_menu.cpp index b979b82..ff5fbb2 100644 --- a/neo/framework/Session_menu.cpp +++ b/neo/framework/Session_menu.cpp @@ -1144,8 +1144,8 @@ void idSessionLocal::DispatchCommand( idUserInterface *gui, const char *menuComm HandleIntroMenuCommands( menuCommand ); } else if ( gui == guiMsg ) { HandleMsgCommands( menuCommand ); - } else if ( gui == guiTakeNotes ) { - HandleNoteCommands( menuCommand ); + //} else if ( gui == guiTakeNotes ) { + // HandleNoteCommands( menuCommand ); } else if ( gui == guiRestartMenu ) { HandleRestartMenuCommands( menuCommand ); } else if ( game && guiActive && guiActive->State().GetBool( "gameDraw" ) ) { @@ -1539,6 +1539,7 @@ void idSessionLocal::HandleMsgCommands( const char *menuCommand ) { idSessionLocal::HandleNoteCommands ================= */ +#if 0 #define NOTEDATFILE "C:/notenumber.dat" void idSessionLocal::HandleNoteCommands( const char *menuCommand ) { @@ -1651,7 +1652,7 @@ void idSessionLocal::HandleNoteCommands( const char *menuCommand ) { cvarSystem->SetCVarBool( "con_noPrint", bCon ); } } - +#endif /* =============== idSessionLocal::SetCDKeyGuiVars diff --git a/neo/game/gamesys/SysCmds.cpp b/neo/game/gamesys/SysCmds.cpp index 105ff57..0c33511 100644 --- a/neo/game/gamesys/SysCmds.cpp +++ b/neo/game/gamesys/SysCmds.cpp @@ -1341,6 +1341,7 @@ static void Cmd_CollisionModelInfo_f( const idCmdArgs &args ) { Cmd_ExportModels_f ================== */ +#if 0 static void Cmd_ExportModels_f( const idCmdArgs &args ) { idModelExport exporter; idStr name; @@ -1360,12 +1361,13 @@ static void Cmd_ExportModels_f( const idCmdArgs &args ) { exporter.ExportDefFile( name ); } } - +#endif /* ================== Cmd_ReexportModels_f ================== */ +#if 0 static void Cmd_ReexportModels_f( const idCmdArgs &args ) { idModelExport exporter; idStr name; @@ -1387,7 +1389,7 @@ static void Cmd_ReexportModels_f( const idCmdArgs &args ) { } idAnimManager::forceExport = false; } - +#endif /* ================== Cmd_ReloadAnims_f @@ -1984,10 +1986,11 @@ static void Cmd_SaveParticles_f( const idCmdArgs &args ) { Cmd_DisasmScript_f ================== */ +#if 0 static void Cmd_DisasmScript_f( const idCmdArgs &args ) { gameLocal.program.Disassemble(); } - +#endif /* ================== Cmd_TestSave_f @@ -2006,6 +2009,7 @@ static void Cmd_TestSave_f( const idCmdArgs &args ) { Cmd_RecordViewNotes_f ================== */ +#if 0 static void Cmd_RecordViewNotes_f( const idCmdArgs &args ) { idPlayer *player; idVec3 origin; @@ -2044,12 +2048,13 @@ static void Cmd_RecordViewNotes_f( const idCmdArgs &args ) { player->hud->SetStateString( "viewcomments", viewComments ); player->hud->HandleNamedEvent( "showViewComments" ); } - +#endif /* ================== Cmd_CloseViewNotes_f ================== */ +#if 0 static void Cmd_CloseViewNotes_f( const idCmdArgs &args ) { idPlayer *player = gameLocal.GetLocalPlayer(); @@ -2060,12 +2065,13 @@ static void Cmd_CloseViewNotes_f( const idCmdArgs &args ) { player->hud->SetStateString( "viewcomments", "" ); player->hud->HandleNamedEvent( "hideViewComments" ); } - +#endif /* ================== Cmd_ShowViewNotes_f ================== */ +#if 0 static void Cmd_ShowViewNotes_f( const idCmdArgs &args ) { static idLexer parser( LEXFL_ALLOWPATHNAMES | LEXFL_NOSTRINGESCAPECHARS | LEXFL_NOSTRINGCONCAT | LEXFL_NOFATALERRORS ); idToken token; @@ -2107,7 +2113,7 @@ static void Cmd_ShowViewNotes_f( const idCmdArgs &args ) { return; } } - +#endif /* ================= FindEntityGUIs @@ -2268,10 +2274,11 @@ void Cmd_NextGUI_f( const idCmdArgs &args ) { player->Teleport( origin, angles, NULL ); } +/* static void ArgCompletion_DefFile( const idCmdArgs &args, void(*callback)( const char *s ) ) { cmdSystem->ArgCompletion_FolderExtension( args, callback, "def/", true, ".def", NULL ); } - +*/ /* =============== Cmd_TestId_f @@ -2363,7 +2370,7 @@ void idGameLocal::InitConsoleCommands( void ) { cmdSystem->AddCommand( "script", Cmd_Script_f, CMD_FL_GAME|CMD_FL_CHEAT, "executes a line of script" ); cmdSystem->AddCommand( "listCollisionModels", Cmd_ListCollisionModels_f, CMD_FL_GAME, "lists collision models" ); cmdSystem->AddCommand( "collisionModelInfo", Cmd_CollisionModelInfo_f, CMD_FL_GAME, "shows collision model info" ); - cmdSystem->AddCommand( "reexportmodels", Cmd_ReexportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "reexports models", ArgCompletion_DefFile ); + //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" ); @@ -2380,11 +2387,11 @@ void idGameLocal::InitConsoleCommands( void ) { cmdSystem->AddCommand( "clearLights", Cmd_ClearLights_f, CMD_FL_GAME|CMD_FL_CHEAT, "clears all lights" ); cmdSystem->AddCommand( "gameError", Cmd_GameError_f, CMD_FL_GAME|CMD_FL_CHEAT, "causes a game error" ); - cmdSystem->AddCommand( "disasmScript", Cmd_DisasmScript_f, CMD_FL_GAME|CMD_FL_CHEAT, "disassembles script" ); - cmdSystem->AddCommand( "recordViewNotes", Cmd_RecordViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "record the current view position with notes" ); - cmdSystem->AddCommand( "showViewNotes", Cmd_ShowViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "show any view notes for the current map, successive calls will cycle to the next note" ); - cmdSystem->AddCommand( "closeViewNotes", Cmd_CloseViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "close the view showing any notes for this map" ); - cmdSystem->AddCommand( "exportmodels", Cmd_ExportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "exports models", ArgCompletion_DefFile ); + //cmdSystem->AddCommand( "disasmScript", Cmd_DisasmScript_f, CMD_FL_GAME|CMD_FL_CHEAT, "disassembles script" ); + //cmdSystem->AddCommand( "recordViewNotes", Cmd_RecordViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "record the current view position with notes" ); + //cmdSystem->AddCommand( "showViewNotes", Cmd_ShowViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "show any view notes for the current map, successive calls will cycle to the next note" ); + //cmdSystem->AddCommand( "closeViewNotes", Cmd_CloseViewNotes_f, CMD_FL_GAME|CMD_FL_CHEAT, "close the view showing any notes for this map" ); + //cmdSystem->AddCommand( "exportmodels", Cmd_ExportModels_f, CMD_FL_GAME|CMD_FL_CHEAT, "exports models", ArgCompletion_DefFile ); // multiplayer client commands ( replaces old impulses stuff ) cmdSystem->AddCommand( "clientDropWeapon", idMultiplayerGame::DropWeapon_f, CMD_FL_GAME, "drop current weapon" );