1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2007-08-07 21:39:23 +00:00
parent 30bccc0d73
commit ce31084ae7
98 changed files with 82 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Credits.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "JA2 All.h"
#include "Credits.h"
@@ -1074,7 +1073,6 @@ BOOLEAN DisplayCreditNode( CRDT_NODE *pCurrent )
//if the surface is at the bottom of the screen
if( pCurrent->sOldPosY + pCurrent->sHeightOfString > CRDT_START_POS_Y )
{
// WANNE 2
INT16 sHeight = SCREEN_HEIGHT - pCurrent->sOldPosY;
//INT16 sHeight = 480 - pCurrent->sOldPosY;
RestoreExternBackgroundRect( pCurrent->sOldPosX, pCurrent->sOldPosY, CRDT_WIDTH_OF_TEXT_AREA, sHeight );
Editor/Cursor Modes.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -341,7 +340,6 @@ BOOLEAN HandleAreaSelection()
void ValidateSelectionRegionBoundaries()
{
// WANNE: EDITOR?
gSelectRegion.iLeft = max( min( 159, gSelectRegion.iLeft ) , 0 );
gSelectRegion.iRight = max( min( 159, gSelectRegion.iRight ), 0 );
gSelectRegion.iTop = max( min( 159, gSelectRegion.iTop ) , 0 );
Editor/Editor Callbacks.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Editor Modes.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Editor Taskbar Creation.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -417,7 +416,6 @@ void InitEditorMercsToolbar()
iScreenWidthOffset + 516, 2 * iScreenHeightOffset + 362, 77, 16, BUTTON_NO_TOGGLE, MSYS_PRIORITY_NORMAL, DEFAULT_MOVE_CALLBACK, MercsScheduleClearCallback );
HideEditorButtons( MERCS_SCHEDULE_DATA1A, MERCS_SCHEDULE_DATA4B );
// WANNE: continue
iEditorButton[ MERCS_HEAD_SLOT ] =
CreateCheckBoxButton( MERCPANEL_X+61, MERCPANEL_Y+0, "EDITOR//smCheckbox.sti", MSYS_PRIORITY_NORMAL+1, MercsInventorySlotCallback );
MSYS_SetBtnUserData( iEditorButton[ MERCS_HEAD_SLOT ], 0, HELMETPOS );
Editor/Editor Taskbar Utils.cpp
+3 -8
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR?
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -447,7 +446,6 @@ void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...)
mprintf( x, y, string );
}
// WANNE: EDITOR continue
void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom )
{
ColorFillVideoSurfaceArea( ButtonDestBuffer, sLeft, sTop, sRight, sBottom, gusEditorTaskbarColor );
@@ -730,7 +728,6 @@ void BuildTriggerName( OBJECTTYPE *pItem, STR16 szItemName )
}
}
// WANNE: EDITOR?
void RenderDoorLockInfo()
{
INT16 i, xp, yp;
@@ -782,7 +779,6 @@ void RenderDoorLockInfo()
}
}
// WANNE: EDITOR?
void RenderSelectedItemBlownUp()
{
UINT32 uiVideoObjectIndex;
@@ -899,7 +895,7 @@ void RenderEditorInfo( )
break;
case TASK_TERRAIN:
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: Comment this two lines, because we always get an exception here.
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"Width: %d", gusSelectionWidth );
@@ -915,7 +911,7 @@ void RenderEditorInfo( )
UpdateBuildingsInfo();
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: Comment this two lines, because we always get an exception here.
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"%d", gusSelectionWidth );
@@ -926,7 +922,7 @@ void RenderEditorInfo( )
break;
case TASK_MAPINFO:
UpdateMapInfo();
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: EDITOR: Comment this two lines, because we always get an exception here!
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"Width: %d", gusSelectionWidth );
@@ -991,7 +987,6 @@ void ProcessEditorRendering()
if( fSaveBuffer )
// WANNE: EDITOR?
BlitBufferToBuffer( FRAME_BUFFER, guiSAVEBUFFER, 0, 2 * iScreenHeightOffset + 360, SCREEN_WIDTH, 120 );
//Make sure this is TRUE at all times.
Editor/Editor Undo.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorBuildings.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorDefines.h
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR done
#include "BuildDefines.h"
#ifdef JA2EDITOR
Editor/EditorItems.cpp
-8
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR?
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -207,7 +206,6 @@ void EntryInitEditorItemsInfo()
}
}
// WANNE: EDITOR?
void InitEditorItemsInfo(UINT32 uiItemType)
{
VSURFACE_DESC vs_desc;
@@ -311,7 +309,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
//every pair of items (odd rounded up) requires 60 pixels for width.
//the minimum buffer size is 420. Height is always 80 pixels.
// WANNE: EDITOR?
eInfo.sWidth = (eInfo.sNumItems > 12) ? ((eInfo.sNumItems+1)/2)*60 : SCREEN_HEIGHT - 120;
eInfo.sHeight = 80;
// Create item buffer
@@ -377,7 +374,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
BltVideoObjectOutlineFromIndex( eInfo.uiBuffer, uiVideoObjectIndex, item->ubGraphicNum, sStart, y+2, 0, FALSE );
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
// WANNE: EDITOR?
if( y == 0 )
{
y = 40;
@@ -512,7 +508,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
}
}
// WANNE: EDITOR?
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
//Calculate the center position of the graphic in a 60 pixel wide area.
@@ -525,7 +520,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
BltVideoObjectOutlineFromIndex( eInfo.uiBuffer, uiVideoObjectIndex, item->ubGraphicNum, sStart, y+2, 0, FALSE );
}
// WANNE: EDITOR?
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
if( y == 0 )
{
@@ -578,7 +572,6 @@ void RenderEditorItemsInfo()
return;
}
// WANNE: EDITOR?
if( gusMouseXPos < (iScreenWidthOffset + 110) || gusMouseXPos > (iScreenWidthOffset + 480) || gusMouseYPos < (2 * iScreenHeightOffset + 360) || gusMouseYPos > (2 * iScreenHeightOffset + 440) )
{ //Mouse has moved out of the items display region -- so nothing can be highlighted.
eInfo.sHilitedItemIndex = -1;
@@ -729,7 +722,6 @@ void HandleItemsPanel( UINT16 usScreenX, UINT16 usScreenY, INT8 bEvent )
//Add the converted mouse's XPos into a relative index;
//Calc: starting from 110, for every 60 pixels, add 2 to the index
// WANNE: EDITOR????
sIndex += ((usScreenX-110-iScreenWidthOffset)/60) * 2;
switch( bEvent )
{
Editor/EditorMapInfo.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorMercs.cpp
-6
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -794,7 +793,6 @@ void DisplayEditMercWindow( void )
usFillColorLight = Get16BPPColor(FROMRGB(136, 138, 135));
usFillColorTextBk = Get16BPPColor(FROMRGB(250, 240, 188));
// WANNE: EDITOR?????????
iWidth = 266;
iHeight = 360;
iYPos = iScreenHeightOffset + 0;
@@ -1246,7 +1244,6 @@ void ShowEditMercColorSet( UINT8 ubPaletteRep, INT16 sSet )
sUnitSize = 128 / (INT16)(ubSize);
// WANNE: EDITOR?
sTop = 2 * iScreenHeightOffset + 364 + (sSet * 24);
sBottom = sTop + 20;
sLeft = iScreenWidthOffset + 230;
@@ -1334,7 +1331,6 @@ void DisplayWayPoints(void)
// Bring it down a touch
sScreenY += 5;
// WANNE: EDITOR?
if( sScreenY <= (2 * iScreenHeightOffset + 355 ))
{
// Shown it on screen!
@@ -1360,7 +1356,6 @@ void CreateEditMercWindow( void )
INT32 x;
SOLDIERTYPE *pSoldier;
// WANNE: EDITOR?
iWidth = 266;
iHeight = 360;
iYPos = iScreenHeightOffset + 0;
@@ -2795,7 +2790,6 @@ void AddNewItemToSelectedMercsInventory( BOOLEAN fCreate )
uiSrcID = guiMercTempBuffer;
uiDstID = guiMercInvPanelBuffers[ gbCurrSelect ];
// WANNE: EDITOR?
//build the rects
iDstWidth = gbCurrSelect < 3 ? MERCINV_SMSLOT_WIDTH : MERCINV_LGSLOT_WIDTH;
iDstHeight = MERCINV_SLOT_HEIGHT;
Editor/EditorTerrain.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Item Statistics.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/LoadScreen.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -458,7 +457,6 @@ void CreateFileDialog( STR16 zTitle )
//File list window
// WANNE: EDITOR?
iFileDlgButtons[4] = CreateHotSpot( (iScreenWidthOffset + 179+4), (iScreenHeightOffset + 69+3), (179+4+240), (69+120+3), MSYS_PRIORITY_HIGH-1, BUTTON_NO_CALLBACK, FDlgNamesCallback);
//Title button
iFileDlgButtons[5] = CreateTextButton(zTitle, HUGEFONT, FONT_LTKHAKI, FONT_DKKHAKI,
Editor/Road Smoothing.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Sector Summary.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -886,7 +885,6 @@ void RenderItemDetails()
{
xp += 170;
// WANNE: EDITOR?
yp = (iScreenHeightOffset + 20);
if( xp >= (UINT32)(iScreenWidthOffset + 300 ))
Editor/SmartMethod.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Smoothing Utils.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/edit_sys.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDTIOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/editscreen.cpp
-10
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -779,7 +778,6 @@ BOOLEAN DrawTempMouseCursorObject(void)
}
// WANNE: EDITOR?
//Displays the current drawing object in the small, lower left window of the editor's toolbar.
void ShowCurrentDrawingMode( void )
{
@@ -798,7 +796,6 @@ void ShowCurrentDrawingMode( void )
UINT16 usFillColor;
INT32 iIndexToUse;
// WANNE: EDITOR?
// Set up a clipping rectangle for the display window.
NewRect.iLeft = iScreenWidthOffset + 0;
NewRect.iTop = 2 * iScreenHeightOffset + 400;
@@ -1007,7 +1004,6 @@ void ShowCurrentDrawingMode( void )
iPicWidth = (INT32)pETRLEObject->usWidth;
iPicHeight = (INT32)pETRLEObject->usHeight;
// WANNE: EDITOR?
// Center the picture in the display window.
iStartX = ( 100 - iPicWidth ) / 2;
iStartY = ( 60 - iPicHeight ) / 2;
@@ -1020,7 +1016,6 @@ void ShowCurrentDrawingMode( void )
pETRLEObject->sOffsetX = 0;
pETRLEObject->sOffsetY = 0;
// WANNE: EDITOR?
SetObjectShade( gTileDatabase[gTileTypeStartIndex[usObjIndex]].hTileSurface, DEFAULT_SHADE_LEVEL );
BltVideoObject( FRAME_BUFFER, gTileDatabase[gTileTypeStartIndex[usObjIndex]].hTileSurface,
usUseIndex, (iScreenWidthOffset + 0 + iStartX), (2 * iScreenHeightOffset + 400 + iStartY),
@@ -1030,7 +1025,6 @@ void ShowCurrentDrawingMode( void )
pETRLEObject->sOffsetY = sTempOffsetY;
}
// WANNE: EDITOR?
// Set the color for the window's border. Blueish color = Normal, Red = Fake lighting is turned on
usFillColor = GenericButtonFillColors[0];
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
@@ -2401,7 +2395,6 @@ UINT32 WaitForHelpScreenResponse( void )
InputAtom DummyEvent;
BOOLEAN fLeaveScreen;
// WANNE: EDITOR?
ColorFillVideoSurfaceArea(FRAME_BUFFER, iScreenWidthOffset + 50, iScreenHeightOffset + 50, iScreenWidthOffset + 590, iScreenHeightOffset + 310,
Get16BPPColor(FROMRGB(136, 138, 135)) );
ColorFillVideoSurfaceArea(FRAME_BUFFER, iScreenWidthOffset + 51, iScreenHeightOffset + 51, iScreenWidthOffset + 590, iScreenHeightOffset + 310,
@@ -2617,7 +2610,6 @@ void ShowCurrentSlotSurface( UINT32 vSurface, INT32 iWindow )
INT32 iWinWidth, iWinHeight;
blt_vs_fx vSfx;
// WANNE: EDITOR
WinRect.iLeft = (iWindow == 0) ? (iScreenWidthOffset + 336) : (iScreenWidthOffset + 488);
WinRect.iTop = 2 * iScreenHeightOffset + 211;
WinRect.iRight = (iWindow == 0) ? (iScreenWidthOffset + 485) : (iScreenWidthOffset + 637);
@@ -2685,7 +2677,6 @@ void ShowCurrentSlotImage( HVOBJECT hVObj, INT32 iWindow )
ETRLEObject *pETRLEObject;
INT32 iWinWidth, iWinHeight;
// WANNE: EDITOR?
NewRect.iLeft = (iWindow == 0) ? (iScreenWidthOffset + 336) : (iScreenWidthOffset + 488);
NewRect.iTop = 2 * iScreenHeightOffset + 211;
NewRect.iRight = (iWindow == 0) ? (iScreenWidthOffset + 485) : (iScreenWidthOffset + 637);
@@ -3770,7 +3761,6 @@ UINT32 EditScreenHandle( void )
void CreateGotoGridNoUI()
{
// WANNE: EDITOR
gfGotoGridNoUI = TRUE;
//Disable the rest of the editor
DisableEditorTaskbar();
Editor/messagebox.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/newsmooth.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: todo
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/smooth.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
GameSettings.cpp
+4 -7
View File
@@ -636,17 +636,14 @@ void LoadGameExternalOptions()
gGameExternalOptions.gfInvestigateSector = iniReader.ReadBoolean("JA2 Gameplay Settings","ENEMY_INVESTIGATE_SECTOR",FALSE);
gGameExternalOptions.gfReassignPendingReinforcements = iniReader.ReadBoolean("JA2 Gameplay Settings","REASSIGN_PENDING_REINFORCEMENTS",TRUE);
// WANNE: Drop Items
gGameExternalOptions.ubEnemiesItemDrop = iniReader.ReadInteger("JA2 Gameplay Settings","ENEMIES_ITEM_DROP", 0);
// WANNE: External sector Loadscreens [2007-05-19]
gGameExternalOptions.gfUseExternalLoadscreens = iniReader.ReadBoolean("JA2 Gameplay Settings","USE_EXTERNALIZED_LOADSCREENS", FALSE);
gGameExternalOptions.gfUseExternalLoadscreens = iniReader.ReadBoolean("JA2 Gameplay Settings","USE_EXTERNALIZED_LOADSCREENS", FALSE);
// Militia settings
gGameExternalOptions.guiAllowMilitiaGroupsDelay = iniReader.ReadInteger("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_DELAY",1);
gGameExternalOptions.guiTrainVeteranMilitiaDelay = iniReader.ReadInteger("JA2 Gameplay Settings","TRAIN_VETERAN_MILITIA_DELAY",1);
gGameExternalOptions.gfTrainVeteranMilitia = iniReader.ReadBoolean("JA2 Gameplay Settings","TRAIN_VETERAN_MILITIA",FALSE);
gGameExternalOptions.guiAllowMilitiaGroupsDelay = iniReader.ReadInteger("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_DELAY",1);
gGameExternalOptions.guiTrainVeteranMilitiaDelay = iniReader.ReadInteger("JA2 Gameplay Settings","TRAIN_VETERAN_MILITIA_DELAY",1);
gGameExternalOptions.gfTrainVeteranMilitia = iniReader.ReadBoolean("JA2 Gameplay Settings","TRAIN_VETERAN_MILITIA",FALSE);
gGameExternalOptions.gfAllowMilitiaGroups = iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",FALSE);
gGameExternalOptions.gfmusttrainroaming = iniReader.ReadBoolean("JA2 Gameplay Settings","MUST_TRAIN_MOBILE_MILITIA",FALSE);
gGameExternalOptions.gfAllowReinforcements = iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",FALSE);
GameSettings.h
-2
View File
@@ -347,10 +347,8 @@ typedef struct
BOOLEAN gfInvestigateSector;
BOOLEAN gfReassignPendingReinforcements;
// WANNE
INT32 ubEnemiesItemDrop;
// WANNE: External sector loadscreens [2007-05-19]
BOOLEAN gfUseExternalLoadscreens;
BOOLEAN gfUseAutoSave;
HelpScreen.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "JA2 All.h"
#include "HelpScreen.h"
Init.cpp
-1
View File
@@ -123,7 +123,6 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
if(!ReadInEnemyArmourDropsStats(gEnemyArmourDrops, fileName))
return FALSE;
// WANNE: Enemy drops - end
// WANNE: Sector Loadscreens [2007-05-18]
Laptop/BobbyRAmmo.cpp
-2
View File
@@ -62,7 +62,6 @@ void ExitBobbyRAmmo()
DeleteVideoObjectFromIndex(guiAmmoGrid);
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRAmmoFilter();
DeleteBobbyBrTitle();
@@ -92,7 +91,6 @@ void RenderBobbyRAmmo()
DisplayItemInfo(IC_AMMO, guiCurrentAmmoFilterMode);
UpdateButtonText(guiCurrentLaptopMode);
// WANNE
UpdateAmmoFilterButtons(guiCurrentAmmoFilterMode, guiPrevAmmoFilterMode);
MarkButtonsDirty( );
Laptop/BobbyRArmour.cpp
+1 -3
View File
@@ -23,7 +23,6 @@ void GameInitBobbyRArmour()
}
// WANNE
BOOLEAN EnterBobbyRArmour()
{
VOBJECT_DESC VObjectDesc;
@@ -47,7 +46,7 @@ BOOLEAN EnterBobbyRArmour()
//Draw menu bar
InitBobbyMenuBar( );
// WANNE
InitBobbyRArmourFilterBar();
RenderBobbyRArmour( );
@@ -61,7 +60,6 @@ void ExitBobbyRArmour()
DeleteVideoObjectFromIndex(guiArmourGrid);
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRArmourFilter();
DeleteBobbyBrTitle();
Laptop/BobbyRGuns.cpp
+2 -26
View File
@@ -136,7 +136,6 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
//UINT8 usNumberOfBobbyRayOrderItems = 0;
//UINT8 usNumberOfBobbyRayOrderUsed = 0;
// WANNE
#define FILTER_BUTTONS_GUN_START_X BOBBYR_PREVIOUS_BUTTON_X
#define FILTER_BUTTONS_AMMO_START_X FILTER_BUTTONS_GUN_START_X
#define FILTER_BUTTONS_USED_START_X FILTER_BUTTONS_GUN_START_X //FILTER_BUTTONS_GUN_START_X + 122
@@ -144,7 +143,6 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
#define FILTER_BUTTONS_MISC_START_X FILTER_BUTTONS_GUN_START_X
#define FILTER_BUTTONS_Y BOBBYR_PREVIOUS_BUTTON_Y + 25
// WANNE
// The number of filter buttons which category uses
#define NUMBER_GUNS_FILTER_BUTTONS 9
#define NUMBER_AMMO_FILTER_BUTTONS 8
@@ -152,25 +150,20 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
#define NUMBER_MISC_FILTER_BUTTONS 9
#define NUMBER_USED_FILTER_BUTTONS 3
// WANNE
#define BOBBYR_GUNS_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_AMMO_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_USED_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_ARMOUR_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_MISC_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
// WANNE
UINT32 guiBobbyRFilterGuns[ NUMBER_GUNS_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterAmmo[ NUMBER_AMMO_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterArmor[ NUMBER_ARMOUR_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterMisc[ NUMBER_MISC_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterUsed[ NUMBER_USED_FILTER_BUTTONS ];
// WANNE
INT32 guiBobbyRFilterImage;
// WANNE
void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason);
void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason);
void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason);
@@ -179,7 +172,6 @@ void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason);
BOOLEAN IsAmmoMatchinWeaponType(UINT16 usItemIndex, UINT8 ubWeaponType);
// WANNE
INT8 ubFilterGunsButtonValues[] = {
BOBBYR_FILTER_GUNS_HEAVY,
BOBBYR_FILTER_GUNS_PISTOL,
@@ -191,7 +183,6 @@ INT8 ubFilterGunsButtonValues[] = {
BOBBYR_FILTER_GUNS_LMG,
BOBBYR_FILTER_GUNS_SHOTGUN};
// WANNE
INT8 ubFilterAmmoButtonValues[] = {
BOBBYR_FILTER_AMMO_PISTOL,
BOBBYR_FILTER_AMMO_M_PISTOL,
@@ -326,7 +317,6 @@ void GameInitBobbyRGuns()
{
guiTempCurrentMode=0;
// WANNE
guiPrevGunFilterMode = -1;
guiPrevAmmoFilterMode = -1;
guiPrevUsedFilterMode = -1;
@@ -392,7 +382,6 @@ void ExitBobbyRGuns()
DeleteBobbyBrTitle();
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRGunsFilter();
DeleteMouseRegionForBigImage();
@@ -411,7 +400,7 @@ void RenderBobbyRGuns()
WebPageTileBackground(BOBBYR_NUM_HORIZONTAL_TILES, BOBBYR_NUM_VERTICAL_TILES, BOBBYR_BACKGROUND_WIDTH, BOBBYR_BACKGROUND_HEIGHT, guiGunBackground);
// WANNE
// WANNE: Do not display the title
//Display title at top of page
//DisplayBobbyRBrTitle();
@@ -497,7 +486,6 @@ void SelectTitleImageLinkRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
}
// WANNE
BOOLEAN InitBobbyRGunsFilterBar()
{
UINT8 i;
@@ -784,7 +772,6 @@ BOOLEAN InitBobbyMenuBar( )
return(TRUE);
}
// WANNE
BOOLEAN DeleteBobbyRGunsFilter()
{
UINT8 i;
@@ -841,7 +828,6 @@ BOOLEAN DeleteBobbyRArmourFilter()
return (TRUE);
}
// WANNE
BOOLEAN DeleteBobbyRMiscFilter()
{
UINT8 i;
@@ -880,7 +866,6 @@ BOOLEAN DeleteBobbyMenuBar()
return(TRUE);
}
// WANNE
void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -958,7 +943,6 @@ void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
}
// WANNE
void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1141,7 +1125,7 @@ void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1193,7 +1177,6 @@ void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1247,7 +1230,6 @@ void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason)
SetFirstLastPagesForNew(IC_BOBBY_MISC, guiCurrentMiscFilterMode);
// WANNE: TODO
UpdateMiscFilterButtons();
DeleteMouseRegionForBigImage();
@@ -1305,7 +1287,6 @@ void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
{
UINT16 i;
@@ -2082,7 +2063,6 @@ void CalculateFirstAndLastIndexs()
}
*/
// WANNE: Filter
//Loops through Bobby Rays Inventory to find the first and last index
void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
{
@@ -2179,7 +2159,6 @@ void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
gubNumPages += 1;
}
// WANNE
//Loops through Bobby Rays Used Inventory to find the first and last index
void SetFirstLastPagesForUsed(INT32 iFilter)
{
@@ -2802,7 +2781,6 @@ void BtnBobbyRHomeButtonCallback(GUI_BUTTON *btn,INT32 reason)
}
// WANNE
void UpdateButtonText(UINT32 uiCurPage)
{
switch( uiCurPage )
@@ -2864,7 +2842,6 @@ void UpdateButtonText(UINT32 uiCurPage)
}
}
// WANNE
void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton)
{
if (iNewButton != iOldButton)
@@ -3064,7 +3041,6 @@ void DisableBobbyRButtons()
*/
}
// WANNE
void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32 uiItemClass )
{
UINT16 i;
Laptop/BobbyRMisc.cpp
+1 -5
View File
@@ -46,11 +46,9 @@ BOOLEAN EnterBobbyRMisc()
//Draw menu bar
InitBobbyMenuBar( );
// WANNE
InitBobbyRMiscFilterBar();
// CalculateFirstAndLastIndexs();
RenderBobbyRMisc( );
@@ -66,7 +64,6 @@ void ExitBobbyRMisc()
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRMiscFilter();
DeleteMouseRegionForBigImage();
@@ -91,7 +88,6 @@ void RenderBobbyRMisc()
GetVideoObject(&hPixHandle, guiMiscGrid);
BltVideoObject(FRAME_BUFFER, hPixHandle, 0, BOBBYR_GRIDLOC_X, BOBBYR_GRIDLOC_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// WANNE
DisplayItemInfo(IC_BOBBY_MISC, guiCurrentMiscFilterMode);
UpdateButtonText(guiCurrentLaptopMode);
UpdateMiscFilterButtons();
Laptop/IMP Begin Screen.cpp
-18
View File
@@ -407,24 +407,6 @@ void BtnIMPBeginScreenDoneCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// Check if we can create an imp with the selected gender
// WANNE NEW
/*if (bProceed == TRUE)
{
if( FEMALE_GENDER_SELECT == ubTextEnterMode )
{
bGenderFlag = IMP_FEMALE;
}
else if( MALE_GENDER_SELECT == ubTextEnterMode )
{
bGenderFlag = IMP_MALE;
}
else
{
bProceed = FALSE;
}
}*/
// Data is valid
if (bProceed == TRUE)
{
Laptop/IMP Confirm.cpp
-1
View File
@@ -227,7 +227,6 @@ BOOLEAN AddCharacterToPlayersTeam( void )
memset(&HireMercStruct, 0, sizeof(MERC_HIRE_STRUCT));
// WANNE NEW: Any changes here. I don't think so
HireMercStruct.ubProfileID = ( UINT8 )( LaptopSaveInfo.iIMPIndex ) ;
if( fLoadingCharacterForPreviousImpProfile == FALSE )
Laptop/IMP HomePage.cpp
+1 -1
View File
@@ -347,7 +347,7 @@ void HandleTextEvent( UINT32 uiKey )
if( uiKey >= 'A' && uiKey <= 'Z' ||
uiKey >= 'a' && uiKey <= 'z' ||
uiKey >= '0' && uiKey <= '9' ||
uiKey == '_' || uiKey == '.' || uiKey ==' ') // WANNE NEW: added ' '
uiKey == '_' || uiKey == '.' || uiKey ==' ')
{
// if the current string position is at max or great, do nothing
if( iStringPos >= 8 )
Laptop/IMP MainPage.cpp
-2
View File
@@ -980,7 +980,6 @@ void IMPMainPageNotSelectableBtnCallback(MOUSE_REGION * pRegion, INT32 iReason )
return;
}
// WANNE NEW
// WDS: Allow flexible numbers of IMPs of each sex
INT32 CountFilledIMPSlots( INT8 iSex )
{
@@ -1049,7 +1048,6 @@ INT32 GetSexOfIMP(INT32 iIMPId)
}
// WANNE NEW
INT32 GetFreeIMPSlot(INT32 iIMPId, INT32 iDefaultIMPId)
{
INT32 iStart;
Laptop/IMP MainPage.h
-1
View File
@@ -10,7 +10,6 @@ void NextProfilingMode( void );
void ShadeUnSelectableButtons( void );
BOOLEAN IsIMPSlotFree(INT32 iIMPId);
// WANNE NEW
INT32 GetFreeIMPSlot(INT32 iIMPId, INT32 iDefaultIMPId);
// WDS: Allow flexible numbers of IMPs of each sex
Laptop/IMP Voices.cpp
-2
View File
@@ -165,7 +165,6 @@ void FixVoiceRange()
}
// WANNE NEW
void IncrementVoice( void )
{
INT32 iIMPIndex = -1;
@@ -413,7 +412,6 @@ void BtnIMPVoicesDoneCallback(GUI_BUTTON *btn,INT32 reason)
*/
// set voice id, to grab character slot
// WANNE 10:
// WDS: Allow flexible numbers of IMPs of each sex
LaptopSaveInfo.iIMPIndex = gGameExternalOptions.iaIMPSlots[iCurrentVoice];
Laptop/email.cpp
-4
View File
@@ -239,7 +239,6 @@ UINT32 guiEmailIndicator;
UINT32 guiEmailMessage;
UINT32 guiMAILDIVIDER;
// WANNE 10:
INT16 giCurrentIMPSlot = PLAYER_GENERATED_CHARACTER_ID;
@@ -800,7 +799,6 @@ void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject,
// null out last byte of subject
pTempEmail->pSubject[wcslen(pSubject)+1]=0;
// WANNE 10:
pTempEmail->iCurrentIMPPosition = iCurrentIMPPosition;
// set date and sender, Id
@@ -1740,7 +1738,6 @@ INT32 DisplayEmailMessage(EmailPtr pMail)
// we KNOW the player is going to "read" this, so mark it as so
pMail->fRead=TRUE;
// WANNE 10
giCurrentIMPSlot = pMail->iCurrentIMPPosition;
// draw text for title bar
@@ -3475,7 +3472,6 @@ void HandleIMPCharProfileResultsMessage( void)
}
// personality itself
// WANNE 10:
switch( gMercProfiles[ iCurrentIMPSlot ].bAttitude )
{
// normal as can be
Laptop/email.h
-2
View File
@@ -194,8 +194,6 @@ typedef struct
BOOLEAN fRead;
BOOLEAN fNew;
// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
// BECAUSE A NEW GAME MUST BE STARTED!
INT32 iCurrentIMPPosition;
} SavedEmailStruct;
Laptop/laptop.cpp
+5 -17
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Laptop All.h"
#include "HelpScreen.h"
@@ -272,7 +271,6 @@ extern BOOLEAN fFirstTimeInGameScreen;
#define LAPTOP__NEW_EMAIL_ICON_X iScreenWidthOffset + 67
#define LAPTOP__NEW_EMAIL_ICON_Y LAPTOP__NEW_FILE_ICON_Y
// WANNE
INT32 guiCurrentGunFilterMode;
INT32 guiPrevGunFilterMode;
@@ -375,8 +373,6 @@ static BOOLEAN fNewWWW=TRUE;
//Used to store the site to go to after the 'rain delay' message
extern UINT32 guiRainLoop;
// WANNE 2
INT32 giRainDelayInternetSite=-1;
@@ -877,7 +873,7 @@ INT32 EnterLaptop()
// Stop ambients...
StopAmbients( );
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
////if its raining, start the rain showers
//if( IsItRaining() )
//{
@@ -1041,7 +1037,7 @@ void ExitLaptop()
// Start ambients...
BuildDayAmbientSounds( );
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
//if its raining, start the rain showers
//if( IsItRaining() )
//{
@@ -1813,7 +1809,6 @@ void HandleLapTopHandles()
extern BOOLEAN gfPrintFrameBuffer;
// WANNE 2 <change laptop zooming>
UINT32 LaptopScreenHandle()
{
INT16 sYOffset = 0;
@@ -1884,7 +1879,7 @@ UINT32 LaptopScreenHandle()
DstRect.iRight = iScreenWidthOffset + 640; //640
DstRect.iBottom = iScreenHeightOffset + 480; //480
iLaptopMonitorCenterX = SCREEN_WIDTH - 184 + 19 + sXOffset;
iLaptopMonitorCenterY = SCREEN_HEIGHT - 70 + 16 + sYOffset; // WANNE 2
iLaptopMonitorCenterY = SCREEN_HEIGHT - 70 + 16 + sYOffset;
uiTimeRange = 1000;
iPercentage = iRealPercentage = 0;
uiStartTime = GetJA2Clock();
@@ -1897,7 +1892,6 @@ UINT32 LaptopScreenHandle()
PlayJA2SampleFromFile( "SOUNDS\\Laptop power up (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN );
// WANNE 2 with laptop zooming
while( iRealPercentage < 100 )
{
// Lesh: restore mapscreen so laptop zooming won't leave "graphical trail
@@ -1935,10 +1929,8 @@ UINT32 LaptopScreenHandle()
BltStretchVideoSurface( FRAME_BUFFER, guiSAVEBUFFER, iScreenWidthOffset, iScreenHeightOffset, 0, &DstRect, &SrcRect2 );
//WANNE 2
InvalidateScreen();
//WANNE 2
RefreshScreen( NULL );
}
@@ -2010,7 +2002,6 @@ UINT32 LaptopScreenHandle()
fPausedReDrawScreenFlag = FALSE;
}
// WANNE 2 <redraw>
if( fReDrawScreenFlag )
{
RenderLapTopImage();
@@ -2139,7 +2130,6 @@ UINT32 LaptopScreenHandle()
// render frame rate
DisplayFrameRate( );
// WANNE 2 <redraw>
// invalidate screen if redrawn
if( fReDrawScreenFlag == TRUE )
{
@@ -2550,7 +2540,6 @@ BOOLEAN LeaveLapTopScreen( void )
PlayJA2SampleFromFile( "SOUNDS\\Laptop power down (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN );
// WANNE 2
while( iRealPercentage > 0 )
{
BlitBufferToBuffer( guiEXTRABUFFER, FRAME_BUFFER, iScreenWidthOffset, iScreenHeightOffset,
@@ -3633,7 +3622,7 @@ void BookmarkCallBack(MOUSE_REGION * pRegion, INT32 iReason )
void GoToWebPage(INT32 iPageId )
{
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
////if it is raining, popup a warning first saying connection time may be slow
//if( IsItRaining() )
//{
@@ -5288,7 +5277,7 @@ BOOLEAN DrawDeskTopBackground( void )
SGPRect clip;
// set clipping region
// WANNE (if i change this values to SCREEN_WIDTH, ... than an exception is thrown in the vobject_blitters.cpp)
// WANNE: If i change this values to SCREEN_WIDTH, ... than an exception is thrown in the vobject_blitters.cpp)
// -> no changes to clip structure
clip.iLeft = 0;
clip.iRight = 506;
@@ -6422,7 +6411,6 @@ BOOLEAN IsItRaining()
void InternetRainDelayMessageBoxCallBack( UINT8 bExitValue )
{
// WANNE 2
//GoToWebPage( giRainDelayInternetSite );
//Set to -2 so we dont due the message for this occurence of laptop
Laptop/mercs Account.cpp
-6
View File
@@ -1,4 +1,3 @@
// WANNE 3 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Laptop All.h"
#else
@@ -179,7 +178,6 @@ void BtnAccountNextPageButtonCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE 3
INT32 GetNumberOfHiredMercs()
{
UINT8 usMercID;
@@ -217,7 +215,6 @@ void GameInitMercsAccount()
BOOLEAN EnterMercsAccount()
{
// WANNE 3 - BEGIN
UINT8 mercOverPage = 0;
iCurrentAccountPage = 0;
@@ -234,7 +231,6 @@ BOOLEAN EnterMercsAccount()
if (iTotalAccountPages == 0)
iTotalAccountPages++;
// WANNE 3 - END
VOBJECT_DESC VObjectDesc;
@@ -743,8 +739,6 @@ UINT32 CalculateHowMuchPlayerOwesSpeck()
UINT32 uiContractCharge=0;
UINT16 usMercID;
// WANNE 2
for(i=0; i<TOTAL_NUMBER_OF_MERCS; i++)
{
//if it larry Roach burn advance. ( cause larry is in twice, a sober larry and a stoned larry )
Options Screen.cpp
+1 -3
View File
@@ -277,7 +277,6 @@ UINT32 OptionsScreenHandle()
HandleOptionsScreen();
// WANNE 2 <redraw>
if( gfRedrawOptionsScreen )
{
RenderOptionsScreen();
@@ -334,7 +333,7 @@ BOOLEAN EnterOptionsScreen()
UINT8 cnt;
UINT16 usTextWidth, usTextHeight;
// WANNE <do not draw the blackground back>
// WANNE: Do not draw the blackground back
//ColorFillVideoSurfaceArea( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0 );
//Default this to off
@@ -774,7 +773,6 @@ void RenderOptionsScreen()
//Display the Music text
DisplayWrappedString( OPT_MUSIC_TEXT_X, OPT_MUSIC_TEXT_Y, OPT_SLIDER_TEXT_WIDTH, 2, OPT_SLIDER_FONT, OPT_MAIN_COLOR, zOptionsText[ OPT_MUSIC ], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
// WANNE <I think this is not used>
InvalidateRegion( OPTIONS__TOP_LEFT_X, OPTIONS__TOP_LEFT_Y, OPTIONS__BOTTOM_RIGHT_X, OPTIONS__BOTTOM_RIGHT_Y);
}
SCREENS.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "JA2 All.h"
#else
@@ -26,7 +25,6 @@ int SCREEN_HEIGHT;
int iScreenWidthOffset;
int iScreenHeightOffset;
// WANNE 2
BOOLEAN fDisplayOverheadMap;
Screens GameScreens[MAX_SCREENS] =
SaveLoadGame.cpp
-8
View File
@@ -3654,13 +3654,8 @@ BOOLEAN SaveEmailToSavedGame( HWFILE hFile )
SavedEmail.iFourthData = pEmail->iFourthData;
SavedEmail.uiFifthData = pEmail->uiFifthData;
SavedEmail.uiSixData = pEmail->uiSixData;
// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
// BECAUSE A NEW GAME MUST BE STARTED!
SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition;
// write the email header to the saved game file
FileWrite( hFile, &SavedEmail, sizeof( SavedEmailStruct ), &uiNumBytesWritten );
if( uiNumBytesWritten != sizeof( SavedEmailStruct ) )
@@ -3760,9 +3755,6 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile )
pTempEmail->iFourthData = SavedEmail.iFourthData;
pTempEmail->uiFifthData = SavedEmail.uiFifthData;
pTempEmail->uiSixData = SavedEmail.uiSixData;
// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
// BECAUSE A NEW GAME MUST BE STARTED!
pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition;
//add the current email in
SaveLoadScreen.cpp
+1 -2
View File
@@ -455,7 +455,7 @@ BOOLEAN EnterSaveLoadScreen()
UINT16 usPosX = SLG_FIRST_SAVED_SPOT_X;
UINT16 usPosY = SLG_FIRST_SAVED_SPOT_Y;
// WANNE <do not draw the background black>
// WANNE: Do not draw the background black
// Black background
//ColorFillVideoSurfaceArea( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0 );
@@ -647,7 +647,6 @@ Removed so that the user can click on it and get displayed a message that the qu
memset( &SaveGameHeader, 0, sizeof( SAVED_GAME_HEADER ) );
gbSaveGameSelectedLocation[ gbSelectedSaveLocation ] = SLG_UNSELECTED_SLOT_GRAPHICS_NUMBER;
// WANNE: NEW
if (gbSelectedSaveLocation != SAVE__END_TURN_NUM)
{
gbSaveGameArray[ gbSelectedSaveLocation ] = FALSE;
Standard Gaming Platform/Button System.cpp
-1
View File
@@ -1654,7 +1654,6 @@ INT32 CreateIconButton(INT16 Icon,INT16 IconIndex,INT16 GenImg,INT16 xloc,INT16
b->BackRect = -1;
#endif
// WANNE 2
// Add button to the button list
#ifdef BUTTONSYSTEM_DEBUGGING
AssertFailIfIdenticalButtonAttributesFound( b );
Standard Gaming Platform/vobject.cpp
-1
View File
@@ -111,7 +111,6 @@ void CheckValidVObjectIndex( UINT32 uiIndex );
//
// **************************************************************
// WANNE
int filter(unsigned int code, struct _EXCEPTION_POINTERS *ep)
{
puts("in filter.");
Strategic/Assignments.cpp
+1 -15
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "GameSettings.h"
@@ -8651,7 +8650,7 @@ BOOLEAN CreateDestroyAssignmentPopUpBoxes( void )
// these boxes are always created while in mapscreen...
CreateEPCBox( );
// WANNE 2 <ab>
CreateAssignmentsBox( );
CreateTrainingBox( );
CreateAttributeBox();
@@ -8807,8 +8806,6 @@ void SetTacticalPopUpAssignmentBoxXY( void )
gsAssignmentBoxesY = sY;
// WANNE 2
// ATE: Check if we are past tactical viewport....
// Use estimate width's/heights
if ( ( gsAssignmentBoxesX + 100 ) > SCREEN_WIDTH )
@@ -8817,7 +8814,6 @@ void SetTacticalPopUpAssignmentBoxXY( void )
gsAssignmentBoxesX = SCREEN_WIDTH - 100;
}
// WANNE 2
if ( ( gsAssignmentBoxesY + 130 ) > (SCREEN_HEIGHT - 160) )
{
gsAssignmentBoxesY = SCREEN_HEIGHT - 290;
@@ -8889,7 +8885,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
{
GetBoxSize( ghRepairBox, &pDimensions );
// WANNE 2
if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight >= SCREEN_WIDTH )
{
gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight ) );
@@ -8905,7 +8900,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
sLongest = ( INT16 )pDimensions.iBottom + ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_REPAIR );
}
// WANNE 2
if( gsAssignmentBoxesY + sLongest >= (SCREEN_HEIGHT - 120) )
{
gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( sLongest ) );
@@ -8937,7 +8931,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
sLongest = ( INT16 )pDimensions.iBottom;
}
// WANNE 2
if( gsAssignmentBoxesY + sLongest >= (SCREEN_HEIGHT - 120) )
{
gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( sLongest ) );
@@ -8954,14 +8947,12 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
GetBoxSize( ghTrainingBox, &pDimensions );
GetBoxSize( ghAttributeBox, &pDimensions3 );
// WANNE 2
if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight + pDimensions3.iRight >= SCREEN_WIDTH )
{
gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight + pDimensions3.iRight ) );
SetRenderFlags( RENDER_FLAG_FULL );
}
// WANNE 2
if( gsAssignmentBoxesY + pDimensions3.iBottom + ( GetFontHeight( MAP_SCREEN_FONT ) * ASSIGN_MENU_TRAIN ) >= (SCREEN_HEIGHT - 120) )
{
gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( pDimensions3.iBottom ) );
@@ -8987,14 +8978,12 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
{
GetBoxSize( ghTrainingBox, &pDimensions );
// WANNE 2
if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight >= SCREEN_WIDTH )
{
gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight ) );
SetRenderFlags( RENDER_FLAG_FULL );
}
// WANNE 2
if( gsAssignmentBoxesY + pDimensions2.iBottom + ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_TRAIN ) >= (SCREEN_HEIGHT - 120) )
{
gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( pDimensions2.iBottom ) - ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_TRAIN ) );
@@ -9011,7 +9000,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
}
else
{
// WANNE 2
// just the assignment box
if( gsAssignmentBoxesX + pDimensions2.iRight >= SCREEN_WIDTH )
{
@@ -9058,7 +9046,6 @@ void PositionCursorForTacticalAssignmentBox( void )
iFontHeight = GetLineSpace( ghAssignmentBox ) + GetFontHeight( GetBoxFont( ghAssignmentBox ) );
// WANNE 2
if( gGameSettings.fOptions[ TOPTION_DONT_MOVE_MOUSE ] == FALSE )
{
//SimulateMouseMovement( pPosition.iX + pDimensions.iRight - 6, pPosition.iY + ( iFontHeight / 2 ) + 2 );
@@ -10632,7 +10619,6 @@ void RebuildAssignmentsBox( void )
ghAssignmentBox = -1;
}
// WANNE 2 <ab>
CreateAssignmentsBox( );
}
Strategic/Auto Resolve.cpp
-8
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
// MAXIMUM NUMBER OF ENEMIES: 32
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
@@ -965,7 +964,6 @@ void CalculateSoldierCells( BOOLEAN fReset )
}
gpAR->uiTimeSlice = gpAR->uiTimeSlice * gpAR->ubTimeModifierPercentage / 100;
// WANNE 2
iTop = iScreenHeightOffset + (240 - gpAR->sHeight/2);
if( iTop > (iScreenHeightOffset + 120) )
iTop -= 40;
@@ -1228,7 +1226,6 @@ void BuildInterfaceBuffer()
INT32 x,y;
//Setup the blitting clip regions, so we don't draw outside of the region (for excess panelling)
// WANNE 2
gpAR->Rect.iLeft = iScreenWidthOffset + (320 - gpAR->sWidth/2);
gpAR->Rect.iRight = gpAR->Rect.iLeft + gpAR->sWidth;
gpAR->Rect.iTop = iScreenHeightOffset + (240 - gpAR->sHeight/2);
@@ -1811,7 +1808,6 @@ void RenderAutoResolve()
if( gpAR->fPendingSurrender )
{
// WANNE 2
DisplayWrappedString( (UINT16)(gpAR->sCenterStartX+16), (UINT16)(iScreenHeightOffset + 230+gpAR->bVerticalOffset), 108, 2,
(UINT8)FONT10ARIAL, FONT_YELLOW, gpStrategicString[ STR_ENEMY_SURRENDER_OFFER ], FONT_BLACK, FALSE, LEFT_JUSTIFIED );
}
@@ -1932,7 +1928,6 @@ void RenderAutoResolve()
break;
}
//Render the results of the battle.
// WANNE 2
SetFont( BLOCKFONT2 );
xp = gpAR->sCenterStartX + 12;
yp = iScreenHeightOffset + 218 + gpAR->bVerticalOffset;
@@ -1948,7 +1943,6 @@ void RenderAutoResolve()
gpAR->uiTotalElapsedBattleTimeInMilliseconds/60000,
(gpAR->uiTotalElapsedBattleTimeInMilliseconds%60000)/1000 );
xp = gpAR->sCenterStartX + 70 - StringPixLength( str, FONT10ARIAL )/2;
// WANNE 2
yp = iScreenHeightOffset + 290 + gpAR->bVerticalOffset;
SetFontForeground( FONT_YELLOW );
mprintf( xp, yp, str );
@@ -2275,7 +2269,6 @@ void CreateAutoResolveInterface()
gpAR->bVerticalOffset = (240 - gpAR->sHeight/2) > 120 ? -40 : 0;
// WANNE 2
//Create the buttons -- subject to relocation
gpAR->iButton[ PLAY_BUTTON ] =
QuickCreateButton( gpAR->iButtonImage[ PLAY_BUTTON ] , (INT16)(gpAR->sCenterStartX+11), (INT16)(iScreenHeightOffset + 240+gpAR->bVerticalOffset), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
@@ -3106,7 +3099,6 @@ void CalculateRowsAndColumns()
else
gpAR->sWidth = 146 + 55 * (max( max( gpAR->ubMercCols, gpAR->ubCivCols ), 2 ) + max( gpAR->ubEnemyCols, 2 ));
// WANNE 2
//gpAR->sCenterStartX = 323 - gpAR->sWidth/2 + max( max( gpAR->ubMercCols, 2), max( gpAR->ubCivCols, 2 ) ) *55;
gpAR->sCenterStartX = iScreenWidthOffset + (323 - gpAR->sWidth/2 + max( max( gpAR->ubMercCols, 2), max( gpAR->ubCivCols, 2 ) ) *55);
Strategic/Map Screen Interface Border.cpp
-9
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#else
@@ -109,7 +108,6 @@ void LevelMarkerBtnCallback(MOUSE_REGION * pRegion, INT32 iReason );
void CommonBtnCallbackBtnDownChecks( void );
// WANNE 2
void DrawTextOnMapBorder( void );
@@ -122,7 +120,6 @@ void BtnLowerLevelBtnCallback(GUI_BUTTON *btn,INT32 reason);
void BtnRaiseLevelBtnCallback(GUI_BUTTON *btn,INT32 reason);
*/
// WANNE 2
void DrawTextOnMapBorder( void )
{
INT16 sX = 0, sY = 0;
@@ -220,13 +217,11 @@ void RenderMapBorder( void )
GetVideoObject(&hHandle, guiMapBorder );
BltVideoObject( guiSAVEBUFFER , hHandle, 0, MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
// WANNE 2
if (iResolution == 1 || iResolution == 2)
{
DrawTextOnMapBorder();
}
// WANNE Invalidate!!
RestoreExternBackgroundRect( MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT );
// show the level marker
@@ -291,7 +286,6 @@ void RenderMapBorderEtaPopUp( void )
// get and blt ETA box
GetVideoObject(&hHandle, guiMapBorderEtaPopUp );
// WANNE 2 <change ETA position>
/*BltVideoObject( FRAME_BUFFER , hHandle, 0, MAP_BORDER_X + 215, 291, VO_BLT_SRCTRANSPARENCY,NULL );
InvalidateRegion( MAP_BORDER_X + 215, 291, MAP_BORDER_X + 215 + 100 , 310);*/
@@ -339,8 +333,6 @@ BOOLEAN CreateButtonsForMapBorder( void )
SetButtonFastHelpText( guiMapBorderScrollButtons[ 3 ], pMapScreenBorderButtonHelpText[ 9 ] );
*/
// WANNE 2
// towns
giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,5,-1,14,-1 );
giMapBorderButtons[ MAP_BORDER_TOWN_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 152), (SCREEN_HEIGHT - 160),
@@ -1182,7 +1174,6 @@ void DisplayCurrentLevelMarker( void )
GetVideoObject(&hHandle, guiLEVELMARKER );
BltVideoObject( guiSAVEBUFFER , hHandle, 0, MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), VO_BLT_SRCTRANSPARENCY,NULL );
// WANNE 2
RestoreExternBackgroundRect(MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), 55, 9);
Strategic/Map Screen Interface Bottom.cpp
-17
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#else
@@ -52,8 +51,6 @@
#include "SaveLoadScreen.h"
#endif
// WANNE 2
#define MAP_BOTTOM_X 0
#define MAP_BOTTOM_Y (SCREEN_HEIGHT - 121) //359
@@ -282,11 +279,8 @@ void RenderMapScreenInterfaceBottom( void )
HVOBJECT hHandle;
CHAR8 bFilename[ 32 ];
// WANNE 2
fDisplayOverheadMap = FALSE;
// WANNE 2 <redraw>
// render whole panel
if( fMapScreenBottomDirty == TRUE )
{
@@ -312,7 +306,6 @@ void RenderMapScreenInterfaceBottom( void )
// dirty buttons
MarkButtonsDirty( );
// WANNE 2
// invalidate region
RestoreExternBackgroundRect( MAP_BOTTOM_X, MAP_BOTTOM_Y, SCREEN_WIDTH, SCREEN_HEIGHT - MAP_BOTTOM_Y );
@@ -593,7 +586,6 @@ void DrawNameOfLoadedSector( void )
GetSectorIDString( sSelMapX, sSelMapY, ( INT8 )( iCurrentMapSectorZ ),sString, TRUE );
ReduceStringLength( sString, 80, COMPFONT );
// WANNE 2
//VarFindFontCenterCoordinates( 548, 426, 80, 16, COMPFONT, &sFontX, &sFontY, sString );
VarFindFontCenterCoordinates( (SCREEN_WIDTH - 92), (SCREEN_HEIGHT - 55), 80, 16, COMPFONT, &sFontX, &sFontY, sString );
mprintf( sFontX, sFontY, L"%s", sString );
@@ -939,7 +931,6 @@ void DisplayCompressMode( void )
}
//RestoreExternBackgroundRect( 489, 456, 522 - 489, 467 - 454 );
// WANNE 2
RestoreExternBackgroundRect( (SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 63, 13 );
SetFontDestBuffer( FRAME_BUFFER, 0,0,SCREEN_WIDTH,SCREEN_HEIGHT, FALSE );
@@ -967,7 +958,6 @@ void DisplayCompressMode( void )
SetFontForeground( usColor );
SetFontBackground( FONT_BLACK );
// WANNE 2
//FindFontCenterCoordinates( 489, 456, 522 - 489, 467 - 454, sString, COMPFONT, &sX, &sY );
FindFontCenterCoordinates( (SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 33, 13, sString, COMPFONT, &sX, &sY );
mprintf( sX, sY, sString );
@@ -982,7 +972,6 @@ void CreateCompressModePause( void )
/*MSYS_DefineRegion( &gMapPauseRegion, 487, 456, 522, 467, MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressModeClickCallback );*/
// WANNE 2
MSYS_DefineRegion( &gMapPauseRegion, (SCREEN_WIDTH - 153), (SCREEN_HEIGHT - 24), (SCREEN_WIDTH - 118), (SCREEN_HEIGHT - 13), MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressModeClickCallback );
@@ -1399,7 +1388,6 @@ void DisplayCurrentBalanceTitleForMapBottom( void )
swprintf( sString, L"%s", pMapScreenBottomText[ 0 ] );
// WANNE 2
// center it
VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 107), 78, 10, COMPFONT, &sFontX, &sFontY, sString );
//VarFindFontCenterCoordinates( 359, 387 - 14, 437 - 359, 10, COMPFONT, &sFontX, &sFontY, sString );
@@ -1409,7 +1397,6 @@ void DisplayCurrentBalanceTitleForMapBottom( void )
swprintf( sString, L"%s", zMarksMapScreenText[ 2 ] );
// WANNE 2
// center it
//VarFindFontCenterCoordinates( 359, 433 - 14, 437 - 359, 10, COMPFONT, &sFontX, &sFontY, sString );
VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 61), 78, 10, COMPFONT, &sFontX, &sFontY, sString );
@@ -1443,7 +1430,6 @@ void DisplayCurrentBalanceForMapBottom( void )
InsertCommasForDollarFigure( sString );
InsertDollarSignInToString( sString );
// WANNE 2
// center it
VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 91), 78, 10, COMPFONT, &sFontX, &sFontY, sString );
@@ -1486,7 +1472,6 @@ void CreateDestroyMouseRegionMasksForTimeCompressionButtons( void )
//MSYS_DefineRegion( &gTimeCompressionMask[ 2 ], 487, 456, 522, 467, MSYS_PRIORITY_HIGHEST - 1,
// MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressMaskClickCallback );
// WANNE 2
// mask over compress more button
MSYS_DefineRegion( &gTimeCompressionMask[ 0 ], (SCREEN_WIDTH - 112), (SCREEN_HEIGHT - 24), (SCREEN_WIDTH - 112) + 13, (SCREEN_HEIGHT - 24) + 14, MSYS_PRIORITY_HIGHEST - 1,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressMaskClickCallback );
@@ -1557,7 +1542,6 @@ void DisplayProjectedDailyMineIncome( void )
InsertDollarSignInToString( sString );
// center it
// WANNE 2
VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 45), 78, 10, COMPFONT, &sFontX, &sFontY, sString );
// print it
@@ -1768,7 +1752,6 @@ void HandleExitsFromMapScreen( void )
if( gfExtraBuffer )
{ //Then initiate the transition animation from the mapscreen to laptop...
// WANNE 2
BlitBufferToBuffer( FRAME_BUFFER, guiEXTRABUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
gfStartMapScreenToLaptopTransition = TRUE;
}
Strategic/Map Screen Interface Map Inventory.cpp
-13
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "GameSettings.h"
@@ -40,7 +39,6 @@
extern BOOLEAN SaveWorldItemsToTempItemFile( INT16 sMapX, INT16 sMapY, INT8 bMapZ, UINT32 uiNumberOfItems, WORLDITEM *pData );
// WANNE 2
#define MAP_INV_X_OFFSET (((SCREEN_WIDTH - 261) - 380) / 2)
//#define MAP_INV_Y_OFFSET (((SCREEN_HEIGHT - 121) -
@@ -92,7 +90,6 @@ extern BOOLEAN SaveWorldItemsToTempItemFile( INT16 sMapX, INT16 sMapY, INT8 bMap
#define MAP_INVEN_SLOT_HEIGHT 32
#define MAP_INVEN_SLOT_IMAGE_HEIGHT 24
// WANNE 2
// Number of inventory slots in 1024x768
#define MAP_INVENTORY_POOL_MAX_SLOTS 170
@@ -129,7 +126,6 @@ UINT32 uiNumberOfUnSeenItems = 0;
// the inventory slots
// WANNE 2 <new>
//MOUSE_REGION MapInventoryPoolSlots[ MAP_INVENTORY_POOL_SLOT_COUNT ];
MOUSE_REGION MapInventoryPoolSlots[ MAP_INVENTORY_POOL_MAX_SLOTS ];
@@ -230,7 +226,6 @@ BOOLEAN LoadInventoryPoolGraphic( void )
// load the file
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
// WANNE 2
if (iResolution == 0)
{
MAP_INV_SLOT_COLS = 8;
@@ -313,7 +308,6 @@ void BlitInventoryPoolGraphic( void )
// which buttons will be active and which ones not
HandleButtonStatesWhileMapInventoryActive( );
// WANNE 2
// Invalidate
RestoreExternBackgroundRect(MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT - 121);
@@ -731,11 +725,6 @@ void CreateMapInventoryPoolSlots( void )
INT16 sULX = 0, sULY = 0;
INT16 sBRX = 0, sBRY = 0;
// WANNE 2
//MSYS_DefineRegion( &MapInventoryPoolMask,
// MAP_INVENTORY_POOL_SLOT_START_X, 0, 640, 360,
// MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MapInvenPoolScreenMaskCallback);
MSYS_DefineRegion( &MapInventoryPoolMask,
MAP_INVENTORY_POOL_SLOT_START_X, 0, SCREEN_WIDTH - MAP_INVENTORY_POOL_SLOT_START_X, SCREEN_HEIGHT - 120,
MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MapInvenPoolScreenMaskCallback);
@@ -1835,7 +1824,6 @@ void DrawNumberOfIventoryPoolItems( void )
void CreateMapInventoryPoolDoneButton( void )
{
// WANNE 2
// create done button
guiMapInvenButtonImage[ 2 ]= LoadButtonImage( "INTERFACE\\done_button.sti" , -1, 0, -1, 1, -1 );
guiMapInvenButton[ 2 ] = QuickCreateButton( guiMapInvenButtonImage[ 2 ], MAP_INV_X_OFFSET + 587 , (SCREEN_HEIGHT - 147),
@@ -1923,7 +1911,6 @@ void DrawTextOnMapInventoryBackground( void )
//usStringHeight = DisplayWrappedString( 369, 342, 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
//DisplayWrappedString( 369, (UINT16)(342 - (usStringHeight / 2) ), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );
// WANNE 2
//Calculate the height of the string, as it needs to be vertically centered.
usStringHeight = DisplayWrappedString( MAP_INV_X_OFFSET + 268, (SCREEN_HEIGHT - 138), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
DisplayWrappedString( MAP_INV_X_OFFSET + 268, (UINT16)((SCREEN_HEIGHT - 138) - (usStringHeight / 2) ), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );
Strategic/Map Screen Interface Map.cpp
+2 -16
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "GameSettings.h"
@@ -83,7 +82,6 @@ INT32 iZoomY = 0;
#define MAP_HELICOPTER_ETA_POPUP_WIDTH 120
#define MAP_HELICOPTER_ETA_POPUP_HEIGHT 68
// WANNE 2
#define MAP_LEVEL_STRING_X (SCREEN_WIDTH - 208) //432
#define MAP_LEVEL_STRING_Y (SCREEN_HEIGHT - 175) //305
@@ -99,9 +97,8 @@ INT32 iZoomY = 0;
//Map Location index regions
// WANNE 2 <change THIS>
// WANNE 2 (The numbers above the map)
// WANNE: The numbers above the map
// x start of hort index
#define MAP_HORT_INDEX_X (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 31)//(SCREEN_WIDTH - 348) //292
// y position of hort index
@@ -110,7 +107,7 @@ INT32 iZoomY = 0;
#define MAP_HORT_HEIGHT GetFontHeight(MAP_FONT)
// WANNE 2 (the letters on the left side of the map)
// WANNE: The letters on the left side of the map)
// vert index start x
#define MAP_VERT_INDEX_X (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 13) //(SCREEN_WIDTH - 367) // 273
// vert index start y
@@ -422,7 +419,6 @@ INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
extern BOOLEAN fSamSiteFoundOrig[ MAX_NUMBER_OF_SAMS ];
// WANNE 2 (reinitialization in "DrawMap()")
// map region
SGPRect MapScreenRect={ (MAP_VIEW_START_X+MAP_GRID_X - 2), ( MAP_VIEW_START_Y+MAP_GRID_Y - 1), MAP_VIEW_START_X + MAP_VIEW_WIDTH - 1 + MAP_GRID_X , MAP_VIEW_START_Y+MAP_VIEW_HEIGHT-10+MAP_GRID_Y};
@@ -689,7 +685,6 @@ UINT32 DrawMap( void )
INT16 cnt, cnt2;
INT32 iCounter = 0;
// WANNE 2 <initialization>
//MAP_VIEW_START_X = (SCREEN_WIDTH - 370);
//MAP_VIEW_START_Y = 10;
@@ -899,7 +894,6 @@ UINT32 DrawMap( void )
DisplayLevelString( );
// WANNE 2 <incommented>
RestoreClipRegionToFullScreen( );
return( TRUE );
@@ -3984,7 +3978,6 @@ void RestoreClipRegionToFullScreenForRectangle( UINT32 uiDestPitchBYTES )
// clip blits to map view region
//SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, 640, 480 );
// WANNE 2
SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
return;
@@ -4495,7 +4488,6 @@ void DisplayPositionOfHelicopter( void )
}
*/
// WANNE 2
AssertMsg( ( minX >= 0 ) && ( minX < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid minX = %d", minX ) );
AssertMsg( ( maxX >= 0 ) && ( maxX < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid maxX = %d", maxX ) );
AssertMsg( ( minY >= 0 ) && ( minY < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid minY = %d", minY ) );
@@ -4518,8 +4510,6 @@ void DisplayPositionOfHelicopter( void )
y += 3;
}
// WANNE 2
AssertMsg( ( x >= 0 ) && ( x < (UINT32)SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid x = %d. At %d,%d. Next %d,%d. Min/Max X = %d/%d",
x, pGroup->ubSectorX, pGroup->ubSectorY, pGroup->ubNextX, pGroup->ubNextY, minX, maxX ) );
@@ -4565,8 +4555,6 @@ void DisplayDestinationOfHelicopter( void )
UINT32 x,y;
HVOBJECT hHandle;
// WANNE 2
AssertMsg( ( sOldMapX >= 0 ) && ( sOldMapX < SCREEN_WIDTH ), String( "DisplayDestinationOfHelicopter: Invalid sOldMapX = %d", sOldMapX ) );
AssertMsg( ( sOldMapY >= 0 ) && ( sOldMapY < SCREEN_HEIGHT ), String( "DisplayDestinationOfHelicopter: Invalid sOldMapY = %d", sOldMapY ) );
@@ -4588,7 +4576,6 @@ void DisplayDestinationOfHelicopter( void )
x = MAP_VIEW_START_X + ( MAP_GRID_X * sMapX ) + 1;
y = MAP_VIEW_START_Y + ( MAP_GRID_Y * sMapY ) + 3;
// WANNE 2
AssertMsg( ( x >= 0 ) && ( x < (UINT32)SCREEN_WIDTH ), String( "DisplayDestinationOfHelicopter: Invalid x = %d. Dest %d,%d", x, sMapX, sMapY ) );
AssertMsg( ( y >= 0 ) && ( y < (UINT32)SCREEN_HEIGHT ), String( "DisplayDestinationOfHelicopter: Invalid y = %d. Dest %d,%d", y, sMapX, sMapY ) );
@@ -5034,7 +5021,6 @@ void DisplayLevelString( void )
SetFontBackground( FONT_BLACK );
swprintf( sString, L"%s %d", sMapLevelString[ 0 ], iCurrentMapSectorZ );
// WANNE 2
mprintf( MAP_LEVEL_STRING_X, MAP_LEVEL_STRING_Y, sString );
SetFontDestBuffer( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
Strategic/Map Screen Interface.cpp
-9
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#else
@@ -66,7 +65,6 @@
// number of LINKED LISTS for sets of leave items (each slot holds an unlimited # of items)
#define NUM_LEAVE_LIST_SLOTS 20
// WANNE 2 <change 2>
#define SELECTED_CHAR_ARROW_X 1 //8
#define SIZE_OF_UPDATE_BOX 20
@@ -107,7 +105,6 @@ enum{
OTHER_REGION,
};
// WANNE 2
UINT16 usVehicleY = 0;
// waiting list for update box
@@ -1174,7 +1171,6 @@ INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExit
INT32 DoMapMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback )
{
// WANNE 2
SGPRect CenteringRect= {0, 0, SCREEN_WIDTH, INV_INTERFACE_START_Y };
// reset the highlighted line
@@ -1330,7 +1326,6 @@ void HandleDisplayOfSelectedMercArrows( void )
if( bSelectedInfoChar >= FIRST_VEHICLE )
{
// WANNE 2 <fixed>
usVehicleCount = bSelectedInfoChar - FIRST_VEHICLE;
sYPosition = usVehicleY+( usVehicleCount * ( Y_SIZE + 2) ) - 1;;
}
@@ -1352,7 +1347,6 @@ void HandleDisplayOfSelectedMercArrows( void )
if( ubCount >= FIRST_VEHICLE )
{
// WANNE 2 <fixed>
usVehicleCount = ubCount - FIRST_VEHICLE;
sYPosition = usVehicleY+( usVehicleCount * ( Y_SIZE + 2) ) - 1;;
}
@@ -4939,7 +4933,6 @@ void DisplaySoldierUpdateBox( )
iUpdatePanelHeight = ( iNumberHigh + 1 ) * TACT_HEIGHT_OF_UPDATE_PANEL_BLOCKS;
// WANNE 2
iX = (MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2)) - (iUpdatePanelWidth / 2);
iY = (MAP_BORDER_Y + ((SCREEN_HEIGHT - 121) / 2)) - (iUpdatePanelHeight / 2);
@@ -5040,7 +5033,6 @@ void DisplaySoldierUpdateBox( )
}
// WANNE 2
//Display the reason for the update box
if( fFourWideMode )
{
@@ -5064,7 +5056,6 @@ void DisplaySoldierUpdateBox( )
}
// WANNE 2
void CreateDestroyUpdatePanelButtons(INT32 iX, INT32 iY, BOOLEAN fFourWideMode )
{
static BOOLEAN fCreated = FALSE;
Strategic/Quest Debug System.cpp
-1
View File
@@ -1241,7 +1241,6 @@ void RenderQuestDebugSystem()
MarkButtonsDirty( );
// WANNE NEW:
//InvalidateRegion( 0, 0, 640, 480 );
InvalidateRegion( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
}
Strategic/Strategic AI.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "GameSettings.h"
@@ -780,7 +779,6 @@ void ValidateGroup( GROUP *pGroup )
INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic2");
// WANNE 2
if (pGroup == NULL)
{
return;
Strategic/mapscreen.cpp
+16 -43
View File
@@ -1,4 +1,4 @@
// WANNE 2 <changed some lines> SCROLL BUTTONS CODE IS OUTCOMMENTED (search for // WANNE 2 <scroll>)
// WANNE: SCROLL BUTTONS CODE IS OUTCOMMENTED (search for // WANNE: <scroll>)
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "HelpScreen.h"
@@ -201,7 +201,6 @@
#define INV_BODY_X 71
#define INV_BODY_Y 116
// WANNE 2 <change 2>
#define NAME_X 4
#define NAME_WIDTH 55 - NAME_X
@@ -216,13 +215,11 @@
#define TIME_REMAINING_X 215
#define TIME_REMAINING_WIDTH 243 - TIME_REMAINING_X
// WANNE 2
#define CLOCK_Y_START (MAP_BORDER_Y_OFFSET + 298) // 298
#define DEST_PLOT_X (MAP_BORDER_X_OFFSET + 463) //463
#define DEST_PLOT_Y (MAP_BORDER_Y_OFFSET + 345) //345
// WANNE 2
#define CLOCK_ETA_X (MAP_BORDER_X_OFFSET + 484) //463 - 15 + 6 + 30
#define CLOCK_HOUR_X_START (MAP_BORDER_X_OFFSET + 518) //463 + 25 + 30
#define CLOCK_MIN_X_START (MAP_BORDER_X_OFFSET + 538) //463 + 45 + 30
@@ -334,7 +331,7 @@
//#define TM_INV_WIDTH 58
//#define TM_INV_HEIGHT 23
// WANNE 2 (the position of the clock in the strategy screen)
// WANNE: The position of the clock in the strategy screen
//#define CLOCK_X (SCREEN_WIDTH - 86) //554
//#define CLOCK_Y (SCREEN_HEIGHT - 21) //459
@@ -456,7 +453,6 @@ RGBCOLOR GlowColorsC[]={
// {223,125},
//};
// WANNE 2 <change 2>
SGPPoint gMapSortButtons[ MAX_SORT_METHODS ]={
{5,113},
{61,113},
@@ -497,7 +493,7 @@ INV_REGION_DESC gSCamoXY =
};
// WANNE 2 <scroll>
// WANNE: <scroll>
// buttons images
//UINT32 guiMapMercsScrollButtonsImage[ 2 ];
//UINT32 guiMapMercsScrollButtons[ 2 ];
@@ -509,7 +505,7 @@ INV_REGION_DESC gSCamoXY =
extern UINT16 usVehicleY;
// WANNE 2 <scroll>
// WANNE: <scroll>
// button enums
//enum{
// MAP_SCROLL_MERCS_UP =0,
@@ -524,7 +520,7 @@ extern UINT16 usVehicleY;
// GLOBAL VARIABLES (OURS)
// WANNE 2 <scroll>
// WANNE: <scroll>
//void CreateButtonsForScrolling(void);
//void DeleteButtonsForScrolling(void);
@@ -1227,7 +1223,6 @@ void ContractListRegionBoxGlow( UINT16 usCount )
iColorNum--;
// WANNE 2
if( usCount >= FIRST_VEHICLE )
{
usVehicleCount = usCount - FIRST_VEHICLE;
@@ -1243,7 +1238,6 @@ void ContractListRegionBoxGlow( UINT16 usCount )
// y start position of box
//usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE) + sYAdd );
// WANNE 2 <this is not correct!!>
//usY=(Y_OFFSET*usCount-1)+(sYStart+(usCount*Y_SIZE));
// glow contract box
@@ -2525,7 +2519,6 @@ void DisplayGroundEta( void )
SetFontForeground( FONT_LTGREEN );
SetFontBackground( FONT_BLACK );
// WANNE 2 <change ETA position>
mprintf( CLOCK_ETA_X, CLOCK_Y_START, pEtaString[ 0 ] );
// if less than one day
@@ -2601,7 +2594,6 @@ void HighLightAssignLine()
//usY=Y_START+(giHighLine*GetFontHeight((MAP_SCREEN_FONT)));
usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
// WANNE 2
if( usCount >= FIRST_VEHICLE )
{
usVehicleCount = usCount - FIRST_VEHICLE;
@@ -2685,7 +2677,6 @@ void HighLightDestLine()
usX=DEST_ETA_X-4;
usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
// WANNE 2
if( usCount >= FIRST_VEHICLE )
{
usVehicleCont = usCount - FIRST_VEHICLE;
@@ -2775,7 +2766,6 @@ void HighLightSleepLine()
usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
// WANNE 2
if( usCount >= FIRST_VEHICLE )
{
usVehicleCount = usCount - FIRST_VEHICLE;
@@ -3121,7 +3111,7 @@ UINT32 MapScreenHandle(void)
return( MAP_SCREEN );
}
// WANNE 2 <scroll>
// WANNE: <scroll>
/*if (fShowInventoryFlag == TRUE)
{
DeleteButtonsForScrolling();
@@ -3250,7 +3240,6 @@ UINT32 MapScreenHandle(void)
/*strcpy(vs_desc.ImageFile, "INTERFACE\\playlist3.pcx");
CHECKF(AddVideoSurface( &vs_desc, &guiCHARLIST ));*/
// WANNE 2
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
if (iResolution == 0)
{
@@ -3480,8 +3469,6 @@ UINT32 MapScreenHandle(void)
// create mouse region for pause clock
CreateMouseRegionForPauseOfClock( CLOCK_REGION_START_X, CLOCK_REGION_START_Y );
// WANNE 2
if (iResolution == 0)
{
usVehicleY = 319;
@@ -3924,7 +3911,7 @@ UINT32 MapScreenHandle(void)
RenderItemDescriptionBox( );
// render clock
// WANNE 2 <renders the clock in the strategy screen>
// WANNE: Renders the clock in the strategy screen
RenderClock(CLOCK_X, CLOCK_Y);
#ifdef JA2TESTVERSION
@@ -4308,8 +4295,6 @@ void SetClockMin(STR16 pStringA, ...)
mprintf( CLOCK_MIN_X_START-5, CLOCK_Y_START, String );
}
// WANNE 2 <change 2>
void DrawName(STR16 pName, INT16 sRowIndex, INT32 iFont)
{
INT16 usX=0;
@@ -4348,7 +4333,6 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
}
else
{
// WANNE 2
sRowIndex = sRowIndex - FIRST_VEHICLE;
//FindFontCenterCoordinates((short)ASSIGN_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6), (short)ASSIGN_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
FindFontCenterCoordinates((short)ASSIGN_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)ASSIGN_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4382,7 +4366,6 @@ void DrawLocation(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
}
else
{
// WANNE 2
//FindFontCenterCoordinates((short)LOC_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6), (short)LOC_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
sRowIndex = sRowIndex - FIRST_VEHICLE;
FindFontCenterCoordinates((short)LOC_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)LOC_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4414,7 +4397,6 @@ void DrawDestination(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
}
else
{
// WANNE 2
sRowIndex = sRowIndex - FIRST_VEHICLE;
//FindFontCenterCoordinates((short)DEST_ETA_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6 ), (short)DEST_ETA_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
FindFontCenterCoordinates((short)DEST_ETA_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)DEST_ETA_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4450,7 +4432,6 @@ void DrawTimeRemaining( INT16 sCharNumber, INT32 iFont, UINT8 ubFontColor )
}
else
{
// WANNE 2
sCharNumber = sCharNumber - FIRST_VEHICLE;
//FindFontCenterCoordinates((short)TIME_REMAINING_X + 1, (short)(Y_START+(sCharNumber*Y_SIZE) + 6 ), (short)TIME_REMAINING_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
FindFontCenterCoordinates((short)TIME_REMAINING_X + 1, (short)(usVehicleY+(sCharNumber*Y_SIZE)), (short)TIME_REMAINING_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -6096,7 +6077,7 @@ void EndMapScreen( BOOLEAN fDuringFade )
DeleteMouseRegionsForLevelMarkers( );
// WANNE 2 <scroll>
// WANNE: <scroll>
//DeleteButtonsForScrolling();
if( fShowMapInventoryPool == FALSE )
@@ -7566,7 +7547,7 @@ void BlitBackgroundToSaveBuffer( void )
}
else if( gfPreBattleInterfaceActive )
{
// WANNE 2 <scroll>
// WANNE: <scroll>
//DeleteButtonsForScrolling();
ForceButtonUnDirty( giMapContractButton );
@@ -7579,7 +7560,6 @@ void BlitBackgroundToSaveBuffer( void )
RenderMapScreenInterfaceBottom( );
}
// WANNE 2
void CreateMouseRegionsForTeamList( void )
{
// will create mouse regions for assignments, path plotting, character info selection
@@ -7606,7 +7586,6 @@ void CreateMouseRegionsForTeamList( void )
//sYAdd = 0;
}
// WANNE 2
// name region
MSYS_DefineRegion( &gTeamListNameRegion[ sCounter ] , NAME_X, ( INT16 )( sYStart + ( sOffsetCounter ) * ( Y_SIZE + 2 )), NAME_X + NAME_WIDTH, ( INT16 )( (sYStart + 10) + ( sOffsetCounter + 1 ) * ( Y_SIZE + 2 )), MSYS_PRIORITY_NORMAL,
MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack );
@@ -8683,7 +8662,6 @@ void RenderMapRegionBackground( void )
MapscreenMarkButtonsDirty();
// WANNE 2
//RestoreExternBackgroundRect( 261, 0, 379, 359 );
RestoreExternBackgroundRect( 261, 0, SCREEN_WIDTH - 261, SCREEN_HEIGHT - 121 );
@@ -8757,7 +8735,6 @@ void RenderTeamRegionBackground( void )
// restore background for area
// WANNE 2
RestoreExternBackgroundRect( 0, 107, 261, SCREEN_HEIGHT - 106 - 121 );
MapscreenMarkButtonsDirty();
@@ -10379,7 +10356,6 @@ BOOLEAN HandlePreloadOfMapGraphics( void )
/*strcpy(vs_desc.ImageFile, "INTERFACE\\playlist3.pcx");
CHECKF(AddVideoSurface( &vs_desc, &guiCHARLIST ));*/
// WANNE 2
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
if (iResolution == 0)
{
@@ -10702,32 +10678,32 @@ void NextInventoryMapBtnCallback( GUI_BUTTON *btn, INT32 reason )
}
}
// WANNE 2 <scroll>
// WANNE: <scroll>
//void BtnMercsUpMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
//{
// // WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// // WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// int i = 10;
//}
//
//void BtnMercsDownMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
//{
// // WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// // WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// int i = 10;
//}
//
//void BtnVehicleUpMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
//{
// // WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// // WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// int i = 10;
//}
//
//void BtnVehicleDownMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
//{
// // WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// // WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
// int i = 10;
//}
// WANNE 2 <scroll>
// WANNE: <scroll>
//void DeleteButtonsForScrolling(void)
//{
// if (fScrollButtonsInitialized == TRUE)
@@ -10747,7 +10723,7 @@ void NextInventoryMapBtnCallback( GUI_BUTTON *btn, INT32 reason )
// }
//}
// WANNE 2 <scroll>
// WANNE: <scroll>
// Create the scrolling arrows
//void CreateButtonsForScrolling( void )
//{
@@ -11380,7 +11356,6 @@ void DisplayIconsForMercsAsleep( void )
pSoldier = MercPtrs[ gCharactersList[ iCounter ].usSolID ];
if( pSoldier->bActive && pSoldier->fMercAsleep && CanChangeSleepStatusForSoldier( pSoldier ) )
{
// WANNE 2
//BltVideoObject( guiSAVEBUFFER , hHandle, 0, 125, ( INT16 )( Y_START+(iCounter * ( Y_SIZE + 2 ) ) ) , VO_BLT_SRCTRANSPARENCY,NULL );
BltVideoObject( guiSAVEBUFFER , hHandle, 0, SLEEP_X + 2, ( INT16 )( Y_START+(iCounter * ( Y_SIZE + 2 ) ) ) , VO_BLT_SRCTRANSPARENCY,NULL );
}
@@ -11398,7 +11373,6 @@ void CheckForAndRenderNewMailOverlay()
{
if( GetJA2Clock() % 1000 < 667 )
{
// WANNE 2
if( ButtonList[ guiMapBottomExitButtons[ MAP_EXIT_TO_LAPTOP ] ]->uiFlags & BUTTON_CLICKED_ON )
{ //button is down, so offset the icon
//BltVideoObjectFromIndex( FRAME_BUFFER, guiNewMailIcons, 1, 465, 418, VO_BLT_SRCTRANSPARENCY, NULL );
@@ -11406,7 +11380,6 @@ void CheckForAndRenderNewMailOverlay()
//InvalidateRegion( 465, 418, 480, 428 );
InvalidateRegion( (SCREEN_WIDTH - 175), (SCREEN_HEIGHT - 62), (SCREEN_WIDTH - 160), (SCREEN_HEIGHT - 52 ));
}
// WANNE 2
else
{ //button is up, so draw the icon normally
//BltVideoObjectFromIndex( FRAME_BUFFER, guiNewMailIcons, 0, 464, 417, VO_BLT_SRCTRANSPARENCY, NULL );
Strategic/strategicmap.cpp
+1 -2
View File
@@ -1,6 +1,5 @@
#include "builddefines.h"
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Strategic All.h"
#include "Loading Screen.h"
@@ -1232,7 +1231,7 @@ UINT32 UndergroundTacticalTraversalTime( INT8 bExitDirection )
return 0xffffffff;
}
// WANNE 2 <zooming>
// WANNE: Zooming Animation of the laptop in strategic screen
void BeginLoadScreen( void )
{
SGPRect SrcRect, DstRect;
Tactical/Animation Control.cpp
-1
View File
@@ -3619,7 +3619,6 @@ UINT16 GetSoldierAnimationSurface( SOLDIERTYPE *pSoldier, UINT16 usAnimState )
if ( usAnimSurface != INVALID_ANIMATION_SURFACE )
{
// WANNE NEW 2
// Ensure that it's loaded!
if ( gAnimSurfaceDatabase[ usAnimSurface ].hVideoObject == NULL )
{
Tactical/Auto Bandage.cpp
-3
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -431,7 +430,6 @@ void AutoBandage( BOOLEAN fStart )
giBoxId = PrepareMercPopupBox( -1, DIALOG_MERC_POPUP_BACKGROUND, DIALOG_MERC_POPUP_BORDER, sAutoBandageString, 200, 40, 10, 30, &gusTextBoxWidth, &gusTextBoxHeight );
}
// WANNE 2
aRect.iTop = 0;
aRect.iLeft = 0;
aRect.iBottom = INV_INTERFACE_START_Y;
@@ -727,7 +725,6 @@ void DisplayAutoBandageUpdatePanel( void )
iTotalPixelsWide = TACT_UPDATE_MERC_FACE_X_WIDTH * iNumberDoctorsWide;
// WANNE 2
// now get the x and y position for the box
sXPosition = ( SCREEN_WIDTH - iTotalPixelsWide ) / 2;
sYPosition = ( INV_INTERFACE_START_Y - iTotalPixelsHigh ) / 2;
Tactical/Campaign.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -76,7 +75,6 @@ UINT16 CountSurfaceSectorsVisited( void );
// give pSoldier usNumChances to improve ubStat. If it's from training, it doesn't count towards experience level gain
void StatChange(SOLDIERTYPE *pSoldier, UINT8 ubStat, UINT16 usNumChances, UINT8 ubReason)
{
// WANNE 2
if (pSoldier == NULL || pSoldier->bActive == FALSE)
return; // THIS SHOULD NEVER HAPPEN
Tactical/Civ Quotes.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
Tactical/Dialogue Control.cpp
-8
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
@@ -2011,7 +2010,6 @@ void ExecuteTacticalTextBox( INT16 sLeftPosition, STR16 pString )
// check if mouse region created, if so, do not recreate
// WANNE 2
if( fTextBoxMouseRegionCreated == TRUE )
{
return;
@@ -2038,12 +2036,6 @@ void ExecuteTacticalTextBox( INT16 sLeftPosition, STR16 pString )
gsTopPosition = 20;
// WANNE 2
//if( fTextBoxMouseRegionCreated == TRUE )
//{
// return;
//}
//Define main region
MSYS_DefineRegion( &gTextBoxMouseRegion, VideoOverlayDesc.sLeft, VideoOverlayDesc.sTop, VideoOverlayDesc.sRight, VideoOverlayDesc.sBottom, MSYS_PRIORITY_HIGHEST,
CURSOR_NORMAL, MSYS_NO_CALLBACK, TextOverlayClickCallback );
Tactical/Handle UI.cpp
+1 -1
View File
@@ -3983,7 +3983,7 @@ INT8 DrawUIMovementPath( SOLDIERTYPE *pSoldier, UINT16 usMapPos, UINT32 uiFlags
{
sAPCost += MinAPsToAttack( pSoldier, sAdjustedGridNo, TRUE );
// WANNE: Turn around APs were missing!
// WANNE: Turn around APs were missing, I think ....
//sAPCost += APsToTurnAround(pSoldier, sAdjustedGridNo);
sAPCost += UIPlotPath( pSoldier, sGotLocation, NO_COPYROUTE, fPlot, TEMPORARY, (UINT16)pSoldier->usUIMovementMode, NOT_STEALTH, FORWARD, pSoldier->bActionPoints);
Tactical/Interface Dialogue.cpp
-4
View File
@@ -4375,10 +4375,6 @@ BOOLEAN PlayerTeamHasTwoSpotsLeft( )
}
}
// WANNE
//if ( uiCount <= (UINT32) (gTacticalStatus.Team[ gbPlayerNum ].bLastID - 2) - 2 )
//if ( uiCount <= (18 - 2) )
if ( uiCount <= (UINT32) (gTacticalStatus.Team[ gbPlayerNum].bLastID - 2) - 1 )
{
return( TRUE );
Tactical/Interface Items.cpp
-5
View File
@@ -2440,8 +2440,6 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
FilenameForBPP("INTERFACE\\infobox.sti", ubString);
sForeColour = ITEMDESC_AMMO_FORE;
// TODO: WANNE: Make own sti for the ammo types and an own for the interface
// For now, they are together in interface\infobox.sti
giItemDescAmmoButtonImages = LoadButtonImage(ubString,AmmoTypes[pObject->ubGunAmmoType].grayed,AmmoTypes[pObject->ubGunAmmoType].offNormal,-1,AmmoTypes[pObject->ubGunAmmoType].onNormal,-1 );
//switch( pObject->ubGunAmmoType )
@@ -8041,7 +8039,6 @@ BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOppo
}
// CHECK FOR LEFT/RIGHT
// WANNE 2
if ( ( sX + gItemPickupMenu.sWidth ) > SCREEN_WIDTH )
{
sX = SCREEN_WIDTH - gItemPickupMenu.sWidth - ITEMPICK_START_X_OFFSET;
@@ -8063,7 +8060,6 @@ BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOppo
}
// Check for bottom
// WANNE 2
if ( ( sY + gItemPickupMenu.sHeight ) > (SCREEN_HEIGHT - INV_INTERFACE_HEIGHT) )
{
sY = (SCREEN_HEIGHT - INV_INTERFACE_HEIGHT) - gItemPickupMenu.sHeight;
@@ -8095,7 +8091,6 @@ BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOppo
/*MSYS_DefineRegion( &(gItemPickupMenu.BackRegion ), (INT16)( 532 ), (INT16)( 367 ), (INT16)( 640 ),(INT16)( 480 ), MSYS_PRIORITY_HIGHEST,
CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); */
// WANNE 2
// Build a mouse region here that is over any others.....
MSYS_DefineRegion( &(gItemPickupMenu.BackRegion ), (INT16)( iScreenWidthOffset + 532 ), (INT16)( iScreenHeightOffset + 367 ), (INT16)( SCREEN_WIDTH ),(INT16)( SCREEN_HEIGHT ), MSYS_PRIORITY_HIGHEST,
CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
Tactical/Interface Panels.cpp
-7
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -1323,7 +1322,6 @@ BOOLEAN InitializeSMPanelCoords( )
SM_STEALTHMODE_X = ( 187 + INTERFACE_START_X );
SM_STEALTHMODE_Y = ( 73 + INV_INTERFACE_START_Y );
// WANNE 2
SM_DONE_X = (SCREEN_WIDTH - 97);//( 543 + INTERFACE_START_X );
SM_DONE_Y = ( 4 + INV_INTERFACE_START_Y );
SM_MAPSCREEN_X = (SCREEN_WIDTH - 51);//( 589 + INTERFACE_START_X );
@@ -3496,7 +3494,6 @@ void BtnPositionShowCallback(GUI_BUTTON *btn,INT32 reason)
}
// WANNE 2
BOOLEAN InitializeTEAMPanelCoords( )
{
@@ -3505,7 +3502,6 @@ BOOLEAN InitializeTEAMPanelCoords( )
TM_APPANEL_HEIGHT = 56;
TM_APPANEL_WIDTH = 16;
// WANNE 2
TM_ENDTURN_X = (SCREEN_WIDTH - 133); //( 507 + INTERFACE_START_X );
TM_ENDTURN_Y = ( 9 + INTERFACE_START_Y );
TM_ROSTERMODE_X = (SCREEN_WIDTH - 133); //( 507 + INTERFACE_START_X );
@@ -3618,7 +3614,6 @@ BOOLEAN InitializeTEAMPanel( )
UINT32 cnt, posIndex;
static BOOLEAN fFirstTime = TRUE;
// WANNE 2
fDisplayOverheadMap = TRUE;
/* OK i need to initialize coords here
@@ -3800,7 +3795,6 @@ void RenderTEAMPanel( BOOLEAN fDirty )
SOLDIERTYPE *pSoldier;
static CHAR16 pStr[ 512 ], pMoraleStr[ 20 ];
// WANNE 2 <new>
if ( fDirty == DIRTYLEVEL2 )
{
MarkAButtonDirty( iTEAMPanelButtons[ TEAM_DONE_BUTTON ] );
@@ -3812,7 +3806,6 @@ void RenderTEAMPanel( BOOLEAN fDirty )
BltVideoObjectFromIndex( guiSAVEBUFFER, guiTEAMPanel, 0, INTERFACE_START_X, INTERFACE_START_Y, VO_BLT_SRCTRANSPARENCY, NULL );
RestoreExternBackgroundRect( INTERFACE_START_X, INTERFACE_START_Y, SCREEN_WIDTH - INTERFACE_START_X , INTERFACE_HEIGHT );
// WANNE 2 <new> <begin>
// LOOP THROUGH ALL MERCS ON TEAM PANEL
for ( cnt = 0, posIndex = 0; cnt < NUM_TEAM_SLOTS; cnt++, posIndex+= 2 )
{
Tactical/Inventory Choosing.cpp
+3 -5
View File
@@ -2181,7 +2181,7 @@ else
if ( gGameSettings.fOptions[TOPTION_DROP_ALL] )
{
// WANNE - "Drop all" should mean "Drop all"
// WANNE: "Drop all" should mean "Drop all"
/*
if ( Item[ pp->Inv[ i ].usItem ].usItemClass == IC_FACE )
{
@@ -2228,10 +2228,10 @@ else
// WANNE: Randomly choose which type of items should be dropped
if (gGameExternalOptions.ubEnemiesItemDrop == 0)
{
if( /*gGameSettings.fOptions[TOPTION_DROP_ALL] ||*/ Random(100) < ubAmmoDropRate )
if( Random(100) < ubAmmoDropRate )
fAmmo = TRUE;
if( /*gGameSettings.fOptions[TOPTION_DROP_ALL] ||*/ Random(100) < ubOtherDropRate )
if( Random(100) < ubOtherDropRate )
fWeapon = TRUE;
if( Random(100) < ubOtherDropRate )
@@ -3044,7 +3044,6 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
}
usItem = gArmyItemChoices[ typeIndex ].bItemNo[ uiChoice ];
// WANNE
pickItem = FALSE;
if (usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem))
@@ -3075,7 +3074,6 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
//Madd: quickfix: don't use NVGs during the day, and no sungoggles at night either
//if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 )))
// WANNE
if (pickItem == TRUE)
{
// pick a default item in case we don't find anything with a matching coolness, but pick the coolest item we can find
Tactical/Items.cpp
+1 -1
View File
@@ -7709,7 +7709,7 @@ void ApplyEquipmentBonuses(SOLDIERTYPE * pSoldier)
if ( pSoldier->bInSector)
CreateSoldierPalettes( pSoldier );
}
// WANNE: IRA: Madd, I commented this, because this leads to IRAs INVISIBLE BUG!
// WANNE: Madd, I commented this, because this leads to IRAs INVISIBLE BUG!
// We should only call the CreateSoldierPalettes if oldCamo != newCamo. See above!
//Madd: do this regardless of camo. This will need to be called to do custom part colours and new overlays anyway.
//if ( pSoldier->bInSector)
Tactical/PATHAI.cpp
-1
View File
@@ -1107,7 +1107,6 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo
}
}
}
// WANNE: - END
//how much is admission to the next tile
if ( gfPathAroundObstacles )
Tactical/Rain.cpp
-7
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -57,19 +56,14 @@
#include "Rain.h"
// WANNE 2
// Shop Keeper Interface
#define SKI_X_OFFSET (((SCREEN_WIDTH - 536) / 2))
#define SKI_Y_OFFSET ((((SCREEN_HEIGHT - 140) - 340) / 2))
// WANNE 2
// Overhead Map
#define OM_X_OFFSET 0
#define OM_Y_OFFSET 0
#define RAIN_UPDATE_RATE 60
#define PERCENT_OF_DROPS_GOING_TO_THE_EDGE_OF_SCREEN 0.25f
@@ -535,7 +529,6 @@ void RenderRain()
if( InOverheadMap() )
{
// WANNE 2
ColorFillVideoSurfaceArea( guiRainRenderSurface, OM_X_OFFSET, OM_Y_OFFSET, SCREEN_WIDTH, SCREEN_HEIGHT - 120, Get16BPPColor( FROMRGB( 0, 0, 0 ) ) );
return;
}
Tactical/ShopKeeper Interface.cpp
+4 -10
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -87,7 +86,6 @@ SKIRGBCOLOR SkiGlowColorsA[]={
//
///////////////////////////////////////////
// WANNE 2
#define SKI_INTERFACE_WIDTH 536
#define SKI_INTERFACE_HEIGHT 340
@@ -843,7 +841,6 @@ BOOLEAN EnterShopKeeperInterface()
//Clear out all the save background rects
EmptyBackgroundRects( );
// WANNE 2
ShadowVideoSurfaceRect( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - INV_INTERFACE_HEIGHT );
if( gfExitSKIDueToMessageBox )
@@ -1497,9 +1494,7 @@ void RestoreTacticalBackGround()
GetVideoSurface( &hDestVSurface, guiRENDERBUFFER );
GetVideoSurface( &hSrcVSurface, guiCornerWhereTacticalIsStillSeenImage );
// WANNE 2
// Top
SrcRect.iLeft = SKI_TACTICAL_BACKGROUND_START_X; //0;
SrcRect.iTop = SKI_TACTICAL_BACKGROUND_START_Y; //0;
@@ -1508,7 +1503,7 @@ void RestoreTacticalBackGround()
BltVSurfaceUsingDD( hDestVSurface, hSrcVSurface, VO_BLT_SRCTRANSPARENCY, SKI_TACTICAL_BACKGROUND_START_X, SKI_TACTICAL_BACKGROUND_START_Y, (RECT*)&SrcRect );
// WANNE 2
// WANNE: I think it is not used.
//InvalidateRegion( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
}
@@ -6364,7 +6359,6 @@ void InitShopKeeperItemDescBox( OBJECTTYPE *pObject, UINT8 ubPocket, UINT8 ubFro
sPosY = SKI_ARMS_DEALERS_INV_START_Y + ( ( SKI_INV_OFFSET_Y * ubSelectedInvSlot / SKI_NUM_ARMS_DEALERS_INV_COLS ) + 1 ) - ( 128 / 2 ) + SKI_INV_SLOT_HEIGHT / 2;
// WANNE 2
//if the start position + the height of the box is off the screen, reposition
if( sPosY < (0 + SCREEN_Y_OFFSET) )
sPosY = 0 + SCREEN_Y_OFFSET;
@@ -6435,7 +6429,7 @@ void StartSKIDescriptionBox( void )
//if the current merc is too far away, dont shade the SM panel because it is already shaded
// WANNE 2: Do not shade the background
// WANNE: Do not shade the background
if( gfSMDisableForItems )
DrawHatchOnInventory( FRAME_BUFFER, SCREEN_X_OFFSET, SCREEN_Y_OFFSET, SKI_INTERFACE_WIDTH, SKI_INTERFACE_HEIGHT );
else
@@ -7518,7 +7512,7 @@ void DelayRepairsInProgressBy( UINT32 uiMinutesDelayed )
//Mouse Call back for the Arms delaers face
void SelectArmsDealersDropItemToGroundRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
{
// WANNE 2: not needed to drop the item to the ground -> on the right side of the shopkeeper screen!
// WANNE: Not needed to drop the item to the ground -> on the right side of the shopkeeper screen!
/*
if (iReason & MSYS_CALLBACK_REASON_INIT)
{
@@ -7595,7 +7589,7 @@ void DisplayTheSkiDropItemToGroundString()
//get the height of the displayed text
usHeight = DisplayWrappedString( SKI_DROP_ITEM_TO_GROUND_START_X, SKI_DROP_ITEM_TO_GROUND_TEXT_START_Y, (UINT16)(SCREEN_WIDTH-SKI_DROP_ITEM_TO_GROUND_START_X), 2, SKI_LABEL_FONT, SKI_TITLE_COLOR, SKI_Text[ SKI_TEXT_DROP_ITEM_TO_GROUND ], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | DONT_DISPLAY_TEXT );
// WANNE 2 - not needed to show the string
// WANNE: Not needed to show the string
//display the 'drop item to ground' text
//DisplayWrappedString( SKI_DROP_ITEM_TO_GROUND_START_X, (UINT16)(SKI_DROP_ITEM_TO_GROUND_TEXT_START_Y-usHeight), (UINT16)(SCREEN_WIDTH-SKI_DROP_ITEM_TO_GROUND_START_X), 2, SKI_LABEL_FONT, SKI_TITLE_COLOR, SKI_Text[ SKI_TEXT_DROP_ITEM_TO_GROUND ], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | INVALIDATE_TEXT );
}
Tactical/SkillCheck.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
@@ -25,7 +24,6 @@ INT8 EffectiveStrength( SOLDIERTYPE * pSoldier )
// plus 1/2 strength scaled according to how hurt we are
bBandaged = pSoldier->bLifeMax - pSoldier->bLife - pSoldier->bBleeding;
// WANNE 2
if (pSoldier->bStrength > 0)
{
iEffStrength = pSoldier->bStrength / 2;
Tactical/Turn Based Input.cpp
+1 -2
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "Language Defines.h"
@@ -2833,7 +2832,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
case INSERT:
// WANNE 2: commented this out, because the interface panel is not correctly redrawn!
// WANNE: Commented this out, because the interface panel is not correctly redrawn!
// I do not know the bug ;(
//GoIntoOverheadMap();
break;
Tactical/UI Cursors.cpp
+4 -4
View File
@@ -314,7 +314,7 @@ UINT8 GetProperItemCursor( UINT8 ubSoldierID, UINT16 ubItemIndex, UINT16 usMapPo
}
// WANNE 4: Zeigt den Schusscursor, wenn dieser auf einem Gegner steht
// WANNE: Shows the target cursor over the enemy soldier
UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLEAN fShowAPs, BOOLEAN fRecalc, UINT32 uiCursorFlags )
{
UINT8 switchVal;
@@ -418,14 +418,14 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE
}
else
{
// WANNE 4: Wie oft erhöht?
// WANNE: How oft increased?
bFutureAim = (INT8)( pSoldier->bShownAimTime + 1 );
if ( bFutureAim <= maxAimLevels )
{
if (reverse == 0)
{
// WANNE 4: Aktuelle AP Kosten fürs ziehlen
// WANNE: Current AP costs for targeting
sAPCosts = MinAPsToAttack( pSoldier, usMapPos, TRUE ) + ( bFutureAim );
//gsCurrentActionPoints = sAPCosts;
@@ -951,7 +951,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE
// WANNE 4: Zeigt den Schusscursor, wenn dieser auf keinem Gegner steht
// WANNE: Shows the target cursor if we are not hovering over an enemy soldier
UINT8 HandleNonActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos , BOOLEAN fShowAPs, BOOLEAN fRecalc, UINT32 uiCursorFlags )
{
UINT16 usInHand;
Tactical/Weapons.cpp
+1 -2
View File
@@ -2286,7 +2286,6 @@ BOOLEAN UseHandToHand( SOLDIERTYPE *pSoldier, INT16 sTargetGridNo, BOOLEAN fStea
}
DeleteObj( &(pTargetSoldier->inv[ubIndexRet]) );
// WANNE: NEW
// The item that the enemy holds in his hand before the stealing
usNewItem = pTargetSoldier->inv[HANDPOS].usItem;
@@ -3715,7 +3714,7 @@ UINT32 CalcChanceToHitGun(SOLDIERTYPE *pSoldier, UINT16 sGridNo, UINT8 ubAimTime
if (pSoldier->bShock)
iChance -= (pSoldier->bShock * AIM_PENALTY_PER_SHOCK);
// WANNE NEW: Changed this, because RPGs are not in the calculation, only guns
// WANNE: Changed this, because RPGs are not in the calculation, only guns
//if ( Item[ usInHand ].usItemClass == IC_GUN )
if ( Item[ usInHand ].usItemClass == IC_GUN || Item[ usInHand ].usItemClass == IC_LAUNCHER)
{
Tactical/XML_SectorLoadscreens.cpp
-1
View File
@@ -248,7 +248,6 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
{
pData->curElement = ELEMENT;
// WANNE
if(MAX_IMAGE_PATH_CHARS >= strlen(pData->szCharData))
strcpy(pData->curSectorLoadscreens.szNightAlt,pData->szCharData);
else
TileEngine/Radar Screen.cpp
-1
View File
@@ -266,7 +266,6 @@ void RadarRegionButtonCallback( MOUSE_REGION * pRegion, INT32 iReason )
{
AdjustWorldCenterFromRadarCoords( sRadarX, sRadarY );
// WANNE: is this used?
SetRenderFlags(RENDER_FLAG_FULL);
}
}
TileEngine/Tactical Placement GUI.cpp
-3
View File
@@ -1,6 +1,5 @@
#include "builddefines.h"
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#include "PreBattle Interface.h"
@@ -558,7 +557,6 @@ void RenderTacticalPlacementGUI()
InvalidateRegion( iOffsetHorizontal, iOffsetVertical, iOffsetHorizontal + 640, iOffsetVertical + 320 );
if( gbCursorMercID == -1 )
{
// WANNE 2
gTPClipRect.iLeft = gfWest ? iOffsetHorizontal + 30 : iOffsetHorizontal;
gTPClipRect.iTop = gfNorth ? iOffsetVertical + 30 + 3 : iOffsetVertical + 3;
gTPClipRect.iRight = gfEast ? iOffsetHorizontal + 610 : iOffsetHorizontal + 634; // 636
@@ -568,7 +566,6 @@ void RenderTacticalPlacementGUI()
{
gTPClipRect.iLeft = iOffsetHorizontal;
gTPClipRect.iTop = iOffsetVertical + 3;
// WANNE 2
//gTPClipRect.iRight = iOffsetHorizontal + 640;
gTPClipRect.iRight = iOffsetHorizontal + 634; // 635
gTPClipRect.iBottom = iOffsetVertical + 320;
TileEngine/overhead map.cpp
+3 -6
View File
@@ -558,7 +558,6 @@ void GoIntoOverheadMap( )
gfInOverheadMap = TRUE;
// WANNE 2 NEW
//RestoreExternBackgroundRect( INTERFACE_START_X, INTERFACE_START_Y, SCREEN_WIDTH, INTERFACE_HEIGHT );
// Overview map should be centered in the middle of the tactical screen.
@@ -652,7 +651,7 @@ void HandleOverheadUI( )
{
// OK, selected guy is here...
// WANNE <incomment>
// WANNE: Commented these lines out.
//gprintfdirty( gusMouseXPos, gusMouseYPos, MercPtrs[ ubID ]->name );
//mprintf( gusMouseXPos, gusMouseYPos, MercPtrs[ ubID ]->name );
@@ -1638,8 +1637,7 @@ void GetOverheadScreenXYFromGridNo( INT16 sGridNo, INT16 *psScreenX, INT16 *psSc
//*psScreenY -= gpWorldLevelData[ sGridNo ].sHeight / 5;
}
// WANNE
// Fixed bug from sir tech, which occured on smaller maps ;-)
// WANNE: Fixed bug from sir tech, which occured on smaller maps ;-)
BOOLEAN GetOverheadMouseGridNo( INT16 *psGridNo )
{
UINT32 uiCellX, uiCellY;
@@ -1694,8 +1692,7 @@ BOOLEAN GetOverheadMouseGridNo( INT16 *psGridNo )
}
// WANNE
// Fixed bug from sir tech which occured on smaller maps ;-)
// WANNE: Fixed bug from sir tech which occured on smaller maps ;-)
BOOLEAN GetOverheadMouseGridNoForFullSoldiersGridNo( INT16 *psGridNo )
{
UINT32 uiCellX, uiCellY;
TileEngine/physics.cpp
-1
View File
@@ -1712,7 +1712,6 @@ FLOAT CalculateObjectTrajectory( INT16 sTargetZ, OBJECTTYPE *pItem, vector_3 *vP
pObject->fTestPositionNotSet = TRUE;
pObject->fVisible = FALSE;
// WANNE 2
// Alrighty, move this beast until it dies....
while( pObject->fAlive )
{
TileEngine/renderworld.cpp
-2
View File
@@ -3965,7 +3965,6 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL
INT16 sNewScreenX, sNewScreenY;
INT16 sMult;
// WANNE:
INT16 sRadarTLX, sRadarTLY;
INT16 sRadarBRX, sRadarBRY;
INT16 sRadarCX, sRadarCY;
@@ -4162,7 +4161,6 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL
{
if ( fOutTop )
{
// WANNE: Test
// Adjust screen coordinates on the Y!
CorrectRenderCenter( sScreenCenterX, (INT16)(gsTLY + sY_S ), &sNewScreenX, &sNewScreenY );
FromScreenToCellCoordinates( sNewScreenX, sNewScreenY , &sTempPosX_W, &sTempPosY_W );
Utils/PopUpBox.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
Utils/Text Utils.cpp
-1
View File
@@ -760,7 +760,6 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
{
int j = -1;
// WANNE:
for (int i=0;i<80;i++)
{
j++;
Utils/Text.h
+2 -5
View File
@@ -333,8 +333,8 @@ enum
STR_ACCURATE,
STR_INACCURATE,
STR_NO_SEMI_AUTO,
STR_NO_MORE_ITEMS_TO_STEAL, // WANNE
STR_NO_MORE_ITEM_IN_HAND, // WANNE
STR_NO_MORE_ITEMS_TO_STEAL,
STR_NO_MORE_ITEM_IN_HAND,
};
// WANNE: Tooltips
@@ -795,7 +795,6 @@ enum
};
extern STR16 BobbyROrderFormText[];
// WANNE
enum
{
// Guns
@@ -878,8 +877,6 @@ enum
};
extern STR16 BobbyRText[];
// WANNE
extern STR16 BobbyRFilter[];
Utils/Utilities.cpp
+2 -2
View File
@@ -23,8 +23,8 @@ extern BOOLEAN GetCDromDriveLetter( STR8 pString );
BOOLEAN PerformTimeLimitedCheck();
// WANNE:
/* Given a string, replaces all instances of "oldpiece" with "newpiece".
// WANNE: Given a string, replaces all instances of "oldpiece" with "newpiece"
/*
*
* Modified this routine to eliminate recursion and to avoid infinite
* expansion of string when newpiece contains oldpiece. --Byron
Utils/XML_Items.cpp
-7
View File
@@ -74,7 +74,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
{
pData->curElement = ELEMENT_LIST;
// WANNE
if ( !localizedTextOnly )
memset(pData->curArray,0,sizeof(INVTYPE)*pData->maxArraySize);
@@ -84,7 +83,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
{
pData->curElement = ELEMENT;
// WANNE
if ( !localizedTextOnly )
memset(&pData->curItem,0,sizeof(INVTYPE));
@@ -288,7 +286,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
// pData->curItem.szItemName[MAX_CHAR_DATA_LENGTH] = '\0';
//}
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szItemName,pData->szCharData);
else
@@ -309,7 +306,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: longitemname");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
{
strcpy(pData->curItem.szLongItemName,pData->szCharData);
@@ -341,7 +337,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: itemdesc");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szItemDesc,pData->szCharData);
else
@@ -362,7 +357,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brname");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szBRName,pData->szCharData);
else
@@ -383,7 +377,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brdesc");
pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szBRDesc,pData->szCharData);
else
Utils/_DutchText.cpp
+2 -4
View File
@@ -296,8 +296,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Beurt bloodcats",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2600,7 +2600,6 @@ STR16 MercAccountText[] =
L"Weet je zeker de betaling van %s te autoriseren?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE 3
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2818,7 +2817,6 @@ STR16 BobbyROrderFormText[] =
L"Zendingen",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_EnglishText.cpp
+3 -7
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
@@ -311,8 +310,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"accurate",
L"inaccurate",
L"no semi auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -1965,7 +1964,7 @@ STR16 pMapErrorString[] =
L"needs an escort to move. Place her on a squad with one.", // for a female
L"Merc hasn't yet arrived in Arulco!",
L"Looks like there's some contract negotiations to settle first.",
L"Cannot give a movement order. Air raid is going on.", // WANNE 2
L"Cannot give a movement order. Air raid is going on.",
//11-15
L"Movement orders? There's a battle going on!",
L"You have been ambushed by bloodcats in sector %s!",
@@ -2603,7 +2602,6 @@ STR16 MercAccountText[] =
L"Are you sure you want to authorize the payment of %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2820,7 +2818,6 @@ STR16 BobbyROrderFormText[] =
L"Shipments",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3423,7 +3420,6 @@ STR16 zMarksMapScreenText[] =
L"%s is full of militia.",
L"Merc has a finite contract.",
L"Merc's contract is not insured",
// WANNE 2
L"Map Overview", // 24
};
Utils/_FrenchText.cpp
+2 -4
View File
@@ -302,8 +302,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Tour des chats sauvages",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2589,7 +2589,6 @@ STR16 MercAccountText[] =
L"Désirez-vous autoriser le versement de %s ?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2807,7 +2806,6 @@ STR16 BobbyROrderFormText[] =
L"Envois",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_GermanText.cpp
+2 -6
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#else
@@ -305,7 +304,7 @@ CHAR16 Message[][STRING_LENGTH] =
L"ungenau",
L"kein Einzelschuss",
L"Der Feind besitzt keine Gegenstände mehr zum Stehlen!",
L"Der Feind hat keinen Gegenstand in seiner Hand!", //WANNE
L"Der Feind hat keinen Gegenstand in seiner Hand!",
};
CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT] =
@@ -1888,7 +1887,7 @@ STR16 pMapErrorString[] =
L"braucht eine Eskorte. Plazieren Sie sie in einem Trupp mit Eskorte.", // for a female
L"Söldner ist noch nicht in Arulco!",
L"Erst mal Vertrag aushandeln!",
L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.", // WANNE 2
L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.",
//11-15
L"Marschbefehl? Hier tobt ein Kampf!",
L"Sie sind von Bloodcats umstellt in Sektor %s!",
@@ -2488,7 +2487,6 @@ STR16 MercAccountText[] =
L"Zahlung von %s wirklich genehmigen?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2678,7 +2676,6 @@ STR16 BobbyROrderFormText[] =
L"Lieferungen",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3227,7 +3224,6 @@ STR16 zMarksMapScreenText[] =
L"%s ist voller Milizen.",
L"Söldner hat begrenzten Vertrag.",
L"Vertrag des Söldners ist nicht versichert",
// WANNE 2
L"Kartenübersicht", // 24
};
Utils/_ItalianText.cpp
+2 -5
View File
@@ -295,8 +295,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Turno dei Bloodcat",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2583,7 +2583,6 @@ STR16 MercAccountText[] =
L"Conferma il pagamento di %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2801,8 +2800,6 @@ STR16 BobbyROrderFormText[] =
L"Spedizioni",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_Ja25GermanText.h
+1 -1
View File
@@ -12,7 +12,7 @@ enum
TACT_MSG__FEE,
TACT_MSG__SOMEONE_ELSE_IN_SECTOR,
TCTL_MSG__GUN_RANGE_AND_CTH,
//TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE, // WANNE
//TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE, // WANNE: Not used
TCTL_MSG__DISPLAY_COVER,
TCTL_MSG__LOS,
TCTL_MSG__INVALID_DROPOFF_SECTOR,
Utils/_PolishText.cpp
+2 -4
View File
@@ -296,8 +296,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"Tura dzikich kotów",
L"automatic",
L"no full auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -2584,7 +2584,6 @@ STR16 MercAccountText[] =
L"Czy na pewno chcesz zatwierdziæ p³atnoœæ: %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2800,7 +2799,6 @@ STR16 BobbyROrderFormText[] =
L"Dostawy",
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
Utils/_RussianText.cpp
+3 -6
View File
@@ -308,8 +308,8 @@ CHAR16 Message[][STRING_LENGTH] =
L"accurate",
L"inaccurate",
L"no semi auto",
L"The enemy has no more items to steal!", // WANNE
L"The enemy has no item in its hand!", //WANNE
L"The enemy has no more items to steal!",
L"The enemy has no item in its hand!",
};
@@ -1961,7 +1961,7 @@ STR16 pMapErrorString[] =
L"чтобы двигаться, нужен эскорт.Обеспечьте ее эскортом.", // for a female
L"Наемник еще не прибыл в Арулько!",
L"Кажется,сначала нужно уладить все проблемы с контрактом.",
L"Cannot give a movement order. Air raid is going on.", // WANNE 2
L"Cannot give a movement order. Air raid is going on.",
//11-15
L"Приказ двигаться? Тут же битва идет!",
L"Вы наткнулись на засаду Кошки-Убийцы в секторе %s!",
@@ -2597,7 +2597,6 @@ STR16 MercAccountText[] =
L"Вы уверены, что хотите подтвердить выплату %s?", //the %s is a string that contains the dollar amount ( ex. "$150" )
};
// WANNE:
// Merc Account Page buttons
STR16 MercAccountPageText[] =
{
@@ -2814,7 +2813,6 @@ STR16 BobbyROrderFormText[] =
};
// WANNE
STR16 BobbyRFilter[] =
{
// Guns
@@ -3417,7 +3415,6 @@ STR16 zMarksMapScreenText[] =
L"%s:много ополченцев.",
L"У наемн.конечн.контракт.",
L"Контракт наемн.не застрахован",
// WANNE 2
L"Map Overview", // 24
};
Utils/message.cpp
+1 -5
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#include "Game Clock.h"
@@ -38,7 +37,7 @@ typedef struct
} StringSaveStruct;
// WANNE These lines defines the message position in tactical screen.
// WANNE: These lines defines the message position in tactical screen.
#define MAX_LINE_COUNT 6
#define X_START 2
#define MAX_AGE 10000
@@ -1088,8 +1087,6 @@ void DisplayStringsInMapScreenMessageList( void )
INT16 sY;
UINT16 usSpacing;
// WANNE 2
//SetFontDestBuffer( FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101, FALSE );
SetFontDestBuffer( FRAME_BUFFER, 17, (SCREEN_HEIGHT - 114), 407, (SCREEN_HEIGHT - 114) + 101, FALSE );
@@ -1100,7 +1097,6 @@ void DisplayStringsInMapScreenMessageList( void )
ubCurrentStringIndex = gubCurrentMapMessageString;
// WANNE 2
//sY = 377;
sY = (SCREEN_HEIGHT - 103);
ja2_2005Express.vcproj
+3 -3
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Version="8,00"
Name="ja2_2005Express"
ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
RootNamespace="ja2_2005Express"
@@ -64,7 +64,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib"
OutputFile="$(OutDir)\ja2_deb.exe"
OutputFile="$(OutDir)\ja2_deb_1171.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -142,7 +142,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib"
OutputFile="$(OutDir)\ja2_rel_1066.exe"
OutputFile="$(OutDir)\ja2_rel_1171.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"