mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Wanne
e64d5a2fa6
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
123 lines
3.6 KiB
C
123 lines
3.6 KiB
C
#ifndef _SAVELOADMAP__H_
|
|
#define _SAVELOADMAP__H_
|
|
|
|
#include "WorldDef.h"
|
|
#include "Exit Grids.h"
|
|
|
|
//Used for the ubType in the MODIFY_MAP struct
|
|
enum
|
|
{
|
|
SLM_NONE,
|
|
|
|
//Adding a map graphic
|
|
SLM_LAND,
|
|
SLM_OBJECT,
|
|
SLM_STRUCT,
|
|
SLM_SHADOW,
|
|
SLM_MERC, //Should never be used
|
|
SLM_ROOF,
|
|
SLM_ONROOF,
|
|
SLM_TOPMOST, //Should never be used
|
|
|
|
// For Removing
|
|
SLM_REMOVE_LAND,
|
|
SLM_REMOVE_OBJECT,
|
|
SLM_REMOVE_STRUCT,
|
|
SLM_REMOVE_SHADOW,
|
|
SLM_REMOVE_MERC, //Should never be used
|
|
SLM_REMOVE_ROOF,
|
|
SLM_REMOVE_ONROOF,
|
|
SLM_REMOVE_TOPMOST, //Should never be used
|
|
|
|
//Smell, or Blood is used
|
|
SLM_BLOOD_SMELL,
|
|
|
|
// Damage a particular struct
|
|
SLM_DAMAGED_STRUCT,
|
|
|
|
//Exit Grids
|
|
SLM_EXIT_GRIDS,
|
|
|
|
// State of Openable structs
|
|
SLM_OPENABLE_STRUCT,
|
|
|
|
// Modify window graphic & structure
|
|
SLM_WINDOW_HIT,
|
|
#ifdef JA2UB
|
|
SLM_REMOVE_EXIT_GRID,
|
|
#endif
|
|
};
|
|
|
|
typedef struct
|
|
{
|
|
INT32 usGridNo; //The gridno the graphic will be applied to
|
|
UINT16 usImageType; //graphic index
|
|
UINT16 usSubImageIndex; //
|
|
// UINT16 usIndex;
|
|
UINT8 ubType; // the layer it will be applied to
|
|
|
|
UINT8 ubExtra; // Misc. variable used to strore arbritary values
|
|
} MODIFY_MAP;
|
|
|
|
|
|
// Call this function, to set whether the map changes will be added to the map temp file
|
|
void ApplyMapChangesToMapTempFile( BOOLEAN fAddToMap );
|
|
|
|
BOOLEAN SaveModifiedMapStructToMapTempFile( MODIFY_MAP *pMap, INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ );
|
|
|
|
|
|
|
|
|
|
//Applies a change TO THE MAP TEMP file
|
|
void AddStructToMapTempFile( INT32 iMapIndex, UINT16 usIndex );
|
|
|
|
|
|
//Applies a change TO THE MAP from the temp file
|
|
void AddStructFromMapTempFileToMap( INT32 iMapIndex, UINT16 usIndex );
|
|
|
|
|
|
void AddObjectToMapTempFile( INT32 uiMapIndex, UINT16 usIndex );
|
|
|
|
|
|
BOOLEAN LoadAllMapChangesFromMapTempFileAndApplyThem( );
|
|
|
|
|
|
void RemoveStructFromMapTempFile( INT32 uiMapIndex, UINT16 usIndex );
|
|
|
|
void AddRemoveObjectToMapTempFile( INT32 uiMapIndex, UINT16 usIndex );
|
|
|
|
void SaveBloodSmellAndRevealedStatesFromMapToTempFile();
|
|
|
|
|
|
BOOLEAN SaveRevealedStatusArrayToRevealedTempFile( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ );
|
|
|
|
BOOLEAN LoadRevealedStatusArrayFromRevealedTempFile();
|
|
|
|
|
|
void AddRemoveObjectToUnLoadedMapTempFile( INT32 uiMapIndex, UINT16 usIndex, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
void RemoveStructFromUnLoadedMapTempFile( INT32 uiMapIndex, UINT16 usIndex, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
void AddObjectToUnLoadedMapTempFile( INT32 uiMapIndex, UINT16 usIndex, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
void AddStructToUnLoadedMapTempFile( INT32 uiMapIndex, UINT16 usIndex, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
|
|
//Adds the exit grid to
|
|
void AddExitGridToMapTempFile( INT32 usGridNo, EXITGRID *pExitGrid, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
|
|
|
|
//This function removes a struct with the same MapIndex and graphic index from the given sectors temp file
|
|
BOOLEAN RemoveGraphicFromTempFile( INT32 uiMapIndex, UINT16 usIndex, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
|
|
|
|
void SetOpenableStructStatusFromMapTempFile( INT32 uiMapIndex, BOOLEAN fOpened );
|
|
void AddOpenableStructStatusToMapTempFile( INT32 uiMapIndex, BOOLEAN fOpened );
|
|
|
|
void AddWindowHitToMapTempFile( INT32 uiMapIndex );
|
|
|
|
BOOLEAN ChangeStatusOfOpenableStructInUnloadedSector( UINT16 usSectorX, UINT16 usSectorY, INT8 bSectorZ, INT32 usGridNo, BOOLEAN fChangeToOpen );
|
|
|
|
#ifdef JA2UB
|
|
//ja25 ub
|
|
void AddRemoveExitGridToUnloadedMapTempFile( UINT32 usGridNo, INT16 sSectorX, INT16 sSectorY, UINT8 ubSectorZ );
|
|
#endif
|
|
|
|
#endif
|