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
68 lines
3.4 KiB
C++
68 lines
3.4 KiB
C++
#ifdef PRECOMPILEDHEADERS
|
|
#include "JA2 All.h"
|
|
#else
|
|
#include "Screens.h"
|
|
#endif
|
|
|
|
int iResolution; // INI file
|
|
int iPlayIntro;
|
|
/* WANNE, Sgt.Kolja
|
|
* INI file (Windowed or Fullscreen)
|
|
* REPLACE all defines WINDOWED_MODE with this variable
|
|
* this is the LAST occurence of WINDOWED_MODE !
|
|
* If (and only if) optionally set, we got a preset of
|
|
* Windowed Screen. But this can be overloaded by INI or CmdLine
|
|
*/
|
|
#ifdef WINDOWED_MODE
|
|
int iScreenMode = 1; /* 1 for Windowed, 0 for Fullscreen */
|
|
#else
|
|
int iScreenMode = 0; /* 0 for Fullscreen */
|
|
#endif
|
|
BOOL bScreenModeCmdLine = FALSE;
|
|
|
|
UINT16 SCREEN_WIDTH;
|
|
UINT16 SCREEN_HEIGHT;
|
|
|
|
INT16 iScreenWidthOffset;
|
|
INT16 iScreenHeightOffset;
|
|
|
|
BOOLEAN fDisplayOverheadMap;
|
|
|
|
Screens GameScreens[MAX_SCREENS] =
|
|
{
|
|
{ EditScreenInit, EditScreenHandle, EditScreenShutdown },
|
|
{ SavingScreenInitialize, SavingScreenHandle, SavingScreenShutdown }, // Title Screen
|
|
{ LoadingScreenInitialize, LoadingScreenHandle, LoadingScreenShutdown }, // Title Screen
|
|
{ ErrorScreenInitialize, ErrorScreenHandle, ErrorScreenShutdown }, // Title Screen
|
|
{ InitScreenInitialize, InitScreenHandle, InitScreenShutdown }, // Title Screen
|
|
{ MainGameScreenInit, MainGameScreenHandle, MainGameScreenShutdown },
|
|
{ AniEditScreenInit, AniEditScreenHandle, AniEditScreenShutdown },
|
|
{ PalEditScreenInit, PalEditScreenHandle, PalEditScreenShutdown },
|
|
{ DebugScreenInit, DebugScreenHandle, DebugScreenShutdown },
|
|
{ MapScreenInit, MapScreenHandle, MapScreenShutdown },
|
|
{ LaptopScreenInit, LaptopScreenHandle, LaptopScreenShutdown },
|
|
{ LoadSaveScreenInit, LoadSaveScreenHandle, LoadSaveScreenShutdown },
|
|
{ MapUtilScreenInit, MapUtilScreenHandle, MapUtilScreenShutdown },
|
|
{ FadeScreenInit, FadeScreenHandle, FadeScreenShutdown },
|
|
{ MessageBoxScreenInit, MessageBoxScreenHandle, MessageBoxScreenShutdown },
|
|
{ MainMenuScreenInit, MainMenuScreenHandle, MainMenuScreenShutdown },
|
|
{ AutoResolveScreenInit, AutoResolveScreenHandle, AutoResolveScreenShutdown },
|
|
{ SaveLoadScreenInit, SaveLoadScreenHandle, SaveLoadScreenShutdown },
|
|
{ OptionsScreenInit, OptionsScreenHandle, OptionsScreenShutdown },
|
|
{ ShopKeeperScreenInit, ShopKeeperScreenHandle, ShopKeeperScreenShutdown },
|
|
{ SexScreenInit, SexScreenHandle, SexScreenShutdown },
|
|
{ GameInitOptionsScreenInit, GameInitOptionsScreenHandle, GameInitOptionsScreenShutdown },
|
|
{ DemoExitScreenInit, DemoExitScreenHandle, DemoExitScreenShutdown },
|
|
{ IntroScreenInit, IntroScreenHandle, IntroScreenShutdown },
|
|
{ CreditScreenInit, CreditScreenHandle, CreditScreenShutdown },
|
|
{ MPJoinScreenInit, MPJoinScreenHandle, MPJoinScreenShutdown }, // OJW - 20081129
|
|
{ MPHostScreenInit, MPHostScreenHandle, MPHostScreenShutdown },
|
|
{ MPScoreScreenInit, MPScoreScreenHandle, MPScoreScreenShutdown }, // OJW - 20081222
|
|
{ MPChatScreenInit, MPChatScreenHandle, MPChatScreenShutdown }, // OJW - 20090314
|
|
|
|
#ifdef JA2BETAVERSION
|
|
{ AIViewerScreenInit, AIViewerScreenHandle, AIViewerScreenShutdown },
|
|
#endif
|
|
|
|
{ QuestDebugScreenInit, QuestDebugScreenHandle, QuestDebugScreenShutdown }
|
|
}; |