• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

This is a fork of Zandronum Beta for TSPG.


Commit MetaInfo

Revisione538cc2e46c24166bcb94e81dde6133e54359c92 (tree)
Time2021-09-29 22:18:58
AuthorJoshua Surace <doomjoshuaboy@gmai...>
CommiterJoshua Surace

Log Message

Fixed a few errors when compiling with "TSPG_BLACKLIST".

Change Summary

Incremental Difference

diff -r a14fce53a097 -r e538cc2e46c2 src/c_cmds.cpp
--- a/src/c_cmds.cpp Mon Sep 27 09:23:07 2021 +1000
+++ b/src/c_cmds.cpp Wed Sep 29 23:18:58 2021 +1000
@@ -98,7 +98,7 @@
9898 #if defined( SERVER_ONLY ) && defined( SERVER_BLACKLIST )
9999 CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH | CVAR_NOSET)
100100 #else
101-CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH)
101+CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH | CVAR_NOSETBYACS)
102102 #endif
103103 CVAR (Bool, sv_unlimited_pickup, false, CVAR_SERVERINFO)
104104 CVAR (Bool, sv_logfilenametimestamp, true, CVAR_ARCHIVE)
diff -r a14fce53a097 -r e538cc2e46c2 src/sv_main.cpp
--- a/src/sv_main.cpp Mon Sep 27 09:23:07 2021 +1000
+++ b/src/sv_main.cpp Wed Sep 29 23:18:58 2021 +1000
@@ -250,9 +250,6 @@
250250 // [TSPG]
251251 static char *g_pszStartupTime;
252252
253-// [BB] Seperate log file to debug the tic buffer.
254-static FILE *MoveCMDRegulatorLogFile = NULL;
255-
256253 // [RC] File to log packets to.
257254 #ifdef CREATE_PACKET_LOG
258255 static FILE *PacketLogFile = NULL;
@@ -560,21 +557,6 @@
560557
561558 #endif
562559
563- if ( sv_logticbufferdebuginfo )
564- {
565- // [TSPG] use different filename basic on usid
566- char tbdlfilename[512];
567- snprintf(tbdlfilename, sizeof(tbdlfilename), "/home/zandronum/zandronum/crash/ticbufferdebuglog.%s.txt", Args->CheckValue("-usid"));
568-
569- if ( MoveCMDRegulatorLogFile = fopen( tbdlfilename, "w" ) )
570- {
571- fputs( "Started tic buffer debug logging\n", MoveCMDRegulatorLogFile );
572- Printf( "Tic buffer debug logging enabled. File path: %s\n", tbdlfilename );
573- }
574- else
575- Printf( "Could not start the ticbuffer debug log.\n" );
576- }
577-
578560 // Call SERVER_Destruct() when Skulltag closes.
579561 atterm( SERVER_Destruct );
580562
@@ -691,11 +673,6 @@
691673 gametic++;
692674 maketic++;
693675
694- // However we need to spawn the unlagged debug actors here i.e. after having processed their
695- // movement commands which updated their last server gametic.
696- // [BB] Spawn debug actors if the server runner wants them.
697- if ( sv_unlagged_debugactors )
698- UNLAGGED_SpawnDebugActors( );
699676
700677 // Update the scoreboard if we have a new second to display.
701678 if ( timelimit && (( level.time % TICRATE ) == 0 ) && ( level.time != iOldTime ))
@@ -1404,12 +1381,12 @@
14041381
14051382 // Send welcome message.
14061383 SERVER_PrintfPlayer( g_lCurrentClient, "\n" );
1407- SERVER_PrintfPlayer( g_lCurrentClient, "\\cnWelcome to \\cj%s\\cn!\n", brandingName );
1408- SERVER_PrintfPlayer( g_lCurrentClient, "\\cnThis server is running \\cj%s %s (TSPGv%s)\n", GAMENAME, GetVersionStringRev(), TSPG_VERSION_STR);
1409- SERVER_PrintfPlayer( g_lCurrentClient, "\\cn Compiled on \\cj%s\\cn at \\cj%s\n", __DATE__, __TIME__ );
1410- if (owner) SERVER_PrintfPlayer(g_lCurrentClient, "\\cnThis server was started by \\cj%s\\cn at \\cj%s", owner, g_pszStartupTime);
1411- SERVER_PrintfPlayer(g_lCurrentClient, "\\cnIf you wish to host your own server on %s, visit \\cj%s\\cn!\n", brandingShort, brandingUrl);
1412- SERVER_PrintfPlayer(g_lCurrentClient, "\n\\cfServer information:\n");
1384+ SERVER_PrintfPlayer( g_lCurrentClient, "\cnWelcome to \cj%s\cn!\n", brandingName );
1385+ SERVER_PrintfPlayer( g_lCurrentClient, "\cnThis server is running \cj%s %s (TSPGv%s)\n", GAMENAME, GetVersionStringRev(), TSPG_VERSION_STR);
1386+ SERVER_PrintfPlayer( g_lCurrentClient, "\cn Compiled on \cj%s\cn at \cj%s\n", __DATE__, __TIME__ );
1387+ if (owner) SERVER_PrintfPlayer(g_lCurrentClient, "\cnThis server was started by \cj%s\cn at \cj%s", owner, g_pszStartupTime);
1388+ SERVER_PrintfPlayer(g_lCurrentClient, "\cnIf you wish to host your own server on %s, visit \cj%s\cn!\n", brandingShort, brandingUrl);
1389+ SERVER_PrintfPlayer(g_lCurrentClient, "\n\cfServer information:\n");
14131390
14141391 SERVER_PrintfPlayer(PRINT_HIGH, g_lCurrentClient, "\\cg %s\n", sv_hostname.GetGenericRep(CVAR_String).String);
14151392 SERVER_PrintfPlayer(PRINT_HIGH, g_lCurrentClient, " dmflags=%lu dmflags2=%lu dmflags3=%lu compatflags=%lu compatflags2=%lu\n", (LONG)dmflags, (LONG)dmflags2, (LONG)zadmflags, (LONG)compatflags, (LONG)compatflags2);