mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Wanne
8fa1c2a4e6
New Features - Added hits, misses, accuracy to scoreboard - Added in-game chat with history - Added more options from the ini to the host screen, Use NIV and Enable civillians bugfixes - Clients connecting at the same time controlling the wrong client - Team Deathmatch working again - Refreshing the player list after a player changes team / edge - AI is always on for Co-op now - There is now always a scoreboard in Co-op even when you lose. - scores on the Co-op scoreboard have been fixed for all deaths including bleeding - Start Game button now only appears for server - Fixed cleaning up game resources on disconnection - Disabled the 1,2,3,4 keys for connecting / disconnecting - Fixed victory conditions for all game modes - Fixed players names getting copied into TeamTurnString each game resulting in multiple names - Fixed Assertion bug caused by the game sometimes calling SetCurrentWorldSector more than once before placement of mercs - Fixed a bug that was possible when merging items such as M14 and EBR stock on mapscreen. - Fixed bug with game starting while a player was in chat, closes chat window when game is starting - Fixed bug with game starting while a player was in the options screen, if the player leaves the mapscreen while ready, they are set to unready - Team and Spawn direction popups changed to use buttons to open/close them - Disabled players joining after the laptop has been unlocked, as they would be out of state with any hires git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
125 lines
3.9 KiB
C
125 lines
3.9 KiB
C
#ifndef __TIMER_CONTROL_H
|
|
#define __TIMER_CONTROL_H
|
|
|
|
#ifndef CALLBACKTIMER
|
|
#define CALLBACKTIMER
|
|
#endif
|
|
|
|
typedef INT32 TIMECOUNTER;
|
|
|
|
//typedef void (__stdcall *JA2_TIMERPROC)( UINT32 uiID, UINT32 uiMsg, UINT32 uiUser, UINT32 uiDw1, UINT32 uiDw2 );
|
|
|
|
typedef void (*CUSTOMIZABLE_TIMER_CALLBACK) ( void );
|
|
|
|
// CALLBACK TIMER DEFINES
|
|
enum
|
|
{
|
|
ITEM_LOCATOR_CALLBACK,
|
|
NUM_TIMER_CALLBACKS
|
|
};
|
|
|
|
// TIMER DEFINES
|
|
enum
|
|
{
|
|
TOVERHEAD = 0, // Overhead time slice
|
|
NEXTSCROLL, // Scroll Speed timer
|
|
STARTSCROLL, // Scroll Start timer
|
|
ANIMATETILES, // Animate tiles timer
|
|
FPSCOUNTER, // FPS value
|
|
PATHFINDCOUNTER, // PATH FIND COUNTER
|
|
CURSORCOUNTER, // ANIMATED CURSOR
|
|
RMOUSECLICK_DELAY_COUNTER, // RIGHT BUTTON CLICK DELAY
|
|
LMOUSECLICK_DELAY_COUNTER, // LEFT BUTTON CLICK DELAY
|
|
SLIDETEXT, // DAMAGE DISPLAY
|
|
TARGETREFINE, // TARGET REFINE
|
|
CURSORFLASH, // Cursor/AP flash
|
|
FADE_GUY_OUT, // FADE MERCS OUT
|
|
PANELSLIDE_UNUSED, // PANLE SLIDE
|
|
TCLOCKUPDATE, // CLOCK UPDATE
|
|
PHYSICSUPDATE, // PHYSICS UPDATE.
|
|
GLOW_ENEMYS,
|
|
STRATEGIC_OVERHEAD, // STRATEGIC OVERHEAD
|
|
CYCLERENDERITEMCOLOR, // CYCLE COLORS
|
|
NONGUNTARGETREFINE, // TARGET REFINE
|
|
CURSORFLASHUPDATE, //
|
|
INVALID_AP_HOLD, // TIME TO HOLD INVALID AP
|
|
RADAR_MAP_BLINK, // BLINK DELAY FOR RADAR MAP
|
|
OVERHEAD_MAP_BLINK, // OVERHEADMAP
|
|
MUSICOVERHEAD, // MUSIC TIMER
|
|
RUBBER_BAND_START_DELAY,
|
|
NUMTIMERS
|
|
};
|
|
|
|
// Base resultion of callback timer
|
|
#define BASETIMESLICE 10
|
|
|
|
// TIMER INTERVALS
|
|
extern INT32 giTimerIntervals[ NUMTIMERS ];
|
|
// TIMER COUNTERS
|
|
extern INT32 giTimerCounters[ NUMTIMERS ];
|
|
|
|
// GLOBAL SYNC TEMP TIME
|
|
extern INT32 giClockTimer;
|
|
extern INT32 giTimerDiag;
|
|
extern INT32 giTimerTeamTurnUpdate;
|
|
|
|
|
|
// Functions
|
|
BOOLEAN InitializeJA2Clock( void );
|
|
void ShutdownJA2Clock( void );
|
|
|
|
#define GetJA2Clock() guiBaseJA2Clock
|
|
|
|
UINT32 GetPauseJA2Clock( );
|
|
|
|
UINT32 InitializeJA2TimerID( UINT32 uiDelay, UINT32 uiCallbackID, UINT32 uiUser );
|
|
void RemoveJA2TimerCallback( UINT32 uiTimer );
|
|
|
|
void PauseTime( BOOLEAN fPaused );
|
|
|
|
void SetCustomizableTimerCallbackAndDelay( INT32 iDelay, CUSTOMIZABLE_TIMER_CALLBACK pCallback, BOOLEAN fReplace );
|
|
void CheckCustomizableTimer( void );
|
|
|
|
//Don't modify this value
|
|
extern UINT32 guiBaseJA2Clock;
|
|
extern UINT32 guiBaseJA2NoPauseClock;
|
|
extern CUSTOMIZABLE_TIMER_CALLBACK gpCustomizableTimerCallback;
|
|
|
|
// MACROS
|
|
// CHeck if new counter < 0 | set to 0 | Decrement
|
|
|
|
#ifdef CALLBACKTIMER
|
|
|
|
#define UPDATECOUNTER( c ) ( ( giTimerCounters[ c ] - BASETIMESLICE ) < 0 ) ? ( giTimerCounters[ c ] = 0 ) : ( giTimerCounters[ c ] -= BASETIMESLICE )
|
|
#define RESETCOUNTER( c ) ( giTimerCounters[ c ] = giTimerIntervals[ c ] )
|
|
#define COUNTERDONE( c ) ( giTimerCounters[ c ] == 0 ) ? TRUE : FALSE
|
|
|
|
#define UPDATETIMECOUNTER( c ) ( ( c - BASETIMESLICE ) < 0 ) ? ( c = 0 ) : ( c -= BASETIMESLICE )
|
|
#define RESETTIMECOUNTER( c, d ) ( c = d )
|
|
|
|
#ifdef BOUNDS_CHECKER
|
|
#define TIMECOUNTERDONE( c, d ) ( TRUE )
|
|
#else
|
|
#define TIMECOUNTERDONE( c, d ) ( c == 0 ) ? TRUE : FALSE
|
|
#endif
|
|
|
|
#define SYNCTIMECOUNTER( )
|
|
#define ZEROTIMECOUNTER( c ) ( c = 0 )
|
|
|
|
#else
|
|
|
|
#define UPDATECOUNTER( c )
|
|
#define RESETCOUNTER( c ) ( giTimerCounters[ c ] = giClockTimer )
|
|
#define COUNTERDONE( c ) ( ( ( giClockTimer = GetJA2Clock() ) - giTimerCounters[ c ] ) > giTimerIntervals[ c ] ) ? TRUE : FALSE
|
|
|
|
#define UPDATETIMECOUNTER( c )
|
|
#define RESETTIMECOUNTER( c, d ) ( c = giClockTimer )
|
|
#define TIMECOUNTERDONE( c, d ) ( giClockTimer - c > d ) ? TRUE : FALSE
|
|
#define SYNCTIMECOUNTER( ) ( giClockTimer = GetJA2Clock() )
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif |