Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure chat messages won't be overlooked during mp games by making chat messages stand out from system messages. 

If enemy/foe radar colors are on (SHIFT+TAB) then all ally messages are yellow, enemy messages are red. If enemy/foe mode is off all chat messages are simply brighter than system messages.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4272 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-03-23 20:04:37 +00:00
parent 438712585c
commit 399e92a1ed
28 changed files with 289 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/ivis_common/piepalette.h
View File

@ -22,41 +22,47 @@
#include "lib/ivis_common/piedef.h"
#define WZCOL_BLACK psPalette[0]
#define WZCOL_WHITE psPalette[1]
#define WZCOL_BLACK psPalette[0]
#define WZCOL_WHITE psPalette[1]
#define WZCOL_RELOAD_BACKGROUND psPalette[2]
#define WZCOL_RELOAD_BAR psPalette[3]
#define WZCOL_HEALTH_HIGH psPalette[4]
#define WZCOL_HEALTH_MEDIUM psPalette[5]
#define WZCOL_HEALTH_LOW psPalette[6]
#define WZCOL_GREEN psPalette[7]
#define WZCOL_RED psPalette[8]
#define WZCOL_YELLOW psPalette[9]
#define WZCOL_RELOAD_BAR psPalette[3]
#define WZCOL_HEALTH_HIGH psPalette[4]
#define WZCOL_HEALTH_MEDIUM psPalette[5]
#define WZCOL_HEALTH_LOW psPalette[6]
#define WZCOL_GREEN psPalette[7]
#define WZCOL_RED psPalette[8]
#define WZCOL_YELLOW psPalette[9]
#define WZCOL_MENU_BACKGROUND psPalette[10]
#define WZCOL_MENU_BORDER psPalette[11]
#define WZCOL_MENU_BORDER psPalette[11]
#define WZCOL_MENU_LOAD_BORDER psPalette[12]
#define WZCOL_CURSOR psPalette[13]
#define WZCOL_CURSOR psPalette[13]
#define WZCOL_MENU_SCORES_INTERIOR psPalette[14]
#define WZCOL_MENU_SEPARATOR psPalette[15]
#define WZCOL_TEXT_BRIGHT psPalette[16]
#define WZCOL_TEXT_MEDIUM psPalette[17]
#define WZCOL_TEXT_DARK psPalette[18]
#define WZCOL_TEXT_BRIGHT psPalette[16]
#define WZCOL_TEXT_MEDIUM psPalette[17]
#define WZCOL_TEXT_DARK psPalette[18]
#define WZCOL_SCORE_BOX_BORDER psPalette[19]
#define WZCOL_SCORE_BOX psPalette[20]
#define WZCOL_TOOLTIP_TEXT psPalette[21]
#define WZCOL_SCORE_BOX psPalette[20]
#define WZCOL_TOOLTIP_TEXT psPalette[21]
#define WZCOL_UNIT_SELECT_BORDER psPalette[22]
#define WZCOL_UNIT_SELECT_BOX psPalette[23]
#define WZCOL_RADAR_BACKGROUND psPalette[24]
#define WZCOL_MAP_OUTLINE_OK psPalette[25]
#define WZCOL_MAP_OUTLINE_BAD psPalette[26]
#define WZCOL_KEYMAP_ACTIVE psPalette[27]
#define WZCOL_KEYMAP_FIXED psPalette[28]
#define WZCOL_KEYMAP_ACTIVE psPalette[27]
#define WZCOL_KEYMAP_FIXED psPalette[28]
#define WZCOL_MENU_SCORE_LOSS psPalette[29]
#define WZCOL_MENU_SCORE_DESTROYED psPalette[30]
#define WZCOL_MENU_SCORE_BUILT psPalette[31]
#define WZCOL_MENU_SCORE_RANK psPalette[32]
#define WZCOL_FRAME_BORDER_NORMAL psPalette[33]
#define WZCOL_MAX 34
#define WZCOL_CONS_TEXT_SYSTEM psPalette[34]
#define WZCOL_CONS_TEXT_USER psPalette[35]
#define WZCOL_CONS_TEXT_USER_ALLY psPalette[36]
#define WZCOL_CONS_TEXT_USER_ENEMY psPalette[37]
#define WZCOL_CONS_TEXT_DEBUG psPalette[38]
#define WZCOL_MAX 39
//*************************************************************************

6
lib/ivis_opengl/piepalette.c
View File

@ -94,6 +94,12 @@ void pal_Init(void)
WZCOL_MENU_SCORE_RANK = pal_Colour(199, 127, 103);
WZCOL_FRAME_BORDER_NORMAL = pal_Colour(145, 0, 195);
WZCOL_CONS_TEXT_SYSTEM = pal_Colour(200, 200, 200);
WZCOL_CONS_TEXT_USER = WZCOL_TEXT_BRIGHT;
WZCOL_CONS_TEXT_USER_ALLY = WZCOL_YELLOW;
WZCOL_CONS_TEXT_USER_ENEMY = WZCOL_RED;
WZCOL_CONS_TEXT_DEBUG = pal_Colour(150, 150, 150);
}
void pal_ShutDown(void)

14
src/aiexperience.c
View File

@ -141,7 +141,7 @@ BOOL SavePlayerAIExperience(SDWORD nPlayer, BOOL bNotify)
{
debug(LOG_ERROR,"SavePlayerAIExperience - failed to save exper");
//addConsoleMessage("Failed to save experience.",RIGHT_JUSTIFY);
//addConsoleMessage("Failed to save experience.",RIGHT_JUSTIFY,CONSOLE_SYSTEM);
console("Failed to save experience for player %d.", nPlayer);
return FALSE;
}
@ -777,7 +777,7 @@ BOOL StoreBaseDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer)
{
if(baseDefendLocation[nPlayer][i][0] < 0) //not initialized yet
{
//addConsoleMessage("Base defense location - NEW LOCATION.", RIGHT_JUSTIFY);
//addConsoleMessage("Base defense location - NEW LOCATION.", RIGHT_JUSTIFY,CONSOLE_SYSTEM);
baseDefendLocation[nPlayer][i][0] = x;
baseDefendLocation[nPlayer][i][1] = y;
@ -790,12 +790,12 @@ BOOL StoreBaseDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer)
}
}
addConsoleMessage("Base defense location - NO SPACE LEFT.",RIGHT_JUSTIFY);
addConsoleMessage("Base defense location - NO SPACE LEFT.",RIGHT_JUSTIFY,CONSOLE_SYSTEM);
return FALSE; //not enough space to store
}
else //this one already stored
{
//addConsoleMessage("Base defense location - INCREASED PRIORITY.",RIGHT_JUSTIFY);
//addConsoleMessage("Base defense location - INCREASED PRIORITY.",CONSOLE_SYSTEM);
baseDefendLocPrior[nPlayer][index]++; //higher the priority
@ -928,7 +928,7 @@ BOOL StoreOilDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer)
{
if(oilDefendLocation[nPlayer][i][0] < 0) //not initialized yet
{
//addConsoleMessage("Oil defense location - NEW LOCATION.", RIGHT_JUSTIFY);
//addConsoleMessage("Oil defense location - NEW LOCATION.", CONSOLE_SYSTEM);
oilDefendLocation[nPlayer][i][0] = x;
oilDefendLocation[nPlayer][i][1] = y;
@ -941,12 +941,12 @@ BOOL StoreOilDefendLoc(SDWORD x, SDWORD y, SDWORD nPlayer)
}
}
addConsoleMessage("Oil defense location - NO SPACE LEFT.",RIGHT_JUSTIFY);
addConsoleMessage("Oil defense location - NO SPACE LEFT.",RIGHT_JUSTIFY,CONSOLE_SYSTEM);
return FALSE; //not enough space to store
}
else //this one already stored
{
//addConsoleMessage("Oil defense location - INCREASED PRIORITY.",RIGHT_JUSTIFY);
//addConsoleMessage("Oil defense location - INCREASED PRIORITY.",CONSOLE_SYSTEM);
oilDefendLocPrior[nPlayer][index]++; //higher the priority

2
src/cheat.c
View File

@ -100,7 +100,7 @@ BOOL attemptCheatCode(const char* cheat_name)
strlcpy(errorString, cheat_name, sizeof(errorString));
strlcat(errorString, "?", sizeof(errorString));
addConsoleMessage(errorString, LEFT_JUSTIFY);
addConsoleMessage(errorString, LEFT_JUSTIFY,CONSOLE_SYSTEM);
}
return(FALSE);
}

