Files
source/screenids.h
T
Wanne 8fa1c2a4e6 Merged Multiplayer UI patch from Zathras:
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
2009-03-19 15:31:55 +00:00

47 lines
788 B
C

#ifndef __SCREEN_IDS
#define __SCREEN_IDS
typedef enum ScreenTypes
{
EDIT_SCREEN,
SAVING_SCREEN,
LOADING_SCREEN,
ERROR_SCREEN,
INIT_SCREEN,
GAME_SCREEN,
ANIEDIT_SCREEN,
PALEDIT_SCREEN,
DEBUG_SCREEN,
MAP_SCREEN,
LAPTOP_SCREEN,
LOADSAVE_SCREEN,
MAPUTILITY_SCREEN,
FADE_SCREEN,
MSG_BOX_SCREEN,
MAINMENU_SCREEN,
AUTORESOLVE_SCREEN,
SAVE_LOAD_SCREEN,
OPTIONS_SCREEN,
SHOPKEEPER_SCREEN,
SEX_SCREEN,
GAME_INIT_OPTIONS_SCREEN,
DEMO_EXIT_SCREEN,
INTRO_SCREEN,
CREDIT_SCREEN,
MP_JOIN_SCREEN, // OJW - 20081129
MP_HOST_SCREEN,
MP_SCORE_SCREEN, // OJW - 20081222
MP_CHAT_SCREEN, // OJW - 20090315
#ifdef JA2BETAVERSION
AIVIEWER_SCREEN,
#endif
//#ifdef JA2BETAVERSION
QUEST_DEBUG_SCREEN,
//#endif
MAX_SCREENS
};
#endif