mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Development Trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP A detailed list of all the features (changes) is visible in the history log of the development trunk: INFO: The source code for the official 2011 release (4870) has been branched here: https://ja2svn.dyndns.org/source/ja2/branches/JA2_rev.4870_2011 This commit contains the following features: *** Externalized Vehicles *** o Now with this feature we can add/remove vehicles o New XML File: TableData\Vehicles.xml o Added a new function parameter to lua file Scripts\Overhead lua to set up the helicopter in method: SetUpHelicopterForPlayer() o Added example mini (Docs\Externalized Vehicles Example.zip) mod which adds 2 additional vehicles (hummer and ice-cream truck to sector A9) *** Up to 255 save slots *** - There is a "Next" and "Prev" button where you can scroll through the save slots - It is now possible to load the automatic save (SAVE_EVERY_N_HOURS) from the load screen. This is the first slot after the quickload slot - Added the 2 alternate players end turn saves (which can be enabled/disabled in option screen) to the save/load game form *** New Feature: Externalized emails from Emails.edt to XML*** o This feature can be enabled/disabled in the Source: --> See email.cpp: If "ReadXMLEmail" == FALSE, then normal way (read from Email.edt) otherwise read from XML files o 2 new XML files: TableData\Email\EmailMercAvailable.xml and EmailMercLevelUp.xml o Renamed SenderNamesList.xml to EmailSenderNamesList.xml and moved from TableData folder to TableData\Email folder o Names for mercenaries are get from the file MercProfiles.xml and different names get from the file EmailSenderNamesList.xml *** Externalized Hidden Towns (Tixa, Orta) *** o Now it is possible to add new hidden towns (locations) o See file: TableData/Map/Cities.xml o New variable in TableData/Map/Cities.xml - hiddenTown: 0 = show on strategy map, 1 = Hide on strategy map - townIcon: 1 = on, 0 = off (This is the icon you see on the strategy map) - szIconFile: The path to the sti icon file (eg: interface\prison.sti, interface\my_icon.sti) - iconPosition: The x,y position of the icon on the strategy map *** Encyclopedia and Briefing Room, reachable from the laptop *** o 2 new ja2_options.ini properties: BRIEFING_ROOM, ENCYCLOPEDIA o demonstration video: http://www.youtube.com/watch?v=7CIXdXWLrAo o Added Example usage of the Briefing Room - Extract it in your JA2 1.13 folder and use the latest development executable - The briefing room can be reached from the laptop. Enter SN5631 for the code and then click the "Exit" button - See "Info_BriefingRoom.txt" and "BriefingRoom_Mission1.png" *** Improved interrupt system (IIS) *** o This system changes the way interrupts work. See: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290787#Post290787 o Option system (see ja2_options.ini: IMPROVED_INTERRUPT_SYSTEM) o A few more settings for the interrupt system in ja2_options.ini o INFO: Multiplayer games always use the "old" interrupt system, not matter what the user selects in the ja2_options.ini *** Walking and sidestepping with weapon raised *** o Enable/disable the walking/sidestepping with raised weapon in ja2_options.ini: ALLOW_WALKING_WITH_WEAPON_RAISED o You can set an AP/BP modifier when walking/sidestepping with weapon raised in APBPConstants.ini: AP_MODIFIER_WEAPON_READY o The following feature apply when you walk/sidestep with weapon raised: -> limited angle of view, but you can see more farther when the weapon has a scope -> better change for interrupts if you see an enemy -> less APs and BPs when shooting, because the weapon is already raised -> It should cost more APs when walking. Maybe you can export the additional AP and BP modifier to the APBPConstants.ini *** Increase squad size to 8 (800x600) and 8 and 10 (1024x768) *** o Squad sizes (dependend on the screen resolution) can be selected in the start new game screen o In a multiplayer game, the squad size will always be 6, because it does not work with more soldiers/squad *** Added UB-1.13 source code *** o Merged the UB-1.13 source code (Revision: 4721) from svn: http://subversion.assembla.com/svn/ub-source113 o If you want to build UB-EXE or UB-MapEditor, just enable the 2 defines (JA2UB and JA2UBMAPS) in "builddefines.h" o The UB-Verion reads from "ja2_UB.ini" instead of "ja2.ini" o There are 2 new XML files - Layout\LayoutMainMenu.xml - MapAction\ActionItems.xml o There are 2 new LUA-Script files - Scripts\ExplosionControl.lua - Scripts\InterfaceDialogue.lua *** Hide enemy health text / enemy hit count *** o ja2_options.ini: HIDE_ENEMY_HEALTH_TEXT, HIDE_ENEMY_HIT_COUNT o both new settings only have effect in a singleplayer game o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=128840&page=1 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
235 lines
6.4 KiB
C
235 lines
6.4 KiB
C
#ifndef __LAPTOP_H
|
|
#define __LAPTOP_H
|
|
|
|
#include "types.h"
|
|
#include "sgp.h"
|
|
#include "Font Control.h"
|
|
#include "messageboxscreen.h"
|
|
|
|
|
|
|
|
|
|
|
|
INT32 EnterLaptop();
|
|
void ExitLaptop();
|
|
void RenderLaptop();
|
|
UINT32 ExitLaptopMode(UINT32 uiMode);
|
|
void EnterNewLaptopMode();
|
|
UINT32 DrawLapTopIcons();
|
|
UINT32 DrawLapTopText();
|
|
void ReDrawHighLight();
|
|
void DrawButtonText();
|
|
void InitBookMarkList();
|
|
void SetBookMark(INT32 iBookId);
|
|
void RemoveBookmark(INT32 iBookId);
|
|
BOOLEAN LeaveLapTopScreen( );
|
|
void SetLaptopExitScreen( UINT32 uiExitScreen );
|
|
void SetLaptopNewGameFlag( );
|
|
UINT32 DrawLapTopIcons( );
|
|
void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason );
|
|
void HandleRightButtonUpEvent( void );
|
|
|
|
BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback );
|
|
void GoToWebPage(INT32 iPageId);
|
|
BOOLEAN WebPageTileBackground(UINT8 ubNumX, UINT8 ubNumY, UINT16 usWidth, UINT16 usHeight, UINT32 uiBackGround);
|
|
void BlitTitleBarIcons( void );
|
|
void HandleKeyBoardShortCutsForLapTop( UINT16 usEvent, UINT32 usParam, UINT16 usKeyState );
|
|
BOOLEAN RenderWWWProgramTitleBar( void );
|
|
void DisplayProgramBoundingBox( BOOLEAN fMarkButtons );
|
|
BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback );
|
|
BOOLEAN RemoveBookMark( INT32 iBookId );
|
|
void CreateFileAndNewEmailIconFastHelpText( UINT32 uiHelpTextID, BOOLEAN fClearHelpText );
|
|
BOOLEAN InitLaptopAndLaptopScreens();
|
|
void HandleLapTopESCKey( void );
|
|
|
|
// clear out all tempf iles from laptop
|
|
void ClearOutTempLaptopFiles( void );
|
|
|
|
void HaventMadeImpMercEmailCallBack();
|
|
|
|
extern INT32 guiCurrentGunFilterMode;
|
|
extern INT32 guiPrevGunFilterMode;
|
|
|
|
extern INT32 guiCurrentAmmoFilterMode;
|
|
extern INT32 guiPrevAmmoFilterMode;
|
|
|
|
extern INT32 guiCurrentUsedFilterMode;
|
|
extern INT32 guiPrevUsedFilterMode;
|
|
|
|
extern INT32 guiCurrentArmourFilterMode;
|
|
extern INT32 guiPrevArmourFilterMode;
|
|
|
|
extern INT32 guiCurrentMiscFilterMode;
|
|
extern INT32 guiPrevMiscFilterMode;
|
|
|
|
extern BOOLEAN gbMessageDisplayed;
|
|
|
|
extern UINT32 guiCurrentLaptopMode;
|
|
extern UINT32 guiPreviousLaptopMode;
|
|
extern INT32 giCurrentSubPage;
|
|
extern UINT32 guiCurrentLapTopCursor;
|
|
extern UINT32 guiPreviousLapTopCursor;
|
|
extern BOOLEAN fMarkButtonsDirtyFlag;
|
|
extern BOOLEAN fNotVistedImpYet;
|
|
extern BOOLEAN fReDrawScreenFlag;
|
|
extern BOOLEAN fPausedReDrawScreenFlag;
|
|
extern BOOLEAN fIntermediateReDrawFlag;
|
|
extern BOOLEAN fLoadPendingFlag;
|
|
extern BOOLEAN fEscKeyHandled;
|
|
extern BOOLEAN fReDrawPostButtonRender;
|
|
extern BOOLEAN fCurrentlyInLaptop;
|
|
//extern BOOLEAN gfNewGameLaptop;
|
|
extern UINT32 guiLaptopBACKGROUND;
|
|
extern UINT32 guiTITLEBARICONS;
|
|
extern BOOLEAN fDoneLoadPending;
|
|
extern BOOLEAN fReConnectingFlag;
|
|
extern BOOLEAN fConnectingToSubPage;
|
|
extern BOOLEAN fFastLoadFlag;
|
|
extern BOOLEAN gfShowBookmarks;
|
|
extern BOOLEAN fShowBookmarkInfo;
|
|
extern BOOLEAN fReDrawBookMarkInfo;
|
|
|
|
|
|
enum
|
|
{
|
|
LAPTOP_MODE_NONE=0,
|
|
LAPTOP_MODE_FINANCES,
|
|
LAPTOP_MODE_PERSONNEL,
|
|
LAPTOP_MODE_HISTORY,
|
|
LAPTOP_MODE_FILES,
|
|
LAPTOP_MODE_FILES_ENRICO,
|
|
LAPTOP_MODE_FILES_PLANS,
|
|
LAPTOP_MODE_EMAIL,
|
|
LAPTOP_MODE_EMAIL_NEW,
|
|
LAPTOP_MODE_EMAIL_VIEW,
|
|
LAPTOP_MODE_WWW,
|
|
LAPTOP_MODE_AIM,
|
|
LAPTOP_MODE_AIM_MEMBERS,
|
|
LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX,
|
|
LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES,
|
|
LAPTOP_MODE_AIM_MEMBERS_SORTED_FILES_VIDEO,
|
|
LAPTOP_MODE_AIM_MEMBERS_ARCHIVES,
|
|
LAPTOP_MODE_AIM_POLICIES,
|
|
LAPTOP_MODE_AIM_HISTORY,
|
|
LAPTOP_MODE_AIM_LINKS,
|
|
LAPTOP_MODE_MERC,
|
|
LAPTOP_MODE_MERC_ACCOUNT,
|
|
LAPTOP_MODE_MERC_NO_ACCOUNT,
|
|
LAPTOP_MODE_MERC_FILES,
|
|
LAPTOP_MODE_BOBBY_R,
|
|
LAPTOP_MODE_BOBBY_R_GUNS,
|
|
LAPTOP_MODE_BOBBY_R_AMMO,
|
|
LAPTOP_MODE_BOBBY_R_ARMOR,
|
|
LAPTOP_MODE_BOBBY_R_MISC,
|
|
LAPTOP_MODE_BOBBY_R_USED,
|
|
LAPTOP_MODE_BOBBY_R_MAILORDER,
|
|
LAPTOP_MODE_CHAR_PROFILE,
|
|
LAPTOP_MODE_CHAR_PROFILE_QUESTIONAIRE,
|
|
LAPTOP_MODE_FLORIST,
|
|
LAPTOP_MODE_FLORIST_FLOWER_GALLERY,
|
|
LAPTOP_MODE_FLORIST_ORDERFORM,
|
|
LAPTOP_MODE_FLORIST_CARD_GALLERY,
|
|
LAPTOP_MODE_INSURANCE,
|
|
LAPTOP_MODE_INSURANCE_INFO,
|
|
LAPTOP_MODE_INSURANCE_CONTRACT,
|
|
LAPTOP_MODE_INSURANCE_COMMENTS,
|
|
LAPTOP_MODE_FUNERAL,
|
|
LAPTOP_MODE_SIRTECH,
|
|
LAPTOP_MODE_BROKEN_LINK,
|
|
LAPTOP_MODE_BOBBYR_SHIPMENTS,
|
|
|
|
//ENCYCLOPEDIA
|
|
LAPTOP_MODE_ENCYCLOPEDIA,
|
|
LAPTOP_MODE_ENCYCLOPEDIA_LOCATION,
|
|
LAPTOP_MODE_BRIEFING_ROOM_PAGE,
|
|
LAPTOP_MODE_BRIEFING_ROOM,
|
|
LAPTOP_MODE_BRIEFING_ROOM_ENTER,
|
|
|
|
LAPTOP_MODE_AIM_MEMBERS_ARCHIVES_NEW,
|
|
|
|
|
|
};
|
|
|
|
// bookamrks for WWW bookmark list
|
|
|
|
|
|
enum{
|
|
FIRST_SIDE_PANEL=1,
|
|
SECOND_SIDE_PANEL,
|
|
};
|
|
enum{
|
|
LAPTOP_NO_CURSOR=0,
|
|
LAPTOP_PANEL_CURSOR,
|
|
LAPTOP_SCREEN_CURSOR,
|
|
LAPTOP_WWW_CURSOR,
|
|
};
|
|
|
|
//#define LAPTOP_SIDE_PANEL_X 0
|
|
//#define LAPTOP_SIDE_PANEL_Y 0
|
|
//#define LAPTOP_SIDE_PANEL_WIDTH 640
|
|
//#define LAPTOP_SIDE_PANEL_HEIGHT 480
|
|
#define LAPTOP_X iScreenWidthOffset
|
|
#define LAPTOP_Y iScreenHeightOffset
|
|
|
|
|
|
#define LAPTOP_SCREEN_UL_X iScreenWidthOffset + 111
|
|
#define LAPTOP_SCREEN_UL_Y iScreenHeightOffset + 27
|
|
|
|
|
|
#define LAPTOP_SCREEN_LR_X iScreenWidthOffset + 613
|
|
#define LAPTOP_SCREEN_LR_Y iScreenHeightOffset + 427
|
|
#define LAPTOP_UL_X iScreenWidthOffset + 24
|
|
#define LAPTOP_UL_Y iScreenHeightOffset + 27
|
|
|
|
#define LAPTOP_SCREEN_WIDTH LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X
|
|
#define LAPTOP_SCREEN_HEIGHT LAPTOP_SCREEN_LR_Y - LAPTOP_SCREEN_UL_Y
|
|
|
|
// new positions for web browser
|
|
#define LAPTOP_SCREEN_WEB_UL_Y LAPTOP_SCREEN_UL_Y + 19
|
|
#define LAPTOP_SCREEN_WEB_LR_Y LAPTOP_SCREEN_WEB_UL_Y + LAPTOP_SCREEN_HEIGHT
|
|
#define LAPTOP_SCREEN_WEB_DELTA_Y 19 //LAPTOP_SCREEN_WEB_UL_Y - LAPTOP_SCREEN_UL_Y
|
|
|
|
// the laptop on/off button
|
|
#define ON_X iScreenWidthOffset + 113
|
|
#define ON_Y iScreenHeightOffset + 445
|
|
|
|
|
|
// the bookmark values, move cancel down as bookmarks added
|
|
|
|
enum{
|
|
AIM_BOOKMARK=0,
|
|
BOBBYR_BOOKMARK,
|
|
IMP_BOOKMARK,
|
|
MERC_BOOKMARK,
|
|
FUNERAL_BOOKMARK,
|
|
FLORIST_BOOKMARK,
|
|
INSURANCE_BOOKMARK,
|
|
CANCEL_STRING,
|
|
ENCYCLOPEDIA_BOOKMARK, //Encyclopedia
|
|
BRIEFING_ROOM_BOOKMARK,
|
|
TEXT_NUM_LAPTOP_BOOKMARKS
|
|
};
|
|
|
|
|
|
extern UINT32 guiLaptopBACKGROUND;
|
|
|
|
|
|
#define DEAD_MERC_COLOR_RED 255
|
|
#define DEAD_MERC_COLOR_GREEN 55
|
|
#define DEAD_MERC_COLOR_BLUE 55
|
|
|
|
#ifdef JA2UB
|
|
//ja25 UB
|
|
void ShouldImpReminderEmailBeSentWhenLaptopBackOnline();
|
|
|
|
extern BOOLEAN gfProcessCustomMaps;
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|