Added Stellar Prey support for the master server
diff --git a/src/engine/qcommon/qcommon.h b/src/engine/qcommon/qcommon.h
index a2e2efa..3ccd926 100644
--- a/src/engine/qcommon/qcommon.h
+++ b/src/engine/qcommon/qcommon.h
@@ -292,31 +292,25 @@ The server you attempted to join is running an incompatible version of the game.
You or the server may be running older versions of the game. Press the auto-update\
button if it appears on the Main Menu screen."
-#define GAMENAME_STRING "CelestialHarvest"
+//Dushan - I will soon move this in the appConfig.h
+#define GAMENAME_STRING "StellarPray"
+
#ifndef PRE_RELEASE_DEMO
-// 2.56 - protocol 83
-// 2.4 - protocol 80
-// 1.33 - protocol 59
-// 1.4 - protocol 60
#define ETPROTOCOL_VERSION 2
#else
// the demo uses a different protocol version for independant browsing
#define ETPROTOCOL_VERSION 1
#endif
-// maintain a list of compatible protocols for demo playing
-// NOTE: that stuff only works with two digits protocols
-extern S32 demo_protocols[];
-
// NERVE - SMF - wolf multiplayer master servers
#ifndef MASTER_SERVER_NAME
-#define MASTER_SERVER_NAME "74.91.120.190"
+#define MASTER_SERVER_NAME "master.grangerhub.org"
#endif
-#define MOTD_SERVER_NAME "74.91.120.190"//"etmotd.idsoftware.com" // ?.?.?.?
+#define MOTD_SERVER_NAME "master.grangerhub.org"//"etmotd.idsoftware.com" // ?.?.?.?
// TTimo: override autoupdate server for testing
#ifndef AUTOUPDATE_SERVER_NAME
-#define AUTOUPDATE_SERVER_NAME "74.91.120.190"
+#define AUTOUPDATE_SERVER_NAME "update.grangerhub.org"
//#define AUTOUPDATE_SERVER_NAME "au2rtcw2.activision.com"
#endif
@@ -345,6 +339,10 @@ extern S32 demo_protocols[];
// PORT_SERVER so a single machine can
// run multiple servers
+// maintain a list of compatible protocols for demo playing
+// NOTE: that stuff only works with two digits protocols
+extern S32 demo_protocols[];
+
// the svc_strings[] array in cl_parse.c should mirror this
//
// server to client
diff --git a/src/engine/server/serverMain.h b/src/engine/server/serverMain.h
index 27b845b..972fe3e 100644
--- a/src/engine/server/serverMain.h
+++ b/src/engine/server/serverMain.h
@@ -39,8 +39,11 @@
#define __SERVERMAIN_H__
#define HEARTBEAT_MSEC 50 * 1000
-#define HEARTBEAT_GAME "CelestialHarvest-1"
-#define HEARTBEAT_DEAD "CelestialHarvestFlatline-1"
+
+//Dushan - I will soon move this in the appConfig.h
+#define HEARTBEAT_GAME "StellarPray-1"
+#define HEARTBEAT_DEAD "StellarPrayFlatline-1"
+
static S32 lastTimeResolve[MAX_MASTER_SERVERS];
//
diff --git a/src/tools/master/games.cpp b/src/tools/master/games.cpp
index f8b68df..b8fe081 100644
--- a/src/tools/master/games.cpp
+++ b/src/tools/master/games.cpp
@@ -152,7 +152,7 @@ qboolean Game_IsAccepted( const char* game_name )
#define GAMENAME_Q3A "Quake3Arena" // Quake 3 Arena
#define GAMENAME_RTCW "wolfmp" // Return to Castle Wolfenstein
#define GAMENAME_WOET "et" // Wolfenstein: Enemy Territory
-
+#define GAMENAME_ST "StellarPrey" // Stellar Prey
// ---------- Private types (game properties) ---------- //
@@ -572,6 +572,18 @@ void Game_InitProperties( void )
},
},
+ // Stellar Prey
+ {
+ GAMENAME_ST,
+ 4,
+ {
+ "protocols=1,2",
+ "options=send-empty-servers,send-full-servers",
+ "heartbeat=StellarPray-1",
+ "flatline=StellarPrayFlatline-1",
+ },
+ },
+
};
size_t game_count = sizeof( builtin_props_array ) / sizeof( builtin_props_array[0] );
diff --git a/src/tools/master/games.h b/src/tools/master/games.h
index 0f78d7a..f2add3d 100644
--- a/src/tools/master/games.h
+++ b/src/tools/master/games.h
@@ -37,7 +37,7 @@ qboolean Game_IsAccepted( const char* game_name );
// ---------- Public constants (game properties) ---------- //
// Heartbeat tag for the DarkPlaces protocol
-#define HEARTBEAT_DARKPLACES "Tremulous-1"
+#define HEARTBEAT_DARKPLACES "StellarPrey-1"
// ---------- Public types (game properties) ---------- //
GitHub
sha: 33a2d30d
