ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes

This commit is contained in:
Walter Julius Hennecke 2012-01-23 00:05:51 +01:00
parent 1e26694845
commit 61429f882f
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/client/cl_console.c
View File

@ -610,21 +610,7 @@ void Con_DrawNotify (void)
// draw the chat line // draw the chat line
if ( Key_GetCatcher( ) & KEYCATCH_MESSAGE ) if ( Key_GetCatcher( ) & KEYCATCH_MESSAGE )
{ {
#ifdef ELITEFORCE #ifdef XTRA
if (chat_team)
{
SCR_DrawSmallString (8, v, "say_team:", 1.0f );
skip = 11;
}
else
{
SCR_DrawSmallString (8, v, "say:", 1.0f );
skip = 6;
}
Field_Draw(&chatField, skip * SMALLCHAR_WIDTH, v,
SCREEN_WIDTH - ( skip + 1 ) * SMALLCHAR_WIDTH, qtrue, qtrue);
#elif defined(XTRA)
if (chat_team) if (chat_team)
{ {
SCR_DrawSmallString (8, v, "global:", 1.0f ); SCR_DrawSmallString (8, v, "global:", 1.0f );
@ -646,6 +632,20 @@ void Con_DrawNotify (void)
skip = 7; skip = 7;
} }
Field_Draw(&chatField, skip * SMALLCHAR_WIDTH, v,
SCREEN_WIDTH - ( skip + 1 ) * SMALLCHAR_WIDTH, qtrue, qtrue);
#elif defined(ELITEFORCE)
if (chat_team)
{
SCR_DrawSmallString (8, v, "say_team:", 1.0f );
skip = 11;
}
else
{
SCR_DrawSmallString (8, v, "say:", 1.0f );
skip = 6;
}
Field_Draw(&chatField, skip * SMALLCHAR_WIDTH, v, Field_Draw(&chatField, skip * SMALLCHAR_WIDTH, v,
SCREEN_WIDTH - ( skip + 1 ) * SMALLCHAR_WIDTH, qtrue, qtrue); SCREEN_WIDTH - ( skip + 1 ) * SMALLCHAR_WIDTH, qtrue, qtrue);
#else #else

6
code/qcommon/common.c
View File

@ -32,10 +32,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif #endif
int demo_protocols[] = int demo_protocols[] =
#ifdef ELITEFORCE #ifdef XTRA
{ 0 };
#elif defined(XTRA)
{ 25, 59, 0 }; { 25, 59, 0 };
#elif defined(ELITEFORCE)
{ 0 };
#else #else
{ 67, 66, 0 }; { 67, 66, 0 };
#endif #endif

22
code/qcommon/q_shared.h
View File

@ -37,17 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define GAMENAME_FOR_MASTER "foobar" // must NOT contain whitespace #define GAMENAME_FOR_MASTER "foobar" // must NOT contain whitespace
// #define LEGACY_PROTOCOL // You probably don't need this for your standalone game // #define LEGACY_PROTOCOL // You probably don't need this for your standalone game
#else #else
#ifdef ELITEFORCE #ifdef XTRA
#define PRODUCT_NAME "ioST:V HM"
#define BASEGAME "baseEF"
#define CLIENT_WINDOW_TITLE "iostvoyHM"
#define CLIENT_WINDOW_MIN_TITLE "iostvoyHM"
#define HOMEPATH_NAME_UNIX ".stvef"
#define HOMEPATH_NAME_WIN "STVEF"
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
#define GAMENAME_FOR_MASTER "EliteForce"
#define LEGACY_PROTOCOL
#elif defined(XTRA)
#define PRODUCT_NAME "rpgxEF" #define PRODUCT_NAME "rpgxEF"
#define BASEGAME "baseEF" #define BASEGAME "baseEF"
#define CLIENT_WINDOW_TITLE "rpgxEF" #define CLIENT_WINDOW_TITLE "rpgxEF"
@ -57,6 +47,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN #define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
#define GAMENAME_FOR_MASTER "EliteForce" #define GAMENAME_FOR_MASTER "EliteForce"
#define LEGACY_PROTOCOL #define LEGACY_PROTOCOL
#elif defined(ELITEFORCE)
#define PRODUCT_NAME "ioST:V HM"
#define BASEGAME "baseEF"
#define CLIENT_WINDOW_TITLE "iostvoyHM"
#define CLIENT_WINDOW_MIN_TITLE "iostvoyHM"
#define HOMEPATH_NAME_UNIX ".stvef"
#define HOMEPATH_NAME_WIN "STVEF"
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
#define GAMENAME_FOR_MASTER "EliteForce"
#define LEGACY_PROTOCOL
#else #else
#define PRODUCT_NAME "ioq3" #define PRODUCT_NAME "ioq3"
#define BASEGAME "baseq3" #define BASEGAME "baseq3"

8
code/qcommon/qcommon.h
View File

@ -262,12 +262,12 @@ PROTOCOL
============================================================== ==============================================================
*/ */
#ifdef ELITEFORCE #ifdef XTRA
#define PROTOCOL_VERSION 26
#define PROTOCOL_LEGACY_VERSION 24
#elif defined(XTRA)
#define PROTOCOL_VERSION 60 #define PROTOCOL_VERSION 60
#define PROTOCOL_LEGACY_VERSION 59 #define PROTOCOL_LEGACY_VERSION 59
#elif defined(ELITEFORCE)
#define PROTOCOL_VERSION 26
#define PROTOCOL_LEGACY_VERSION 24
#else #else
#define PROTOCOL_VERSION 71 #define PROTOCOL_VERSION 71
#define PROTOCOL_LEGACY_VERSION 68 #define PROTOCOL_LEGACY_VERSION 68