101
src/console.c
View File

@ -36,6 +36,7 @@
#include "scriptextern.h"
#include "lib/sound/audio_id.h"
#include "lib/sound/audio.h"
#include "radar.h"
/* Alex McLean, Pumpkin Studios, EIDOS Interactive */
@ -104,7 +105,7 @@ char ConsoleString[MAX_CONSOLE_TMP_STRING_LENGTH];
/* MODULE CONSOLE PROTOTYPES */
void consolePrintf ( char *layout, ... );
void setConsoleSizePos ( UDWORD x, UDWORD y, UDWORD width );
BOOL addConsoleMessage ( const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType );
BOOL addConsoleMessage ( const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, CONSOLE_TEXT_TYPE textType );
void updateConsoleMessages ( void );
void displayConsoleMessages ( void );
void initConsoleMessages ( void );
@ -119,8 +120,10 @@ void setConsolePermanence ( BOOL state, BOOL bClearOld );
BOOL mouseOverConsoleBox ( void );
void setConsoleLineInfo ( UDWORD vis );
UDWORD getConsoleLineInfo ( void );
void permitNewConsoleMessages ( BOOL allow);
void permitNewConsoleMessages ( BOOL allow);
int displayOldMessages ( void );
void setConsoleTextColor ( CONSOLE_TEXT_TYPE type );
CONSOLE_TEXT_TYPE pickConsolePlayerTextType(UDWORD player1, UDWORD player2);
/** Sets the system up */
void initConsoleMessages( void )
@ -192,7 +195,8 @@ void toggleConsoleDrop( void )
}
/** Add a string to the console. */
static BOOL _addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType)
static BOOL _addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType,
CONSOLE_TEXT_TYPE textType)
{
int textLength;
CONSOLE_MESSAGE *psMessage;
@ -221,6 +225,9 @@ static BOOL _addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATI
/* Then set it */
jusType = defJustification;
}
consoleStorage[messageIndex].textType = textType;
/* Precalculate and store (quicker!) the indent for justified text */
switch(jusType)
{
@ -286,9 +293,10 @@ static BOOL _addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATI
}
/// Wrapper for _addConsoleMessage
BOOL addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType)
BOOL addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType,
CONSOLE_TEXT_TYPE textType)
{
return _addConsoleMessage(messageText,jusType);
return _addConsoleMessage(messageText, jusType, textType);
}
/// \return The number of console messages currently active
@ -402,6 +410,56 @@ void flushConsoleMessages( void )
messageId = 0;
}
/** Choose an appropriate message type, which will result in
appropriate console text color, depending on current radar
type and whether source and destination players are in alliance. */
CONSOLE_TEXT_TYPE pickConsolePlayerTextType(UDWORD player1, UDWORD player2)
{
if(bEnemyAllyRadarColor)
{
if(aiCheckAlliances(player1,player2))
{
return CONSOLE_USER_ALLY;
}
else
{
return CONSOLE_USER_ENEMY;
}
}
return CONSOLE_USER; // pick a default color if friend-foe radar colors are off
}
/** Sets console text color depending on message type */
void setConsoleTextColor(CONSOLE_TEXT_TYPE type)
{
switch(type) // run relevant title screen code.
{
// System message: 'research complete' etc
case CONSOLE_SYSTEM:
iV_SetTextColour(WZCOL_CONS_TEXT_SYSTEM);
break;
// Human or AI Chat messages
case CONSOLE_USER:
iV_SetTextColour(WZCOL_CONS_TEXT_USER);
break;
case CONSOLE_USER_ALLY:
iV_SetTextColour(WZCOL_CONS_TEXT_USER_ALLY);
break;
case CONSOLE_USER_ENEMY:
iV_SetTextColour(WZCOL_CONS_TEXT_USER_ENEMY);
break;
// Currently debug output from scripts
case CONSOLE_DEBUG:
iV_SetTextColour(WZCOL_CONS_TEXT_USER);
break;
default:
debug( LOG_ERROR, "unknown console message type" );
abort();
}
}
/** Displays all the console messages */
void displayConsoleMessages( void )
{
@ -435,12 +493,10 @@ void displayConsoleMessages( void )
pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_ON);
pie_SetFogStatus(FALSE);
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
drop = 0;
if(bConsoleDropped)
{
drop = displayOldMessages();
}
if(consoleMessages==NULL)
@ -463,32 +519,36 @@ void displayConsoleMessages( void )
/* How big a box is necessary? */
boxDepth = (numActiveMessages> consoleVisibleLines ? consoleVisibleLines-1 : numActiveMessages-1);
/* Add on the extra - hope it doesn't exceed two lines! */
boxDepth+=exceed;
/* GET RID OF THE MAGIC NUMBERS BELOW */
clipDepth = (mainConsole.topY+(boxDepth*linePitch)+CON_BORDER_HEIGHT+drop);
if(clipDepth > (pie_GetVideoBufferHeight() - linePitch))
{
clipDepth = (pie_GetVideoBufferHeight() - linePitch);
}
iV_TransBoxFill(mainConsole.topX - CON_BORDER_WIDTH,mainConsole.topY-mainConsole.textDepth-CON_BORDER_HEIGHT+drop+1,
mainConsole.topX+mainConsole.width ,clipDepth);
}
/* Stop when we've drawn enough or we're at the end */
MesY = mainConsole.topY + drop;
for(psMessage = consoleMessages,numProcessed = 0;
psMessage && numProcessed<consoleVisibleLines && MesY < (pie_GetVideoBufferHeight()-linePitch);
psMessage = psMessage->psNext)
{
/* Set text color depending on message type */
setConsoleTextColor(psMessage->textType);
/* Draw the text string */
MesY = iV_DrawFormattedText(psMessage->text,
mainConsole.topX,
MesY,
mainConsole.width,
psMessage->JustifyType);
MesY = iV_DrawFormattedText(psMessage->text, mainConsole.topX, MesY,
mainConsole.width, psMessage->JustifyType);
/* Move on */
numProcessed++;
}
@ -581,6 +641,9 @@ int displayOldMessages()
/* Render what we found */
for(i=count-1; i>0; i--)
{
/* Set text color depending on message type */
setConsoleTextColor(consoleStorage[history[i]].textType);
/* Draw the text string */
MesY = iV_DrawFormattedText(consoleStorage[history[i]].text,
mainConsole.topX,
@ -588,6 +651,10 @@ int displayOldMessages()
mainConsole.width,
consoleStorage[history[i]].JustifyType);
}
/* Set text color depending on message type */
setConsoleTextColor(consoleStorage[history[0]].textType);
/* Draw the top one */
iV_DrawFormattedText(consoleStorage[history[0]].text,
mainConsole.topX,
@ -720,7 +787,7 @@ va_list arguments; // Formatting info
consoleString[sizeof(consoleString) - 1] = '\0';
/* Add the message through the normal channels! */
addConsoleMessage(consoleString,DEFAULT_JUSTIFY);
addConsoleMessage(consoleString,DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
/* Close arguments */
va_end(arguments);
@ -755,7 +822,7 @@ void printf_console(const char *pFormat, ...)
/* Output it */
addConsoleMessage(aBuffer,RIGHT_JUSTIFY); //debug messages are displayed right-aligned
addConsoleMessage(aBuffer,RIGHT_JUSTIFY,CONSOLE_SYSTEM); //debug messages are displayed right-aligned
#endif
}
@ -774,6 +841,6 @@ void console(const char *pFormat, ...)
aBuffer[sizeof(aBuffer) - 1] = '\0';
/* Output it */
addConsoleMessage(aBuffer,DEFAULT_JUSTIFY);
addConsoleMessage(aBuffer,DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}

50
src/console.h
View File

@ -21,6 +21,8 @@
#ifndef __INCLUDED_SRC_CONSOLE_H__
#define __INCLUDED_SRC_CONSOLE_H__
#include "lib/ivis_common/piedef.h"
#define MAX_CONSOLE_MESSAGES (64)
#define MAX_CONSOLE_STRING_LENGTH (255)
#define MAX_CONSOLE_TMP_STRING_LENGTH (255)
@ -32,36 +34,47 @@
typedef enum
{
LEFT_JUSTIFY,
RIGHT_JUSTIFY,
CENTRE_JUSTIFY,
DEFAULT_JUSTIFY
LEFT_JUSTIFY,
RIGHT_JUSTIFY,
CENTRE_JUSTIFY,
DEFAULT_JUSTIFY
} CONSOLE_TEXT_JUSTIFICATION;
typedef struct _console
{
UDWORD topX;
UDWORD topY;
UDWORD width;
UDWORD textDepth;
BOOL permanent;
UDWORD topX;
UDWORD topY;
UDWORD width;
UDWORD textDepth;
BOOL permanent;
} CONSOLE;
/* Console text type */
typedef enum
{
CONSOLE_SYSTEM,
CONSOLE_USER, // Human or AI Chat messages
CONSOLE_USER_ALLY,
CONSOLE_USER_ENEMY,
CONSOLE_DEBUG
}CONSOLE_TEXT_TYPE;
/* Definition of a message */
typedef struct _console_message
{
char text[MAX_CONSOLE_STRING_LENGTH]; // Text of the message
UDWORD timeAdded; // When was it added to our list?
//UDWORD screenIndex; // Info for justification
UDWORD JustifyType;
UDWORD id;
struct _console_message *psNext;
char text[MAX_CONSOLE_STRING_LENGTH]; // Text of the message
UDWORD timeAdded; // When was it added to our list?
//UDWORD screenIndex; // Info for justification
UDWORD JustifyType;
UDWORD id;
CONSOLE_TEXT_TYPE textType; // Text type, ie a chat message, system message etc
struct _console_message *psNext;
} CONSOLE_MESSAGE;
extern char ConsoleString[MAX_CONSOLE_TMP_STRING_LENGTH];
extern void consolePrintf ( char *layout, ... );
extern BOOL addConsoleMessage ( const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType );
extern BOOL addConsoleMessage ( const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, CONSOLE_TEXT_TYPE textType );
extern void updateConsoleMessages ( void );
extern void initConsoleMessages ( void );
extern void setConsoleMessageDuration ( UDWORD time );
@ -82,6 +95,7 @@ extern void permitNewConsoleMessages ( BOOL allow);
extern void toggleConsoleDrop( void );
extern void printf_console(const char *pFormat, ...); /// Print to the ingame console in debug mode only
extern void console(const char *pFormat, ...); /// Print allways to the ingame console
extern CONSOLE_TEXT_TYPE pickConsolePlayerTextMode(UDWORD player1, UDWORD player2);
/* Basic wrapper to sprintf - allows convenient printf style game info to be displayed */
@ -114,12 +128,12 @@ extern void console(const char *pFormat, ...); /// Print allways to the ingame c
#define CONPRINTF(s,x) \
sprintf x; \
addConsoleMessage(s,DEFAULT_JUSTIFY); \
addConsoleMessage(s,DEFAULT_JUSTIFY,CONSOLE_SYSTEM)
#ifdef DEBUG
#define DBCONPRINTF(s,x) \
sprintf x; \
addConsoleMessage(s,DEFAULT_JUSTIFY)
addConsoleMessage(s,DEFAULT_JUSTIFY,CONSOLE_SYSTEM)
#else
#define DBCONPRINTF(s,x)
#endif

24
src/display.c
View File

@ -1674,7 +1674,7 @@ BOOL ctrlShiftDown(void)
void AddDerrickBurningMessage(void)
{
addConsoleMessage(_("Cannot Build. Oil Resource Burning."),DEFAULT_JUSTIFY);
addConsoleMessage(_("Cannot Build. Oil Resource Burning."),DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
audio_PlayTrack( ID_SOUND_BUILD_FAIL );
}
@ -1683,7 +1683,7 @@ static inline void dealWithLMBDroid(DROID* psDroid, SELECTION_TYPE selection)
if(psDroid->player != selectedPlayer)
{
/* We've clicked on somebody else's droid */
// addConsoleMessage("Clicked on another player's droid",DEFAULT_JUSTIFY);
// addConsoleMessage("Clicked on another player's droid",CONSOLE_SYSTEM);
orderSelectedObjAdd(selectedPlayer, (BASE_OBJECT*)psDroid, ctrlShiftDown());
//lasSat structure can select a target - in multiPlayer only
@ -2058,7 +2058,7 @@ static inline void dealWithLMBFeature(FEATURE* psFeature)
(BASE_STATS*) &asStructureStats[i],
psFeature->pos.x, psFeature->pos.y);
}
addConsoleMessage(_("Truck ordered to build Oil Derrick"),DEFAULT_JUSTIFY);
addConsoleMessage(_("Truck ordered to build Oil Derrick"),DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
// "Construction vehicle ordered to build a Derrick.",DEFAULT_JUSTIFY);
FeedbackOrderGiven();
}
@ -2104,18 +2104,18 @@ static inline void dealWithLMBFeature(FEATURE* psFeature)
}
break;*/
case FEAT_BOULDER:
//addConsoleMessage("Clicked on a Boulder",DEFAULT_JUSTIFY);
//addConsoleMessage("Clicked on a Boulder",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
break;
case FEAT_BUILD_WRECK:
// addConsoleMessage("Clicked on a Wrecked Building",DEFAULT_JUSTIFY);
// addConsoleMessage("Clicked on a Wrecked Building",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
break;
case FEAT_HOVER:
// addConsoleMessage("Clicked on a Hover",DEFAULT_JUSTIFY);
// addConsoleMessage("Clicked on a Hover",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
break;
case FEAT_OIL_RESOURCE:
case FEAT_VEHICLE:
default:
// addConsoleMessage("Clicked on an Obstacle",DEFAULT_JUSTIFY);
// addConsoleMessage("Clicked on an Obstacle",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
break;
}
}
@ -2209,7 +2209,7 @@ void dealWithLMB( void )
gwGetZone(mouseTileX, mouseTileY)));
}
//addConsoleMessage("Droid ordered to new location",DEFAULT_JUSTIFY);
//addConsoleMessage("Droid ordered to new location",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
driveDisableTactical();
@ -2225,7 +2225,7 @@ void dealWithLMB( void )
StartDeliveryPosition( psLocation );
#if 0
/* We've clicked on one of our own DP */
addConsoleMessage("Clicked on your delivery point",DEFAULT_JUSTIFY);
addConsoleMessage("Clicked on your delivery point",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
/* clear the selection */
clearSelection();
@ -2236,7 +2236,7 @@ void dealWithLMB( void )
else
{
/* We've clicked on somebody else's DP - remove this sometime?*/
addConsoleMessage("Clicked on another player's delivery point",DEFAULT_JUSTIFY);
addConsoleMessage("Clicked on another player's delivery point",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
#endif
}
break;
@ -2409,7 +2409,7 @@ static void dealWithRMB( void )
{
/* We've clicked on one of our own droids */
// addGameMessage("Right clicked on own droid",1000,TRUE);
// addConsoleMessage("Right click detected on own droid",DEFAULT_JUSTIFY);
// addConsoleMessage("Right click detected on own droid",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
if(psDroid->selected==TRUE)
{
@ -2461,7 +2461,7 @@ static void dealWithRMB( void )
{
/* We've clicked on our own building */
// addGameMessage("Right clicked on own building",1000,TRUE);
// addConsoleMessage("Right clicked on own building",DEFAULT_JUSTIFY);
// addConsoleMessage("Right clicked on own building",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
if(psStructure->selected==TRUE) {

5
src/display3d.c
View File

@ -280,7 +280,8 @@ static void showDroidPaths(void)
int i;
int len = psDroid->sMove.numPoints;
for (i = 0; i < len; i++)
i = MAX(psDroid->sMove.Position-1,0);
for (; i < len; i++)
{
Vector3i pos;
@ -440,7 +441,7 @@ void draw3DScene( void )
flushConsoleMessages();
setConsolePermanence(TRUE, TRUE);
permitNewConsoleMessages(TRUE);
addConsoleMessage("Warzone 2100 : Pumpkin Studios ", RIGHT_JUSTIFY);
addConsoleMessage("Warzone 2100 : Pumpkin Studios ", RIGHT_JUSTIFY,CONSOLE_SYSTEM);
permitNewConsoleMessages(FALSE);
}

2
src/drive.c
View File

@ -278,7 +278,7 @@ void StopDriverMode(void)
if(psDrivenDroid != NULL)
{
debug( LOG_NEVER, "Drive mode canceled\n" );
addConsoleMessage("Driver mode canceled.", LEFT_JUSTIFY);
addConsoleMessage("Driver mode canceled.", LEFT_JUSTIFY,CONSOLE_SYSTEM);
// audio_StopObjTrack(psDrivenDroid,ID_SOUND_SMALL_DROID_RUN);
psDrivenDroid = NULL;

8
src/droid.c
View File

@ -1799,7 +1799,7 @@ BOOL droidUpdateRestore( DROID *psDroid )
}
else
{
addConsoleMessage(_("Structure Restored") ,DEFAULT_JUSTIFY);
addConsoleMessage(_("Structure Restored") ,DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
//psStruct->resistance = psStruct->pStructureType->resistance;
psStruct->resistance = (UWORD)structureResistance(psStruct->pStructureType,
psStruct->player);
@ -3626,7 +3626,7 @@ char groupInfo[255];
unsigned int num_selected = selNumSelected(selectedPlayer);
snprintf(groupInfo, sizeof(groupInfo), ngettext("Group %u selected - %u Unit", "Group %u selected - %u Units", num_selected), groupNumber, num_selected);
addConsoleMessage(groupInfo,RIGHT_JUSTIFY);
addConsoleMessage(groupInfo,RIGHT_JUSTIFY,CONSOLE_SYSTEM);
// }
}
@ -3640,7 +3640,7 @@ char groupInfo[255];
unsigned int num_selected = selNumSelected(selectedPlayer);
snprintf(groupInfo, sizeof(groupInfo), ngettext("%u unit assigned to Group %u", "%u units assigned to Group %u", num_selected), num_selected, groupNumber);
addConsoleMessage(groupInfo,RIGHT_JUSTIFY);
addConsoleMessage(groupInfo,RIGHT_JUSTIFY,CONSOLE_SYSTEM);
}
}
@ -3658,7 +3658,7 @@ void groupConsoleInformOfCentering( UDWORD groupNumber )
{
snprintf(groupInfo, sizeof(groupInfo), ngettext("Aligning with Group %u - %u Unit", "Aligning with Group %u - %u Units", num_selected), groupNumber, num_selected);
}
addConsoleMessage(groupInfo,RIGHT_JUSTIFY);
addConsoleMessage(groupInfo,RIGHT_JUSTIFY,CONSOLE_SYSTEM);
}

12
src/hci.c
View File

@ -1505,7 +1505,7 @@ static void intProcessEditStats(UDWORD id)
psTForm->majorT = temp;
#ifdef DEBUG_SCROLLTABS
sprintf(buf,"[debug menu]Clicked LT %d tab #=%d",psTForm->TabMultiplier,psTForm->majorT);
addConsoleMessage(buf,DEFAULT_JUSTIFY);
addConsoleMessage(buf,DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
#endif
}
else if (id == IDSTAT_TABSCRL_RIGHT) // user hit right scroll tab from DEBUG menu
@ -1531,7 +1531,7 @@ static void intProcessEditStats(UDWORD id)
}
#ifdef DEBUG_SCROLLTABS //for debuging
sprintf(buf, "[debug menu]Clicked RT %d numtabs %d tab # %d", psTForm->TabMultiplier, numTabs, psTForm->majorT);
addConsoleMessage(buf, DEFAULT_JUSTIFY);
addConsoleMessage(buf, DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
#endif
}
// else //Do we add this or does it not matter?
@ -1675,7 +1675,7 @@ INT_RETVAL intRunWidgets(void)
{
if (saveGame(sRequestResult, GTYPE_SAVE_START))
{
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY);
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY,CONSOLE_SYSTEM);
if(widgGetFromID(psWScreen,IDMISSIONRES_SAVE))
{
@ -3037,7 +3037,7 @@ static void intProcessStats(UDWORD id)
psTForm->majorT = temp;
#ifdef DEBUG_SCROLLTABS
sprintf(buf, "[build menu]Clicked LT %d tab #=%d", psTForm->TabMultiplier, psTForm->majorT);
addConsoleMessage(buf, DEFAULT_JUSTIFY);
addConsoleMessage(buf, DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
#endif
}
else if (id == IDSTAT_TABSCRL_RIGHT) // user hit right scroll tab from BUILD menu
@ -3063,7 +3063,7 @@ static void intProcessStats(UDWORD id)
}
#ifdef DEBUG_SCROLLTABS //for debuging
sprintf(buf, "[build menu]Clicked RT %d numtabs %d tab # %d", psTForm->TabMultiplier, numTabs, psTForm->majorT);
addConsoleMessage(buf, DEFAULT_JUSTIFY);
addConsoleMessage(buf, DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
#endif
}
@ -6230,7 +6230,7 @@ static BOOL setResearchStats(BASE_OBJECT *psObj, BASE_STATS *psStats)
{
if (!usePower(selectedPlayer, pResearch->researchPower))
{
addConsoleMessage("Research: No Power",DEFAULT_JUSTIFY);
addConsoleMessage("Research: No Power",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
return FALSE;
}
}*/

3
src/ingameop.c
View File

@ -399,7 +399,7 @@ void intProcessInGameOptions(UDWORD id)
// {
// loopMissionState = LMS_LOADGAME;
// strcpy(saveGameName, "replay/replay.gam");
// addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY);
// addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
// }
// break;
case INTINGAMEOP_LOAD:
@ -444,3 +444,4 @@ void intProcessInGameOptions(UDWORD id)
}

84
src/keybind.c
View File

@ -129,7 +129,7 @@ bool runningMultiplayer(void)
static void noMPCheatMsg(void)
{
addConsoleMessage(_("Sorry, that cheat is disabled in multiplayer games."), DEFAULT_JUSTIFY);
addConsoleMessage(_("Sorry, that cheat is disabled in multiplayer games."), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -140,13 +140,13 @@ void kf_ToggleMissionTimer( void )
void kf_ToggleShowGateways(void)
{
addConsoleMessage("Gateways toggled.", DEFAULT_JUSTIFY);
addConsoleMessage("Gateways toggled.", DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
showGateways = !showGateways;
}
void kf_ToggleShowPath(void)
{
addConsoleMessage("Path display toggled.", DEFAULT_JUSTIFY);
addConsoleMessage("Path display toggled.", DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
showPath = !showPath;
}
@ -193,9 +193,9 @@ void kf_ToggleSensorDisplay( void )
rangeOnScreen = !rangeOnScreen;
if (rangeOnScreen)
addConsoleMessage(_("Lets us see what you see!"), LEFT_JUSTIFY); //added this message... Yeah, its lame. :)
addConsoleMessage(_("Lets us see what you see!"), LEFT_JUSTIFY, CONSOLE_SYSTEM); //added this message... Yeah, its lame. :)
else
addConsoleMessage(_("Fine, sensor display is off!"), LEFT_JUSTIFY); //added this message... Yeah, its lame. :)
addConsoleMessage(_("Fine, sensor display is off!"), LEFT_JUSTIFY, CONSOLE_SYSTEM); //added this message... Yeah, its lame. :)
}
//===================================================
/* Halves all the heights of the map tiles */
@ -293,7 +293,7 @@ void kf_SetKillerLevel( void )
}
setDifficultyLevel(DL_KILLER);
addConsoleMessage(_("Hard as nails!!!"), LEFT_JUSTIFY);
addConsoleMessage(_("Hard as nails!!!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
void kf_SetEasyLevel( void )
@ -306,7 +306,7 @@ void kf_SetEasyLevel( void )
}
setDifficultyLevel(DL_EASY);
addConsoleMessage(_("Takings thing easy!"), LEFT_JUSTIFY);
addConsoleMessage(_("Takings thing easy!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -320,7 +320,7 @@ void kf_UpThePower( void )
}
asPower[selectedPlayer].currentPower+=1000;
addConsoleMessage(_("1000 big ones!!!"), LEFT_JUSTIFY);
addConsoleMessage(_("1000 big ones!!!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -334,7 +334,7 @@ void kf_MaxPower( void )
}
asPower[selectedPlayer].currentPower = SDWORD_MAX / 2;
addConsoleMessage(_("Power overwhelming"), LEFT_JUSTIFY);
addConsoleMessage(_("Power overwhelming"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -348,7 +348,7 @@ void kf_SetNormalLevel( void )
}
setDifficultyLevel(DL_NORMAL);
addConsoleMessage(_("Back to normality!"), LEFT_JUSTIFY);
addConsoleMessage(_("Back to normality!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
void kf_SetHardLevel( void )
@ -361,7 +361,7 @@ void kf_SetHardLevel( void )
}
setDifficultyLevel(DL_HARD);
addConsoleMessage(_("Getting tricky!"), LEFT_JUSTIFY);
addConsoleMessage(_("Getting tricky!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
void kf_SetToughUnitsLevel( void )
@ -374,7 +374,7 @@ void kf_SetToughUnitsLevel( void )
}
setDifficultyLevel(DL_TOUGH);
addConsoleMessage(_("Twice as nice!"), LEFT_JUSTIFY);
addConsoleMessage(_("Twice as nice!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
void kf_ToggleFPS(void) //This shows *just FPS* and is always visable (when active) -Q.
@ -436,7 +436,7 @@ void kf_ShowNumObjects( void )
void kf_ToggleRadar( void )
{
radarOnScreen = !radarOnScreen;
// addConsoleMessage("Radar display toggled",DEFAULT_JUSTIFY);
// addConsoleMessage("Radar display toggled",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -456,12 +456,12 @@ void kf_TogglePower( void )
powerCalculated = !powerCalculated;
if (powerCalculated)
{
addConsoleMessage(_("Infinite power disabled"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Infinite power disabled"), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
powerCalc(TRUE);
}
else
{
addConsoleMessage(_("Infinite power enabled"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Infinite power enabled"), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -471,7 +471,7 @@ void kf_TogglePower( void )
void kf_RecalcLighting( void )
{
initLighting(0, 0, mapWidth, mapHeight);
addConsoleMessage("Lighting values for all tiles recalculated",DEFAULT_JUSTIFY);
addConsoleMessage("Lighting values for all tiles recalculated",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -514,7 +514,7 @@ void kf_AllAvailable( void )
return;
}
#endif
addConsoleMessage(_("All items made available"), DEFAULT_JUSTIFY);
addConsoleMessage(_("All items made available"), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
makeAllAvailable();
}
@ -526,7 +526,7 @@ void kf_TriFlip( void )
MAPTILE *psTile;
psTile = mapTile(mouseTileX,mouseTileY);
TOGGLE_TRIFLIP(psTile);
// addConsoleMessage("Triangle flip status toggled",DEFAULT_JUSTIFY);
// addConsoleMessage("Triangle flip status toggled",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -539,7 +539,7 @@ void kf_TileInfo(void)
debug(LOG_ERROR, "Tile position=(%d, %d) Terrain=%hhu Texture=%u Height=%hhu Illumination=%hhu",
mouseTileX, mouseTileY, terrainType(psTile), TileNumber_tile(psTile->texture), psTile->height,
psTile->illumination);
addConsoleMessage("Tile info dumped into log", DEFAULT_JUSTIFY);
addConsoleMessage("Tile info dumped into log", DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -606,13 +606,13 @@ void kf_ToggleFog( void )
fogEnabled = FALSE;
pie_SetFogStatus(FALSE);
pie_EnableFog(fogEnabled);
addConsoleMessage(_("Fog off"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Fog off"), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{
fogEnabled = TRUE;
pie_EnableFog(fogEnabled);
addConsoleMessage(_("Fog on"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Fog on"), DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -629,7 +629,7 @@ void kf_ToggleWidgets( void )
{
setWidgetsStatus(TRUE);
}
// addConsoleMessage("Widgets display toggled",DEFAULT_JUSTIFY);
// addConsoleMessage("Widgets display toggled",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -647,7 +647,7 @@ void kf_ToggleCamera( void )
/* Toggle 'watch' window on/off */
void kf_ToggleWatchWindow( void )
{
addConsoleMessage("WATCH WINDOW!", LEFT_JUSTIFY); // what is this? - per
addConsoleMessage("WATCH WINDOW!", LEFT_JUSTIFY, CONSOLE_SYSTEM); // what is this? - per
(void)addDebugMenu(!DebugMenuUp);
}
@ -1207,7 +1207,7 @@ void kf_TogglePauseMode( void )
/* And stop the clock */
gameTimeStop();
addConsoleMessage(_("PAUSED"),CENTRE_JUSTIFY);
addConsoleMessage(_("PAUSED"),CENTRE_JUSTIFY, CONSOLE_SYSTEM);
}
else
@ -1270,14 +1270,14 @@ void kf_FinishResearch( void )
//void kf_ToggleRadarAllign( void )
//{
// toggleRadarAllignment();
// addConsoleMessage("Radar allignment toggled",LEFT_JUSTIFY);
// addConsoleMessage("Radar allignment toggled",LEFT_JUSTIFY, CONSOLE_SYSTEM);
//}
// --------------------------------------------------------------------------
void kf_ToggleEnergyBars( void )
{
toggleEnergyBars();
addConsoleMessage(_("Energy bars display toggled"), LEFT_JUSTIFY);
addConsoleMessage(_("Energy bars display toggled"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -1295,7 +1295,7 @@ void kf_ToggleDemoMode( void )
flushConsoleMessages();
setConsolePermanence(FALSE,TRUE);
permitNewConsoleMessages(TRUE);
addConsoleMessage(_("Demo mode off - Returning to normal game mode"), LEFT_JUSTIFY);
addConsoleMessage(_("Demo mode off - Returning to normal game mode"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
if(getWarCamStatus())
{
camToggleStatus();
@ -1342,7 +1342,7 @@ SDWORD xJump,yJump;
}
else
{
addConsoleMessage(_("Unable to locate any resource extractors!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any resource extractors!"),LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -1482,7 +1482,7 @@ void kf_ChooseCancel( void )
// --------------------------------------------------------------------------
void kf_ToggleDrivingMode( void )
{
addConsoleMessage("Toggle driver mode", LEFT_JUSTIFY); // what does this do? - per
addConsoleMessage("Toggle driver mode", LEFT_JUSTIFY, CONSOLE_SYSTEM); // what does this do? - per
/* No point unless we're tracking */
if(getWarCamStatus())
@ -1490,20 +1490,20 @@ void kf_ToggleDrivingMode( void )
if(getDrivingStatus())
{
StopDriverMode();
addConsoleMessage("DriverMode off", LEFT_JUSTIFY);
addConsoleMessage("DriverMode off", LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{ // removed the MP check for this, so you can now play with in in MP games.
if( (driveModeActive() == FALSE) && (demoGetStatus() == FALSE) ) // && !bMultiPlayer)
{
StartDriverMode( NULL );
addConsoleMessage("DriverMode on", LEFT_JUSTIFY);
addConsoleMessage("DriverMode on", LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
}
else
{
addConsoleMessage("DriverMode disabled. Must be in tracking mode. Hit space bar with a unit selected.", LEFT_JUSTIFY);
addConsoleMessage("DriverMode disabled. Must be in tracking mode. Hit space bar with a unit selected.", LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -1565,19 +1565,19 @@ void kf_ToggleWeather( void )
if(atmosGetWeatherType() == WT_NONE)
{
atmosSetWeatherType(WT_SNOWING);
addConsoleMessage(_("Oh, the weather outside is frightful... SNOW"), LEFT_JUSTIFY);
addConsoleMessage(_("Oh, the weather outside is frightful... SNOW"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else if(atmosGetWeatherType() == WT_SNOWING)
{
atmosSetWeatherType(WT_RAINING);
addConsoleMessage(_("Singing in the rain, I'm singing in the rain... RAIN"), LEFT_JUSTIFY);
addConsoleMessage(_("Singing in the rain, I'm singing in the rain... RAIN"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{
atmosInitSystem();
atmosSetWeatherType(WT_NONE);
addConsoleMessage(_("Forecast : Clear skies for all areas... NO WEATHER"), LEFT_JUSTIFY);
addConsoleMessage(_("Forecast : Clear skies for all areas... NO WEATHER"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -1759,7 +1759,7 @@ void kf_SendTextMessage(void)
strlcpy(tmp, getPlayerName(selectedPlayer), sizeof(tmp));
strlcat(tmp, " : ", sizeof(tmp)); // seperator
strlcat(tmp, sTextToSend, sizeof(tmp)); // add message
addConsoleMessage(tmp,DEFAULT_JUSTIFY);
addConsoleMessage(tmp,DEFAULT_JUSTIFY, CONSOLE_USER);
//in skirmish send directly to AIs, for command and chat procesing
for(i=0; i<game.maxPlayers; i++) //don't use MAX_PLAYERS here, although possible
@ -1882,7 +1882,7 @@ void kf_SendTextMessage(void)
}
// flushConsoleMessages(); //clear
// addConsoleMessage(sTextToSend,DEFAULT_JUSTIFY); //display
// addConsoleMessage(sTextToSend,DEFAULT_JUSTIFY, CONSOLE_SYSTEM); //display
// iV_DrawText(sTextToSend,16+D_W,RADTLY+D_H-16);
}
// --------------------------------------------------------------------------
@ -2111,7 +2111,7 @@ DROID *psOther;
void kf_ScatterDroids( void )
{
// to be written!
addConsoleMessage("Scatter droids - not written yet!",LEFT_JUSTIFY);
addConsoleMessage("Scatter droids - not written yet!",LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
// --------------------------------------------------------------------------
@ -2138,7 +2138,7 @@ UDWORD xJump = 0, yJump = 0;
/* If we found it, then jump to it! */
if(bGotHQ)
{
addConsoleMessage(_("Centered on player HQ, direction NORTH"),LEFT_JUSTIFY);
addConsoleMessage(_("Centered on player HQ, direction NORTH"),LEFT_JUSTIFY, CONSOLE_SYSTEM);
player.p.x = xJump;
player.p.z = yJump;
player.r.y = 0; // face north
@ -2150,7 +2150,7 @@ UDWORD xJump = 0, yJump = 0;
}
else
{
addConsoleMessage(_("Unable to locate HQ!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate HQ!"),LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
@ -2166,11 +2166,11 @@ void kf_ToggleFormationSpeedLimiting( void )
if ( moveFormationSpeedLimitingOn() )
{
addConsoleMessage(_("Formation speed limiting OFF"),LEFT_JUSTIFY);
addConsoleMessage(_("Formation speed limiting OFF"),LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{
addConsoleMessage(_("Formation speed limiting ON"),LEFT_JUSTIFY);
addConsoleMessage(_("Formation speed limiting ON"),LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
moveToggleFormationSpeedLimiting();
}

4
src/loop.c
View File

@ -466,7 +466,7 @@ GAMECODE gameLoop(void)
{
if (saveGame(sRequestResult, GTYPE_SAVE_START))
{
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY);
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{
@ -478,7 +478,7 @@ GAMECODE gameLoop(void)
{
if (saveGame(sRequestResult, GTYPE_SAVE_MIDMISSION))//mid mission from [esc] menu
{
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY);
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{

2
src/message.c
View File

@ -949,7 +949,7 @@ void displayProximityMessage(PROXIMITY_DISPLAY *psProxDisp)
{
if (psViewData->type != VIEW_HELP)
{
addConsoleMessage(psViewData->ppTextMsg[0], DEFAULT_JUSTIFY);
addConsoleMessage(psViewData->ppTextMsg[0], DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
}

2
src/mission.c
View File

@ -3219,7 +3219,7 @@ void intRunMissionResult(void)
if (!bRequestLoad)
{
saveGame(sRequestResult,GTYPE_SAVE_START);
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY);
addConsoleMessage(_("GAME SAVED!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}
}

2
src/multiint.c
View File

@ -1879,7 +1879,7 @@ static void processMultiopWidgets(UDWORD id)
setLockedTeamsMode(); //update GUI
sprintf( msg,"'%s' mode enabled", _("Locked Teams") );
addConsoleMessage(msg,DEFAULT_JUSTIFY);
addConsoleMessage(msg,DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
}

4
src/multijoin.c
View File

@ -224,7 +224,7 @@ BOOL MultiPlayerLeave( UDWORD dp)
turnOffMultiMsg(FALSE);
addConsoleMessage(buf,DEFAULT_JUSTIFY);
addConsoleMessage(buf,DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
if(widgGetFromID(psWScreen,IDRET_FORM))
{
@ -320,7 +320,7 @@ void setupNewPlayer(UDWORD dpid, UDWORD player)
setMultiStats(player2dpid[player],getMultiStats(player,FALSE),TRUE); // get the players score from the ether.
sprintf( buf,_("%s is Joining the Game"),getPlayerName(player) );
addConsoleMessage(buf,DEFAULT_JUSTIFY);
addConsoleMessage(buf,DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
// ////////////////////////////////////////////////////////////////////////////

2
src/multilimit.c
View File

@ -271,7 +271,7 @@ void runLimitScreen(void)
// make some noize.
if(!ingame.localOptionsReceived)
{
addConsoleMessage("Limits Reset To Default Values",DEFAULT_JUSTIFY);
addConsoleMessage("Limits Reset To Default Values",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{

2
src/multiopt.c
View File

@ -285,7 +285,7 @@ void recvOptions()
NETend();
addConsoleMessage("MAP REQUESTED!",DEFAULT_JUSTIFY);
addConsoleMessage("MAP REQUESTED!",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{

44
src/multiplay.c
View File

@ -733,7 +733,7 @@ BOOL recvMessage(void)
{
//stopJoining(); //NOT defined here, checking if we need it or not.
debug(LOG_NET, "***Need to call stopJoining()");
addConsoleMessage(_("The host has left the game!"), LEFT_JUSTIFY);
addConsoleMessage(_("The host has left the game!"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
break;
}
@ -1044,12 +1044,13 @@ BOOL recvResearchStatus()
// eg "123 hi there" sends "hi there" to players 1,2 and 3.
BOOL sendTextMessage(const char *pStr, BOOL all)
{
BOOL normal = TRUE;
BOOL sendto[MAX_PLAYERS];
UDWORD i;
char display[MAX_CONSOLE_STRING_LENGTH];
char msg[MAX_CONSOLE_STRING_LENGTH];
uint8_t netplayer = 0;
BOOL normal = TRUE;
BOOL sendto[MAX_PLAYERS];
UDWORD i;
char display[MAX_CONSOLE_STRING_LENGTH];
char msg[MAX_CONSOLE_STRING_LENGTH];
CONSOLE_TEXT_TYPE messageType;
uint8_t netplayer = 0;
if (!ingame.localOptionsReceived)
{
@ -1128,7 +1129,11 @@ BOOL sendTextMessage(const char *pStr, BOOL all)
strlcat(display, NetPlay.players[i].name, sizeof(display)); // name
strlcat(display, ": ", sizeof(display)); // seperator
strlcat(display, pStr, sizeof(display)); // add message
addConsoleMessage(display, DEFAULT_JUSTIFY); // display
/* Set color for console message */
messageType = pickConsolePlayerTextType(selectedPlayer, i);
addConsoleMessage(display, DEFAULT_JUSTIFY, messageType); // display
return TRUE;
}
@ -1225,14 +1230,19 @@ BOOL sendBeacon(int32_t locX, int32_t locY, int32_t forPlayer, int32_t sender, c
void displayAIMessage(char *pStr, SDWORD from, SDWORD to)
{
char tmp[255];
char tmp[255];
CONSOLE_TEXT_TYPE messageType;
if (isHumanPlayer(to)) //display text only if receiver is the (human) host machine itself
{
strcpy(tmp, getPlayerName(from));
strcat(tmp, ": "); // seperator
strcat(tmp, pStr); // add message
addConsoleMessage(tmp, DEFAULT_JUSTIFY);
/* Set color for console message */
messageType = pickConsolePlayerTextType(to, from);
addConsoleMessage(tmp, DEFAULT_JUSTIFY, messageType);
}
}
@ -1244,6 +1254,7 @@ BOOL recvTextMessage()
char msg[MAX_CONSOLE_STRING_LENGTH];
char newmsg[MAX_CONSOLE_STRING_LENGTH];
UDWORD player=MAX_PLAYERS,j; //console callback - player who sent the message
CONSOLE_TEXT_TYPE messageType;
memset(msg, 0x0, sizeof(msg));
memset(newmsg, 0x0, sizeof(newmsg));
@ -1275,8 +1286,11 @@ BOOL recvTextMessage()
strlcat(msg, ": ", sizeof(msg));
// Add message
strlcat(msg, newmsg, sizeof(msg));
addConsoleMessage(msg, DEFAULT_JUSTIFY);
/* Set color for console message */
messageType = pickConsolePlayerTextType(selectedPlayer, i);
addConsoleMessage(msg, DEFAULT_JUSTIFY, messageType);
// Multiplayer message callback
// Received a console message from a player, save
@ -1546,7 +1560,7 @@ BOOL recvMapFileRequested()
memset(mapName,0,256);
memset(fixedname,0,256);
bSendingMap = TRUE;
addConsoleMessage("Map was requested: SENDING MAP!",DEFAULT_JUSTIFY);
addConsoleMessage("Map was requested: SENDING MAP!",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
strlcpy(mapName, game.map, sizeof(mapName));
// chop off the -T1
@ -1587,7 +1601,7 @@ UBYTE sendMap(void)
if(done == 100)
{
addConsoleMessage("MAP SENT!",DEFAULT_JUSTIFY);
addConsoleMessage("MAP SENT!",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
bSendingMap = FALSE;
}
@ -1602,7 +1616,7 @@ BOOL recvMapFileData()
done = NETrecvFile();
if(done == 100)
{
addConsoleMessage("MAP DOWNLOADED!",DEFAULT_JUSTIFY);
addConsoleMessage("MAP DOWNLOADED!",DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
sendTextMessage("MAP DOWNLOADED",TRUE); //send
// clear out the old level list.

4
src/research.c
View File

@ -1847,11 +1847,11 @@ void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay,
if (pResearch->pViewData != NULL)
{
snprintf(consoleMsg, MAX_RESEARCH_MSG_SIZE, _("Research completed: %s"), *pResearch->pViewData->ppTextMsg);
addConsoleMessage(consoleMsg, LEFT_JUSTIFY);
addConsoleMessage(consoleMsg, LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
else
{
addConsoleMessage(_("Research Completed"), LEFT_JUSTIFY);
addConsoleMessage(_("Research Completed"), LEFT_JUSTIFY, CONSOLE_SYSTEM);
}
}

14
src/scriptfuncs.c
View File

@ -3025,7 +3025,7 @@ BOOL scrShowConsoleText(void)
if (player == (SDWORD)selectedPlayer)
{
permitNewConsoleMessages(TRUE);
addConsoleMessage(pText, CENTRE_JUSTIFY);
addConsoleMessage(pText, CENTRE_JUSTIFY, CONSOLE_SYSTEM);
}
return TRUE;
@ -3053,7 +3053,7 @@ BOOL scrAddConsoleText(void)
{
permitNewConsoleMessages(TRUE);
setConsolePermanence(TRUE,TRUE);
addConsoleMessage(pText, CENTRE_JUSTIFY);
addConsoleMessage(pText, CENTRE_JUSTIFY, CONSOLE_SYSTEM);
permitNewConsoleMessages(FALSE);
}
@ -3084,7 +3084,7 @@ BOOL scrTagConsoleText(void)
{
permitNewConsoleMessages(TRUE);
setConsolePermanence(TRUE,FALSE);
addConsoleMessage(pText, CENTRE_JUSTIFY);
addConsoleMessage(pText, CENTRE_JUSTIFY, CONSOLE_SYSTEM);
permitNewConsoleMessages(FALSE);
}
@ -6637,7 +6637,7 @@ BOOL scrConsole(void)
return FALSE;
}
addConsoleMessage(strParam1,DEFAULT_JUSTIFY);
addConsoleMessage(strParam1,DEFAULT_JUSTIFY, CONSOLE_SYSTEM);
return TRUE;
}
@ -6697,7 +6697,7 @@ BOOL scrMsg(void)
if(playerFrom == selectedPlayer)
{
sprintf(tmp,"[%d-%d] : %s",playerFrom, playerTo, strParam1); // add message
addConsoleMessage(tmp, RIGHT_JUSTIFY);
addConsoleMessage(tmp, RIGHT_JUSTIFY, CONSOLE_USER);
}
return TRUE;
@ -6717,7 +6717,7 @@ BOOL scrDbg(void)
{
char sTmp[255];
sprintf(sTmp,"%d) %s",player,strParam1);
addConsoleMessage(sTmp,DEFAULT_JUSTIFY);
addConsoleMessage(sTmp,DEFAULT_JUSTIFY, CONSOLE_DEBUG);
}
return TRUE;
@ -10883,7 +10883,7 @@ BOOL scrASSERT(void)
if(!bExpression)
{
sprintf(sTmp,"%d) %s",player,strParam1);
addConsoleMessage(sTmp,RIGHT_JUSTIFY);
addConsoleMessage(sTmp,RIGHT_JUSTIFY,CONSOLE_DEBUG);
}
}
#endif

14
src/selection.c
View File

@ -115,7 +115,7 @@ char selInfo[255];
/* Send back the return value */
snprintf(selInfo, sizeof(selInfo), ngettext("%u unit selected", "%u units selected", retVal), retVal);
addConsoleMessage(selInfo, RIGHT_JUSTIFY);
addConsoleMessage(selInfo, RIGHT_JUSTIFY,CONSOLE_SYSTEM);
return retVal;
}
@ -431,16 +431,16 @@ BOOL bLaterInList, bMatch;
switch(unitType)
{
case DROID_REPAIR:
addConsoleMessage(_("Unable to locate any repair units!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any repair units!"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
break;
case DROID_CONSTRUCT:
addConsoleMessage(_("Unable to locate any Trucks!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any Trucks!"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
break;
case DROID_SENSOR:
addConsoleMessage(_("Unable to locate any Sensor Units!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any Sensor Units!"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
break;
case DROID_COMMAND:
addConsoleMessage(_("Unable to locate any Commanders!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any Commanders!"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
break;
}
}
@ -518,7 +518,7 @@ BOOL bLaterInList;
}
else
{
addConsoleMessage(_("Unable to locate any repair units!"),LEFT_JUSTIFY);
addConsoleMessage(_("Unable to locate any repair units!"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
}
}
// ---------------------------------------------------------------------
@ -577,7 +577,7 @@ BOOL bLaterInList;
else
{
// Can't find required building
addConsoleMessage("Cannot find required building!",LEFT_JUSTIFY);
addConsoleMessage("Cannot find required building!",LEFT_JUSTIFY,CONSOLE_SYSTEM);
}
}

8
src/structure.c
View File

@ -2795,7 +2795,7 @@ BOOL CheckHaltOnMaxUnitsReached(STRUCTURE *psStructure)
if ((psStructure->player == selectedPlayer) &&
(lastMaxUnitMessage + MAX_UNIT_MESSAGE_PAUSE < gameTime))
{
addConsoleMessage(_("Command Control Limit Reached - Production Halted"),DEFAULT_JUSTIFY);
addConsoleMessage(_("Command Control Limit Reached - Production Halted"),DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
lastMaxUnitMessage = gameTime;
}
return TRUE;
@ -6374,7 +6374,7 @@ BOOL electronicReward(STRUCTURE *psStructure, UBYTE attackPlayer)
hqReward(psStructure->player,attackPlayer);
if (attackPlayer == selectedPlayer)
{
addConsoleMessage(_("Electronic Reward - Visibility Report"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Electronic Reward - Visibility Report"), DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
bRewarded = TRUE;
break;
@ -6471,7 +6471,7 @@ void factoryReward(UBYTE losingPlayer, UBYTE rewardPlayer)
//losing Player hasn't got anything better so don't gain anything!
if (rewardPlayer == selectedPlayer)
{
addConsoleMessage(_("Factory Reward - Nothing"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Factory Reward - Nothing"), DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
}
@ -6506,7 +6506,7 @@ void repairFacilityReward(UBYTE losingPlayer, UBYTE rewardPlayer)
}
if (rewardPlayer == selectedPlayer)
{
addConsoleMessage(_("Repair Facility Award - Nothing"), DEFAULT_JUSTIFY);
addConsoleMessage(_("Repair Facility Award - Nothing"), DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
}
}

2
src/transporter.c
View File

@ -1857,7 +1857,7 @@ BOOL updateTransporter(DROID *psTransporter)
//play reinforcements have arrived message
audio_QueueTrackPos( ID_SOUND_TRANSPORT_LANDING,
psTransporter->pos.x, psTransporter->pos.y, psTransporter->pos.z );
addConsoleMessage(_("Reinforcements landing"),LEFT_JUSTIFY);
addConsoleMessage(_("Reinforcements landing"),LEFT_JUSTIFY,CONSOLE_SYSTEM);
//reset the data for the transporter timer
widgSetUserData(psWScreen, IDTRANTIMER_DISPLAY, (void*)NULL);
return TRUE;

4
src/warcam.c
View File

@ -375,7 +375,7 @@ BOOL Status = TRUE;
else
{
/* We've requested a track with no droid selected */
// addConsoleMessage("Droid-CAM V0.1 ERROR - No targets(s) selected",DEFAULT_JUSTIFY);
// addConsoleMessage("Droid-CAM V0.1 ERROR - No targets(s) selected",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
trackingCamera.status = CAM_INACTIVE;
}
break;
@ -411,7 +411,7 @@ BOOL Status = TRUE;
}
/* Switch to inactive mode */
trackingCamera.status = CAM_INACTIVE;
// addConsoleMessage("Droid-CAM V0.1 Disabled",DEFAULT_JUSTIFY);
// addConsoleMessage("Droid-CAM V0.1 Disabled",DEFAULT_JUSTIFY,CONSOLE_SYSTEM);
Status = FALSE;
break;
default:

6
src/wrappers.c
View File

@ -368,9 +368,9 @@ BOOL displayGameOver(BOOL bDidit)
// setConsolePermanence(TRUE,TRUE);
// flushConsoleMessages( );
// addConsoleMessage(" ", CENTRE_JUSTIFY );
// addConsoleMessage(_("Game Over"), CENTRE_JUSTIFY );
// addConsoleMessage(" ", CENTRE_JUSTIFY );
// addConsoleMessage(" ", CENTRE_JUSTIFY, CONSOLE_SYSTEM);
// addConsoleMessage(_("Game Over"), CENTRE_JUSTIFY, CONSOLE_SYSTEM);
// addConsoleMessage(" ", CENTRE_JUSTIFY, CONSOLE_SYSTEM);
if(bDidit)
{