teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-28 06:31:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add HOMEPATH default name define to q_shared.c, patch by uZu (#4973)

Browse source 
- Reverted change from (#4972) and implemented the other suggestion to be consistent with cl_cgame.c and cl_ui.c
This commit is contained in:
Thilo Schulz 2011-05-04 15:39:35 +00:00
parent 1062c1b87b
commit 876fd7dcb9
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/qcommon/q_shared.h
View file

@ -34,6 +34,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces #define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces
#define HEARTBEAT_FOR_MASTER GAMENAME_FOR_MASTER #define HEARTBEAT_FOR_MASTER GAMENAME_FOR_MASTER
#define FLATLINE_FOR_MASTER GAMENAME_FOR_MASTER "dead" #define FLATLINE_FOR_MASTER GAMENAME_FOR_MASTER "dead"
#define HOMEPATH_NAME_UNIX ".foo"
#define HOMEPATH_NAME_WIN "FooBar"
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
#else #else
#define PRODUCT_NAME "ioq3" #define PRODUCT_NAME "ioq3"
#define BASEGAME "baseq3" #define BASEGAME "baseq3"
@ -42,6 +45,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define GAMENAME_FOR_MASTER "Quake3Arena" #define GAMENAME_FOR_MASTER "Quake3Arena"
#define HEARTBEAT_FOR_MASTER "QuakeArena-1" #define HEARTBEAT_FOR_MASTER "QuakeArena-1"
#define FLATLINE_FOR_MASTER HEARTBEAT_FOR_MASTER #define FLATLINE_FOR_MASTER HEARTBEAT_FOR_MASTER
#define HOMEPATH_NAME_UNIX ".q3a"
#define HOMEPATH_NAME_WIN "Quake3"
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
#endif #endif
#define BASETA "missionpack" #define BASETA "missionpack"

12
code/server/sv_game.c
View file

@ -27,14 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
botlib_export_t *botlib_export; botlib_export_t *botlib_export;
void SV_GameError( const char *string ) {
Com_Error( ERR_DROP, "%s", string );
}
void SV_GamePrint( const char *string ) {
Com_Printf( "%s", string );
}
// these functions must be used instead of pointer arithmetic, because // these functions must be used instead of pointer arithmetic, because
// the game allocates gentities with private information after the server shared part // the game allocates gentities with private information after the server shared part
int SV_NumForGentity( sharedEntity_t *ent ) { int SV_NumForGentity( sharedEntity_t *ent ) {
@ -300,10 +292,10 @@ The module is making a system call
intptr_t SV_GameSystemCalls( intptr_t *args ) { intptr_t SV_GameSystemCalls( intptr_t *args ) {
switch( args[0] ) { switch( args[0] ) {
case G_PRINT: case G_PRINT:
SV_GamePrintf((const char*) VMA(1)); Com_Printf( "%s", (const char*)VMA(1) );
return 0; return 0;
case G_ERROR: case G_ERROR:
SV_GameError((const char*) VMA(1)); Com_Error( ERR_DROP, "%s", (const char*)VMA(1) );
return 0; return 0;
case G_MILLISECONDS: case G_MILLISECONDS:
return Sys_Milliseconds(); return Sys_Milliseconds();

4
code/sys/sys_unix.c
View file

@ -63,12 +63,12 @@ char *Sys_DefaultHomePath(void)
if(com_homepath->string[0]) if(com_homepath->string[0])
Q_strcat(homePath, sizeof(homePath), com_homepath->string); Q_strcat(homePath, sizeof(homePath), com_homepath->string);
else else
Q_strcat(homePath, sizeof(homePath), "Quake3"); Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_MACOSX);
#else #else
if(com_homepath->string[0]) if(com_homepath->string[0])
Q_strcat(homePath, sizeof(homePath), com_homepath->string); Q_strcat(homePath, sizeof(homePath), com_homepath->string);
else else
Q_strcat(homePath, sizeof(homePath), ".q3a"); Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_UNIX);
#endif #endif
} }
} }

2
code/sys/sys_win32.c
View file

@ -94,7 +94,7 @@ char *Sys_DefaultHomePath( void )
if(com_homepath->string[0]) if(com_homepath->string[0])
Q_strcat(homePath, sizeof(homePath), com_homepath->string); Q_strcat(homePath, sizeof(homePath), com_homepath->string);
else else
Q_strcat(homePath, sizeof(homePath), "Quake3"); Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_WIN);
FreeLibrary(shfolder); FreeLibrary(shfolder);
} }